diff --git a/rmf_building_map_tools/building_map/level.py b/rmf_building_map_tools/building_map/level.py
index 71b00b6a..d38a5980 100644
--- a/rmf_building_map_tools/building_map/level.py
+++ b/rmf_building_map_tools/building_map/level.py
@@ -287,6 +287,10 @@ def generate_robot_at_vertex_idx(self, vertex_idx, world_ele):
         robot_name = vertex.params['spawn_robot_name'].value
         print(f'spawning robot name {robot_name} of type {robot_type}')
 
+        # remove namespace, if present
+        if "/" in robot_type:
+            robot_type = "/".join(robot_type.split("/")[1:])
+
         yaw = 0
         # find the first vertex connected by a lane to this vertex
         for lane in self.lanes:
diff --git a/rmf_building_map_tools/building_map_model_downloader/building_map_model_downloader.py b/rmf_building_map_tools/building_map_model_downloader/building_map_model_downloader.py
index a4355621..a1f721f7 100644
--- a/rmf_building_map_tools/building_map_model_downloader/building_map_model_downloader.py
+++ b/rmf_building_map_tools/building_map_model_downloader/building_map_model_downloader.py
@@ -108,23 +108,23 @@ def download_models(
     actors = get_crowdsim_models(input_yaml)
     model_set.update(actors)
 
+    def add_model(full_model_name):
+        if "/" in full_model_name:
+            model_name = "".join(full_model_name.split("/")[1:])
+            author_name = full_model_name.split("/")[0]
+
+            model_set.add((model_name, author_name))
+            stringent_dict[model_name.lower()] = \
+                author_name.lower()
+        else:
+            model_set.add(full_model_name)
+
     for _, level in building.levels.items():
         for model in level.models:
-            if "/" in model.model_name:
-                model_name = "".join(model.model_name.split("/")[1:])
-                author_name = model.model_name.split("/")[0]
-
-                model_set.add((model_name, author_name))
-                stringent_dict[model_name.lower()] = \
-                    author_name.lower()
-            else:
-                model_set.add(model.model_name)
+            add_model(model.model_name)
         for vertex in level.vertices:
             if 'spawn_robot_type' in vertex.params:
-                model_set.add((vertex.params['spawn_robot_type'].value,
-                               'Open-RMF'))
-                stringent_dict[model_name.lower()] = \
-                    author_name.lower()
+                add_model(vertex.params['spawn_robot_type'].value)
 
     if fuel_tools:
         missing_models = pit_crew.get_missing_models(