7 files changed, 15 insertions, 15 deletions
diff --git a/common/config-file.cpp b/common/config-file.cpp
index c24419258b..9a45b002b5 100644
--- a/common/config-file.cpp
+++ b/common/config-file.cpp
@@ -228,7 +228,7 @@ const int Config::count_domains() {
 	return count;
 }
 
-ScummVM::StringList Config::get_domains() {
+Common::StringList Config::get_domains() {
 	StringList domainNames;
 	DomainMap::Iterator d, end(domains.end());
 	for (d = domains.begin(); d != end; ++d) {
diff --git a/common/config-file.h b/common/config-file.h
index 287d6d6812..bfec3e8465 100644
--- a/common/config-file.h
+++ b/common/config-file.h
@@ -30,10 +30,10 @@
 
 class Config {
 public:
-	typedef ScummVM::String String;
-	typedef ScummVM::StringList StringList;
-	typedef ScummVM::StringMap StringMap;
-	typedef ScummVM::Map<String, StringMap> DomainMap;
+	typedef Common::String String;
+	typedef Common::StringList StringList;
+	typedef Common::StringMap StringMap;
+	typedef Common::Map<String, StringMap> DomainMap;
 
 	Config (const String & = String("config.cfg"), const String & = String("default"));
 	const char *get(const String &key, const String &dom = String()) const;
diff --git a/common/list.h b/common/list.h
index 4421981628..4b3f5a20c2 100644
--- a/common/list.h
+++ b/common/list.h
@@ -24,7 +24,7 @@
 #include "common/scummsys.h"
 #include <assert.h>
 
-namespace ScummVM {
+namespace Common {
 
 template <class T>
 class List {
@@ -126,6 +126,6 @@ protected:
 	}
 };
 
-} // End of namespace ScummVM
+} // End of namespace Common
 
 #endif
diff --git a/common/map.h b/common/map.h
index f970ec1209..bd3172f314 100644
--- a/common/map.h
+++ b/common/map.h
@@ -23,7 +23,7 @@
 
 #include "common/scummsys.h"
 
-namespace ScummVM {
+namespace Common {
 
 template <class Key, class Value>
 class Map {
@@ -247,6 +247,6 @@ class String;
 
 typedef Map<String, String> StringMap;
 
-}	// End of namespace ScummVM
+}	// End of namespace Common
 
 #endif
diff --git a/common/rect.h b/common/rect.h
index a4820a3722..c1f80ebf42 100644
--- a/common/rect.h
+++ b/common/rect.h
@@ -25,7 +25,7 @@
 #include "common/scummsys.h"
 #include "common/util.h"
 
-namespace ScummVM {
+namespace Common {
 
 /*! 	@brief simple class for handling both 2D position and size
 
@@ -108,6 +108,6 @@ struct Rect {
 	}
 };
 
-}	// End of namespace ScummVM
+}	// End of namespace Common
 
 #endif
diff --git a/common/str.cpp b/common/str.cpp
index 99b1766352..5d051de83f 100644
--- a/common/str.cpp
+++ b/common/str.cpp
@@ -23,7 +23,7 @@
 
 #include <ctype.h>
 
-namespace ScummVM {
+namespace Common {
 
 String::String(const char *str, int len) {
 	_refCount = new int(1);
@@ -266,4 +266,4 @@ bool operator != (const char* y, const ConstString &x) {
 	return x != y;
 }
 
-}	// End of namespace ScummVM
+}	// End of namespace Common
diff --git a/common/str.h b/common/str.h
index e134557dc7..9c3949d2e9 100644
--- a/common/str.h
+++ b/common/str.h
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <string.h>
 
-namespace ScummVM {
+namespace Common {
 
 /*
  TODO
@@ -141,6 +141,6 @@ public:
 	}
 };
 
-}	// End of namespace ScummVM
+}	// End of namespace Common
 
 #endif