diff --git a/src/blenderbim/blenderbim/bim/module/model/workspace.py b/src/blenderbim/blenderbim/bim/module/model/workspace.py
index 1fd3ef4ebe..f48cc3cc2f 100644
--- a/src/blenderbim/blenderbim/bim/module/model/workspace.py
+++ b/src/blenderbim/blenderbim/bim/module/model/workspace.py
@@ -580,12 +580,12 @@ class Hotkey(bpy.types.Operator, tool.Ifc.Operator):
     def hotkey_C_P(self):
         if not bpy.context.selected_objects:
             return
-        bpy.ops.bim.assign_object()
+        bpy.ops.bim.aggregate_assign_object()
 
     def hotkey_A_P(self):
         if not bpy.context.selected_objects:
             return
-        bpy.ops.bim.unassign_object()
+        bpy.ops.bim.aggregate_unassign_object()
 
     def hotkey_S_C(self):
         if not bpy.context.selected_objects:
diff --git a/src/blenderbim/test/bim/feature/aggregate.feature b/src/blenderbim/test/bim/feature/aggregate.feature
index 3f906981b3..7e6e498f56 100644
--- a/src/blenderbim/test/bim/feature/aggregate.feature
+++ b/src/blenderbim/test/bim/feature/aggregate.feature
@@ -21,7 +21,7 @@ Scenario: Assign object
     And the object "IfcBuildingStorey/My Storey" is selected
     And I press "bim.enable_editing_aggregate"
     And the variable "relating_object" is "tool.Ifc.get().by_type('IfcSite')[0].id()"
-    When I press "bim.assign_object(relating_object={relating_object})"
+    When I press "bim.aggregate_assign_object(relating_object={relating_object})"
     Then the object "IfcSite/My Site" is in the collection "IfcSite/My Site"
     And the object "IfcBuildingStorey/My Storey" is in the collection "IfcBuildingStorey/My Storey"
     And the collection "IfcBuildingStorey/My Storey" is in the collection "IfcSite/My Site"
@@ -31,7 +31,7 @@ Scenario: Unassign object
     And the object "IfcBuildingStorey/My Storey" is selected
     And I press "bim.enable_editing_aggregate"
     And the variable "relating_object" is "tool.Ifc.get().by_type('IfcSite')[0].id()"
-    And I press "bim.assign_object(relating_object={relating_object})"
+    And I press "bim.aggregate_assign_object(relating_object={relating_object})"
     And the object "IfcBuildingStorey/My Storey" is selected
     When I press "bim.aggregate_unassign_object"
     Then the object "IfcSite/My Site" is in the collection "IfcSite/My Site"