diff --git a/radiant/map.cpp b/radiant/map.cpp
index dd90e2ba..efaa8518 100644
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -1178,8 +1178,12 @@ void Map_RenameAbsolute( const char* absolute ){
 	}
 
 	g_map.m_resource->detach( g_map );
+	g_map.m_resource->flush(); /* wipe map from cache to not spoil namespace */
 	GlobalReferenceCache().release( g_map.m_name.c_str() );
 
+	Map_gatherNamespaced( clone );
+	Map_mergeClonedNames( false ); // set default namespace
+
 	g_map.m_resource = resource;
 
 	g_map.m_name = absolute;