diff --git a/src/techui_builder/generate.py b/src/techui_builder/generate.py
index c51246d3..ab916257 100644
--- a/src/techui_builder/generate.py
+++ b/src/techui_builder/generate.py
@@ -165,8 +165,8 @@ def _update_macros(self, component: Entity) -> tuple[str, dict[str, str]]:
         # Try to get name from child labels if they exist,
         # if not, just use the name as it is.
         if component.child_labels is not None:
-            if suffix in component.child_labels.keys():
-                component_name = component.child_labels[suffix]
+            if component_name in component.child_labels.keys():
+                component_name = component.child_labels[component_name]
                 self.label_flag = True
 
         prefix_key = next(k for k, v in component.macros.items() if v == prefix)
diff --git a/tests/test_generate.py b/tests/test_generate.py
index ddd3309c..af4197f2 100644
--- a/tests/test_generate.py
+++ b/tests/test_generate.py
@@ -198,7 +198,7 @@ def test_generator_update_macros_suffix_with_child_labels(generator):
         desc=None,
         service_name="bl01t-mo-test-01",
         macros={"P": "TEST", suffix_key: suffix},
-        child_labels={suffix: child_label},
+        child_labels={"T1": child_label},
     )
 
     component_name, updated_macros = generator._update_macros(component)