diff --git a/src/gnuradio_mcp/middlewares/flowgraph.py b/src/gnuradio_mcp/middlewares/flowgraph.py
index 9cdff8b..c1038c4 100644
--- a/src/gnuradio_mcp/middlewares/flowgraph.py
+++ b/src/gnuradio_mcp/middlewares/flowgraph.py
@@ -46,10 +46,7 @@ class FlowGraphMiddleware(ElementMiddleware):
 
     @property
     def blocks(self) -> list[BlockModel]:
-        return [
-            BlockModel(key=block.key, label=block.label)
-            for block in self._flowgraph.blocks
-        ]
+        return [BlockModel.from_block(block) for block in self._flowgraph.blocks]
 
     def add_block(
         self, block_type: str, block_name: Optional[str] = None
diff --git a/src/gnuradio_mcp/models.py b/src/gnuradio_mcp/models.py
index 80f6ed1..98bd97c 100644
--- a/src/gnuradio_mcp/models.py
+++ b/src/gnuradio_mcp/models.py
@@ -20,11 +20,11 @@ class BlockTypeModel(BaseModel):
 
 class BlockModel(BaseModel):
     label: str
-    key: str
+    name: str
 
     @classmethod
     def from_block(cls, block: Block) -> BlockModel:
-        return cls(label=block.label, key=block.name)
+        return cls(label=block.label, name=block.name)
 
 
 class ParamModel(BaseModel):
diff --git a/tests/unit/test_flowgraph.py b/tests/unit/test_flowgraph.py
index 9406b91..643b452 100644
--- a/tests/unit/test_flowgraph.py
+++ b/tests/unit/test_flowgraph.py
@@ -18,8 +18,7 @@ def flowgraph_middleware(platform_middleware: PlatformMiddleware):
 @pytest.fixture
 def initial_blocks(flowgraph_middleware: FlowGraphMiddleware):
     return [
-        BlockModel(key=block.key, label=block.label)
-        for block in flowgraph_middleware._flowgraph.blocks
+        BlockModel.from_block(block) for block in flowgraph_middleware._flowgraph.blocks
     ]
 
 
@@ -34,7 +33,7 @@ def test_flowgraph_block_addition_and_removal(
 
     blocks = flowgraph_middleware.blocks
     assert all(b in blocks for b in initial_blocks)
-    assert any(b.key == block_key for b in blocks)
+    assert any(b.name == explicit_name for b in blocks)
 
     flowgraph_middleware.remove_block(explicit_name)