2 files changed, 18 insertions, 18 deletions

diff --git a/src/arch/alpha/arguments.cc b/src/arch/alpha/arguments.cc
index 9f9002003..e89bd70b0 100644
--- a/src/arch/alpha/arguments.cc
+++ b/src/arch/alpha/arguments.cc
@@ -35,7 +35,7 @@
 
 using namespace AlphaISA;
 
-AlphaArguments::Data::~Data()
+Arguments::Data::~Data()
 {
     while (!data.empty()) {
         delete [] data.front();
@@ -44,7 +44,7 @@ AlphaArguments::Data::~Data()
 }
 
 char *
-AlphaArguments::Data::alloc(size_t size)
+Arguments::Data::alloc(size_t size)
 {
     char *buf = new char[size];
     data.push_back(buf);
@@ -52,7 +52,7 @@ AlphaArguments::Data::alloc(size_t size)
 }
 
 uint64_t
-AlphaArguments::getArg(bool fp)
+Arguments::getArg(bool fp)
 {
     if (number < 6) {
         if (fp)
diff --git a/src/arch/alpha/arguments.hh b/src/arch/alpha/arguments.hh
index d977d48d6..c44181a8d 100644
--- a/src/arch/alpha/arguments.hh
+++ b/src/arch/alpha/arguments.hh
@@ -41,7 +41,7 @@ class ThreadContext;
 
 namespace AlphaISA {
 
-class AlphaArguments
+class Arguments
 {
   protected:
     ThreadContext *tc;
@@ -65,62 +65,62 @@ class AlphaArguments
     RefCountingPtr<Data> data;
 
   public:
-    AlphaArguments(ThreadContext *ctx, int n = 0)
+    Arguments(ThreadContext *ctx, int n = 0)
         : tc(ctx), number(n), data(NULL)
         { assert(number >= 0); data = new Data;}
-    AlphaArguments(const AlphaArguments &args)
+    Arguments(const Arguments &args)
         : tc(args.tc), number(args.number), data(args.data) {}
-    ~AlphaArguments() {}
+    ~Arguments() {}
 
     ThreadContext *getThreadContext() const { return tc; }
 
-    const AlphaArguments &operator=(const AlphaArguments &args) {
+    const Arguments &operator=(const Arguments &args) {
         tc = args.tc;
         number = args.number;
         data = args.data;
         return *this;
     }
 
-    AlphaArguments &operator++() {
+    Arguments &operator++() {
         ++number;
         assert(number >= 0);
         return *this;
     }
 
-    AlphaArguments operator++(int) {
-        AlphaArguments args = *this;
+    Arguments operator++(int) {
+        Arguments args = *this;
         ++number;
         assert(number >= 0);
         return args;
     }
 
-    AlphaArguments &operator--() {
+    Arguments &operator--() {
         --number;
         assert(number >= 0);
         return *this;
     }
 
-    AlphaArguments operator--(int) {
-        AlphaArguments args = *this;
+    Arguments operator--(int) {
+        Arguments args = *this;
         --number;
         assert(number >= 0);
         return args;
     }
 
-    const AlphaArguments &operator+=(int index) {
+    const Arguments &operator+=(int index) {
         number += index;
         assert(number >= 0);
         return *this;
     }
 
-    const AlphaArguments &operator-=(int index) {
+    const Arguments &operator-=(int index) {
         number -= index;
         assert(number >= 0);
         return *this;
     }
 
-    AlphaArguments operator[](int index) {
-        return AlphaArguments(tc, index);
+    Arguments operator[](int index) {
+        return Arguments(tc, index);
     }
 
     template <class T>