4 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Freeze/MapI.cpp b/cpp/src/Freeze/MapI.cpp
index 5470f27d9e0..a59581b5124 100644
--- a/cpp/src/Freeze/MapI.cpp
+++ b/cpp/src/Freeze/MapI.cpp
@@ -1171,9 +1171,9 @@ Freeze::MapIndexI::~MapIndexI()
 }
 
 IteratorHelper* 
-Freeze::MapIndexI::untypedFind(const Key& k, bool ro, const MapHelperI& map) const
+Freeze::MapIndexI::untypedFind(const Key& k, bool ro, const MapHelperI& m) const
 {
-    auto_ptr<IteratorHelperI> r(new IteratorHelperI(map, ro, _index));
+    auto_ptr<IteratorHelperI> r(new IteratorHelperI(m, ro, _index));
 
     if(r->find(k))
     {
diff --git a/cpp/src/Freeze/SharedDb.cpp b/cpp/src/Freeze/SharedDb.cpp
index 4cb75641f89..4d439f48132 100644
--- a/cpp/src/Freeze/SharedDb.cpp
+++ b/cpp/src/Freeze/SharedDb.cpp
@@ -24,7 +24,7 @@ StaticMutex _refCountMutex = ICE_STATIC_MUTEX_INITIALIZER;
 
 }
 
-Freeze::SharedDb::Map* Freeze::SharedDb::sharedDbMap = 0;
+Freeze::SharedDb::SharedDbMap* Freeze::SharedDb::sharedDbMap = 0;
 
 Freeze::SharedDbPtr 
 Freeze::SharedDb::get(const ConnectionIPtr& connection, 
@@ -36,7 +36,7 @@ Freeze::SharedDb::get(const ConnectionIPtr& connection,
 
     if(sharedDbMap == 0)
     {
-	sharedDbMap = new Map;
+	sharedDbMap = new SharedDbMap;
     }
 
     MapKey key;
@@ -45,7 +45,7 @@ Freeze::SharedDb::get(const ConnectionIPtr& connection,
     key.dbName = dbName;
 
     {
-	Map::iterator p = sharedDbMap->find(key);
+	SharedDbMap::iterator p = sharedDbMap->find(key);
 	if(p != sharedDbMap->end())
 	{
 	    p->second->connectIndices(indices);
@@ -61,8 +61,8 @@ Freeze::SharedDb::get(const ConnectionIPtr& connection,
     //
     // Insert it into the map
     //
-    pair<Map::iterator, bool> insertResult;
-    insertResult= sharedDbMap->insert(Map::value_type(key, result.get()));
+    pair<SharedDbMap::iterator, bool> insertResult;
+    insertResult= sharedDbMap->insert(SharedDbMap::value_type(key, result.get()));
     assert(insertResult.second);
     
     return result.release();
diff --git a/cpp/src/Freeze/SharedDb.h b/cpp/src/Freeze/SharedDb.h
index 406916541d7..42cc3db72db 100644
--- a/cpp/src/Freeze/SharedDb.h
+++ b/cpp/src/Freeze/SharedDb.h
@@ -96,7 +96,7 @@ private:
 	operator<(const MapKey& rhs) const;
     };
 
-    typedef std::map<MapKey, Freeze::SharedDb*> Map;
+    typedef std::map<MapKey, Freeze::SharedDb*> SharedDbMap;
    
     SharedDb(const MapKey&, const ConnectionIPtr&, 
 	     const std::vector<MapIndexBasePtr>&, bool);
@@ -110,7 +110,7 @@ private:
 
     IndexMap _indices;
 
-    static Map* sharedDbMap;
+    static SharedDbMap* sharedDbMap;
 };
 
 inline const std::string& 
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 457c062a85e..3ae432315d7 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -447,7 +447,7 @@ writeDictWithIndicesC(const string& name, const string& absolute, const Dict& di
     // Constructor
     //
     
-    C << sp << nl << absolute << "::" << name << "::" << name
+    C << sp << nl << absolute << "::" << name
       << "(const Freeze::ConnectionPtr& __connection, const std::string& __dbName , bool __createDb)";
     
     C.inc();