diff --git a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_class.py b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_class.py
index c9f5b2e..842fbdb 100644
--- a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_class.py
+++ b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_class.py
@@ -4,8 +4,8 @@
 class ConfluenceClass(BaseNode):
     """Represents a class in a package"""
     class_name = StringProperty(required=True)
-    class_implementation_summary = StringProperty(default="")
-    class_objective = StringProperty(default="")
+    implementation_summary = StringProperty(default="")
+    objective = StringProperty(default="")
     class_objective_embedding = ArrayProperty(FloatProperty())
     class_implementation_summary_embedding = ArrayProperty(FloatProperty())
     # Class relationships
diff --git a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_codebase.py b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_codebase.py
index 5bcfd61..9635582 100644
--- a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_codebase.py
+++ b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_codebase.py
@@ -13,8 +13,8 @@
 
 class ConfluenceCodebase(BaseNode):
     """Represents a codebase in the system"""
-    codebase_implementation_summary = StringProperty(default="")
-    codebase_objective = StringProperty(default="")
+    implementation_summary = StringProperty(default="")
+    objective = StringProperty(default="")
     codebase_objective_embedding = ArrayProperty(FloatProperty())
     codebase_implementation_summary_embedding = ArrayProperty(FloatProperty())
     # One codebase can contain multiple packages
diff --git a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_method.py b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_method.py
index 2756f61..ac370b0 100644
--- a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_method.py
+++ b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_method.py
@@ -4,8 +4,8 @@
 class ConfluenceMethod(BaseNode):
     """Represents a method in a class"""
     function_name = StringProperty(required=True)
-    function_implementation_summary = StringProperty(default="")
-    function_objective = StringProperty(default="")
+    implementation_summary = StringProperty(default="")
+    objective = StringProperty(default="")
     function_objective_embedding = ArrayProperty(FloatProperty())
     function_implementation_summary_embedding = ArrayProperty(FloatProperty())
     # Method relationships
diff --git a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_package.py b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_package.py
index feb67bf..1c98996 100644
--- a/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_package.py
+++ b/unoplat-code-confluence-commons/unoplat_code_confluence_commons/graph_models/confluence_package.py
@@ -3,8 +3,8 @@
 
 class ConfluencePackage(BaseNode):
     """Represents a package in the codebase"""
-    package_objective = StringProperty(required=True)
-    package_implementation_summary = StringProperty(required=True)
+    objective = StringProperty(required=True)
+    implementation_summary = StringProperty(required=True)
     package_objective_embedding = ArrayProperty(FloatProperty())
     package_implementation_summary_embedding = ArrayProperty(FloatProperty())
     confluence_codebase = RelationshipTo('.confluence_codebase.ConfluenceCodebase', 'BELONGS_TO', model=ContainsRelationship,cardinality=One)