diff --git a/pype/plugins/blender/create/submarine_model.py b/pype/plugins/blender/create/submarine_model.py
index 1845c9b222..7301073f05 100644
--- a/pype/plugins/blender/create/submarine_model.py
+++ b/pype/plugins/blender/create/submarine_model.py
@@ -9,26 +9,24 @@ from avalon.blender import Creator, lib
 class CreateModel(Creator):
     """Polygonal static geometry"""
 
-    name = "model_default"
+    name = "modelMain"
     label = "Model"
     family = "model"
     icon = "cube"
 
     def process(self):
-        import sonar.blender
+        import pype.blender
+
         asset = self.data["asset"]
         subset = self.data["subset"]
-        name = sonar.blender.plugin.model_name(asset, subset)
+        name = pype.blender.plugin.model_name(asset, subset)
         collection = bpy.data.collections.new(name=name)
         bpy.context.scene.collection.children.link(collection)
         self.data['task'] = api.Session.get('AVALON_TASK')
         lib.imprint(collection, self.data)
 
         if (self.options or {}).get("useSelection"):
-            for obj in bpy.context.selected_objects:
+            for obj in lib.get_selection():
                 collection.objects.link(obj)
 
-        if bpy.data.workspaces.get('Modeling'):
-            bpy.context.window.workspace = bpy.data.workspaces['Modeling']
-
         return collection