diff --git a/test/common/functions.py b/test/common/functions.py
index bdb4a7474..7a412e48c 100644
--- a/test/common/functions.py
+++ b/test/common/functions.py
@@ -5,11 +5,11 @@
 from coreblocks.utils._typing import RecordValueDict, RecordIntDict
 
 if TYPE_CHECKING:
-    from .infrastructure import CoreblockCommand
+    from .infrastructure import CoreblocksCommand
 
 
 T = TypeVar("T")
-TestGen: TypeAlias = Generator[Union[Command, Value, Statement, "CoreblockCommand", None], Any, T]
+TestGen: TypeAlias = Generator[Union[Command, Value, Statement, "CoreblocksCommand", None], Any, T]
 
 
 def set_inputs(values: RecordValueDict, field: Record) -> TestGen[None]:
diff --git a/test/common/infrastructure.py b/test/common/infrastructure.py
index fb90e5505..7bed7bd85 100644
--- a/test/common/infrastructure.py
+++ b/test/common/infrastructure.py
@@ -101,11 +101,11 @@ def elaborate(self, platform) -> HasElaborate:
         return m
 
 
-class CoreblockCommand(ABC):
+class CoreblocksCommand(ABC):
     pass
 
 
-class Now(CoreblockCommand):
+class Now(CoreblocksCommand):
     pass