diff --git a/src/backend/base/langflow/custom/utils.py b/src/backend/base/langflow/custom/utils.py
index 5d8a9c664..48beb3de7 100644
--- a/src/backend/base/langflow/custom/utils.py
+++ b/src/backend/base/langflow/custom/utils.py
@@ -377,9 +377,9 @@ def build_custom_component_template_from_inputs(
     frontend_node.validate_component()
     # ! This should be removed when we have a better way to handle this
     frontend_node.set_base_classes_from_outputs()
-    reorder_fields(frontend_node, cc_instance._get_field_order())
-
-    return frontend_node.to_dict(add_name=False), cc_instance
+    reorder_fields(frontend_node, custom_component._get_field_order())
+    cc_instance = get_component_instance(custom_component, user_id=user_id)
+    return frontend_node.to_dict(keep_name=False), cc_instance
 
 
 def build_custom_component_template(
@@ -415,7 +415,7 @@ def build_custom_component_template(
 
         reorder_fields(frontend_node, custom_instance._get_field_order())
 
-        return frontend_node.to_dict(add_name=False), custom_instance
+        return frontend_node.to_dict(keep_name=False), custom_instance
     except Exception as exc:
         if isinstance(exc, HTTPException):
             raise exc
diff --git a/src/backend/base/langflow/template/frontend_node/base.py b/src/backend/base/langflow/template/frontend_node/base.py
index 77b6d1f69..9aeb0b97d 100644
--- a/src/backend/base/langflow/template/frontend_node/base.py
+++ b/src/backend/base/langflow/template/frontend_node/base.py
@@ -90,10 +90,10 @@ class FrontendNode(BaseModel):
         return {name: result}
 
     # For backwards compatibility
-    def to_dict(self, add_name=True) -> dict:
+    def to_dict(self, keep_name=True) -> dict:
         """Returns a dict representation of the frontend node."""
         dump = self.model_dump(by_alias=True, exclude_none=True)
-        if not add_name:
+        if not keep_name:
             return dump.pop(self.name)
         return dump