diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 0128cbc4d0..924d7c2d77 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -334,6 +334,9 @@ namespace OpenSim.Region.Physics.OdePlugin
             {
                 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
                 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
+
+                _parent_scene.geom_name_map[prim_geom] = Name;
+                _parent_scene.actor_name_map[prim_geom] = this;
             }
 
             if (childPrim)
@@ -1510,9 +1513,6 @@ Console.WriteLine("changeadd 1");
                 }
             }
 
-            _parent_scene.geom_name_map[prim_geom] = Name;
-            _parent_scene.actor_name_map[prim_geom] = this;
-
             changeSelectedStatus(timestep);
 
             m_taintadd = false;
@@ -1986,7 +1986,7 @@ Console.WriteLine(" JointCreateFixed");
                 // Don't need to re-enable body..   it's done in SetMesh
 
                 if (_parent_scene.needsMeshing(_pbs))
-                    mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
+                    mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, meshlod, IsPhysical);
             }
 
             CreateGeom(m_targetSpace, mesh);
@@ -2007,9 +2007,6 @@ Console.WriteLine(" JointCreateFixed");
                 d.BodyEnable(Body);
             }
 
-            _parent_scene.geom_name_map[prim_geom] = Name;
-            _parent_scene.actor_name_map[prim_geom] = this;
-
             changeSelectedStatus(timestamp);
             if (childPrim)
             {
@@ -2079,7 +2076,7 @@ Console.WriteLine(" JointCreateFixed");
                     meshlod = _parent_scene.MeshSculptphysicalLOD;
 
                 // createmesh returns null when it doesn't mesh.
-                mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
+                mesh = _parent_scene.mesher.CreateMesh(Name, _pbs, _size, meshlod, IsPhysical);
             }
 
             CreateGeom(m_targetSpace, mesh);
@@ -2104,9 +2101,6 @@ Console.WriteLine(" JointCreateFixed");
                 }
             }
 
-            _parent_scene.geom_name_map[prim_geom] = Name;
-            _parent_scene.actor_name_map[prim_geom] = this;
-
             changeSelectedStatus(timestamp);
             if (childPrim)
             {