11 files changed, 25 insertions, 25 deletions
diff --git a/base/stats/flags.hh b/base/stats/flags.hh
index 2303de172..b86f87d25 100644
--- a/base/stats/flags.hh
+++ b/base/stats/flags.hh
@@ -28,7 +28,7 @@
 
 #ifndef __BASE_STATS_FLAGS_HH__
 #define __BASE_STATS_FLAGS_HH__
-namespace Statistics {
+namespace Stats {
 
 /**
  * Define the storage for format flags.
@@ -68,6 +68,6 @@ enum DisplayMode
 
 extern DisplayMode DefaultMode;
 
-/* namespace Statistics */ }
+/* namespace Stats */ }
 
 #endif //  __BASE_STATS_FLAGS_HH__
diff --git a/base/stats/mysql.cc b/base/stats/mysql.cc
index 676bc555c..c16332d1b 100644
--- a/base/stats/mysql.cc
+++ b/base/stats/mysql.cc
@@ -44,7 +44,7 @@
 
 using namespace std;
 
-namespace Statistics {
+namespace Stats {
 
 struct MySqlData
 {
@@ -841,4 +841,4 @@ MySql::visit(const FormulaData &data)
         output(data);
 }
 
-/* namespace Statistics */ }
+/* namespace Stats */ }
diff --git a/base/stats/mysql.hh b/base/stats/mysql.hh
index 4ff474752..dd88f5724 100644
--- a/base/stats/mysql.hh
+++ b/base/stats/mysql.hh
@@ -34,7 +34,7 @@
 #include "base/stats/output.hh"
 
 namespace MySQL { class Connection; }
-namespace Statistics {
+namespace Stats {
 
 class DistDataData;
 class MySqlData;
@@ -144,6 +144,6 @@ class MySql : public Output
     void configure(const FormulaData &data);
 };
 
-/* namespace Statistics */ }
+/* namespace Stats */ }
 
 #endif // __BASE_STATS_MYSQL_HH__
diff --git a/base/stats/output.hh b/base/stats/output.hh
index 9f1fbf415..186d7bab1 100644
--- a/base/stats/output.hh
+++ b/base/stats/output.hh
@@ -33,7 +33,7 @@
 
 #include "base/stats/visit.hh"
 
-namespace Statistics {
+namespace Stats {
 
 struct Output : public Visit
 {
@@ -42,6 +42,6 @@ struct Output : public Visit
     virtual bool valid() const = 0;
 };
 
-/* namespace Statistics */ }
+/* namespace Stats */ }
 
 #endif // __BASE_STATS_OUTPUT_HH__
diff --git a/base/stats/statdb.cc b/base/stats/statdb.cc
index f54272a50..cd5a095c0 100644
--- a/base/stats/statdb.cc
+++ b/base/stats/statdb.cc
@@ -34,7 +34,7 @@
 
 using namespace std;
 
-namespace Statistics {
+namespace Stats {
 namespace Database {
 
 StatData *
@@ -86,4 +86,4 @@ TheDatabase &db()
 }
 
 /* namespace Database */ }
-/* namespace Statistics */ }
+/* namespace Stats */ }
diff --git a/base/stats/statdb.hh b/base/stats/statdb.hh
index fb672e1dc..6935a9aa0 100644
--- a/base/stats/statdb.hh
+++ b/base/stats/statdb.hh
@@ -36,7 +36,7 @@
 
 class Python;
 
-namespace Statistics {
+namespace Stats {
 
 class MainBin;
 class StatData;
@@ -69,6 +69,6 @@ void regPrint(void *stat);
 inline std::string name() { return "Statistics Database"; }
 
 /* namespace Database */ }
-/* namespace Statistics */ }
+/* namespace Stats */ }
 
 #endif // __BASE_STATS_STATDB_HH__
diff --git a/base/stats/text.cc b/base/stats/text.cc
index 79a91e661..511dbe638 100644
--- a/base/stats/text.cc
+++ b/base/stats/text.cc
@@ -60,7 +60,7 @@ __nan()
 }
 #endif
 
-namespace Statistics {
+namespace Stats {
 
 Text::Text()
     : mystream(false), stream(NULL), compat(false), descriptions(false)
@@ -282,14 +282,14 @@ VectorPrint::operator()(std::ostream &stream) const
             print(stream);
         }
 
-        if (flags & ::Statistics::total) {
+        if (flags & ::Stats::total) {
             print.name = base + "total";
             print.desc = desc;
             print.value = total;
             print(stream);
         }
     } else {
-        if (flags & ::Statistics::total) {
+        if (flags & ::Stats::total) {
             print.value = total;
             print(stream);
         }
@@ -640,7 +640,7 @@ Text::visit(const Vector2dData &data)
         print(*stream);
     }
 
-    if ((data.flags & ::Statistics::total) && (data.x > 1)) {
+    if ((data.flags & ::Stats::total) && (data.x > 1)) {
         print.name = data.name;
         print.desc = data.desc;
         print.vec = tot_vec;
@@ -728,4 +728,4 @@ Text::visit(const FormulaData &data)
     visit((const VectorData &)data);
 }
 
-/* namespace Statistics */ }
+/* namespace Stats */ }
diff --git a/base/stats/text.hh b/base/stats/text.hh
index 89bddf0cb..88e32ff0a 100644
--- a/base/stats/text.hh
+++ b/base/stats/text.hh
@@ -34,7 +34,7 @@
 
 #include "base/stats/output.hh"
 
-namespace Statistics {
+namespace Stats {
 
 class Text : public Output
 {
@@ -72,6 +72,6 @@ class Text : public Output
     virtual void output();
 };
 
-/* namespace Statistics */ }
+/* namespace Stats */ }
 
 #endif // __BASE_STATS_TEXT_HH__
diff --git a/base/stats/types.hh b/base/stats/types.hh
index 4451c4e6e..dcfbd5fa9 100644
--- a/base/stats/types.hh
+++ b/base/stats/types.hh
@@ -32,7 +32,7 @@
 #include <vector>
 #include <inttypes.h>
 
-namespace Statistics {
+namespace Stats {
 
 /** All counters are of 64-bit values. */
 typedef double Counter;
@@ -44,6 +44,6 @@ typedef double Result;
 /** vector of results. */
 typedef std::vector<Result> VResult;
 
-/* namespace Statistics */ }
+/* namespace Stats */ }
 
 #endif // __BASE_STATS_TYPES_HH__
diff --git a/base/stats/visit.cc b/base/stats/visit.cc
index fec11b262..88cd466b4 100644
--- a/base/stats/visit.cc
+++ b/base/stats/visit.cc
@@ -28,7 +28,7 @@
 
 #include "base/stats/visit.hh"
 
-namespace Statistics {
+namespace Stats {
 namespace Detail {
 
 Visit::Visit()
@@ -38,4 +38,4 @@ Visit::~Visit()
 {}
 
 /* namespace Detail */ }
-/* namespace Statistics */ }
+/* namespace Stats */ }
diff --git a/base/stats/visit.hh b/base/stats/visit.hh
index a03842c52..3a46bb9ef 100644
--- a/base/stats/visit.hh
+++ b/base/stats/visit.hh
@@ -34,7 +34,7 @@
 #include "base/time.hh"
 #include "sim/host.hh"
 
-namespace Statistics {
+namespace Stats {
 
 class StatData;
 class ScalarData;
@@ -58,6 +58,6 @@ struct Visit
     virtual void visit(const FormulaData &data) = 0;
 };
 
-/* namespace Statistics */ }
+/* namespace Stats */ }
 
 #endif // __BASE_STATS_VISIT_HH__