diff -r 4f44b04c46a6 -r c5bab7fb7488 src/mem/ruby/libruby.hh
--- a/src/mem/ruby/libruby.hh	Mon Jan 10 11:11:54 2011 -0800
+++ b/src/mem/ruby/libruby.hh	Mon Jan 10 11:11:54 2011 -0800
@@ -40,8 +40,8 @@
   RubyRequestType_IFETCH,
   RubyRequestType_LD,
   RubyRequestType_ST,
-  RubyRequestType_Locked_Read,
-  RubyRequestType_Locked_Write,
+  RubyRequestType_Load_Linked,
+  RubyRequestType_Store_Conditional,
   RubyRequestType_RMW_Read,
   RubyRequestType_RMW_Write,
   RubyRequestType_NUM
diff -r 4f44b04c46a6 -r c5bab7fb7488 src/mem/ruby/libruby.cc
--- a/src/mem/ruby/libruby.cc	Mon Jan 10 11:11:54 2011 -0800
+++ b/src/mem/ruby/libruby.cc	Mon Jan 10 11:11:54 2011 -0800
@@ -50,10 +50,10 @@
         return "LD";
       case RubyRequestType_ST:
         return "ST";
-      case RubyRequestType_Locked_Read:
-        return "Locked_Read";
-      case RubyRequestType_Locked_Write:
-        return "Locked_Write";
+      case RubyRequestType_Load_Linked:
+        return "Load_Linked";
+      case RubyRequestType_Store_Conditional:
+        return "Store_Conditional";
       case RubyRequestType_RMW_Read:
         return "RMW_Read";
       case RubyRequestType_RMW_Write:
@@ -75,9 +75,9 @@
     else if (str == "ST")
         return RubyRequestType_ST;
     else if (str == "Locked_Read")
-        return RubyRequestType_Locked_Read;
+        return RubyRequestType_Load_Linked;
     else if (str == "Locked_Write")
-        return RubyRequestType_Locked_Write;
+        return RubyRequestType_Store_Conditional;
     else if (str == "RMW_Read")
         return RubyRequestType_RMW_Read;
     else if (str == "RMW_Write")
diff -r 4f44b04c46a6 -r c5bab7fb7488 src/mem/ruby/recorder/TraceRecord.cc
--- a/src/mem/ruby/recorder/TraceRecord.cc	Mon Jan 10 11:11:54 2011 -0800
+++ b/src/mem/ruby/recorder/TraceRecord.cc	Mon Jan 10 11:11:54 2011 -0800
@@ -45,9 +45,9 @@
 
     // Don't differentiate between store misses and atomic requests in
     // the trace
-    if (m_type == RubyRequestType_Locked_Read) {
+    if (m_type == RubyRequestType_Load_Linked) {
         m_type = RubyRequestType_ST;
-    } else if (m_type == RubyRequestType_Locked_Write) {
+    } else if (m_type == RubyRequestType_Store_Conditional) {
         m_type = RubyRequestType_ST;
     }
 }
diff -r 4f44b04c46a6 -r c5bab7fb7488 src/mem/ruby/system/DMASequencer.cc
--- a/src/mem/ruby/system/DMASequencer.cc	Mon Jan 10 11:11:54 2011 -0800
+++ b/src/mem/ruby/system/DMASequencer.cc	Mon Jan 10 11:11:54 2011 -0800
@@ -66,8 +66,8 @@
         break;
       case RubyRequestType_NULL:
       case RubyRequestType_IFETCH:
-      case RubyRequestType_Locked_Read:
-      case RubyRequestType_Locked_Write:
+      case RubyRequestType_Load_Linked:
+      case RubyRequestType_Store_Conditional:
       case RubyRequestType_RMW_Read:
       case RubyRequestType_RMW_Write:
       case RubyRequestType_NUM:
diff -r 4f44b04c46a6 -r c5bab7fb7488 src/mem/ruby/system/RubyPort.cc
--- a/src/mem/ruby/system/RubyPort.cc	Mon Jan 10 11:11:54 2011 -0800
+++ b/src/mem/ruby/system/RubyPort.cc	Mon Jan 10 11:11:54 2011 -0800
@@ -195,11 +195,11 @@
     if (pkt->isLLSC()) {
         if (pkt->isWrite()) {
             DPRINTF(MemoryAccess, "Issuing SC\n");
-            type = RubyRequestType_Locked_Write;
+            type = RubyRequestType_Store_Conditional;
         } else {
             DPRINTF(MemoryAccess, "Issuing LL\n");
             assert(pkt->isRead());
-            type = RubyRequestType_Locked_Read;
+            type = RubyRequestType_Load_Linked;
         }
     } else {
         if (pkt->isRead()) {
diff -r 4f44b04c46a6 -r c5bab7fb7488 src/mem/ruby/system/Sequencer.cc
--- a/src/mem/ruby/system/Sequencer.cc	Mon Jan 10 11:11:54 2011 -0800
+++ b/src/mem/ruby/system/Sequencer.cc	Mon Jan 10 11:11:54 2011 -0800
@@ -231,8 +231,8 @@
     if ((request->ruby_request.type == RubyRequestType_ST) ||
         (request->ruby_request.type == RubyRequestType_RMW_Read) ||
         (request->ruby_request.type == RubyRequestType_RMW_Write) ||
-        (request->ruby_request.type == RubyRequestType_Locked_Read) ||
-        (request->ruby_request.type == RubyRequestType_Locked_Write)) {
+        (request->ruby_request.type == RubyRequestType_Load_Linked) ||
+        (request->ruby_request.type == RubyRequestType_Store_Conditional)) {
         pair<RequestTable::iterator, bool> r =
             m_writeRequestTable.insert(RequestTable::value_type(line_addr, 0));
         bool success = r.second;
@@ -290,8 +290,8 @@
     if ((ruby_request.type == RubyRequestType_ST) ||
         (ruby_request.type == RubyRequestType_RMW_Read) ||
         (ruby_request.type == RubyRequestType_RMW_Write) ||
-        (ruby_request.type == RubyRequestType_Locked_Read) ||
-        (ruby_request.type == RubyRequestType_Locked_Write)) {
+        (ruby_request.type == RubyRequestType_Load_Linked) ||
+        (ruby_request.type == RubyRequestType_Store_Conditional)) {
         m_writeRequestTable.erase(line_addr);
     } else {
         m_readRequestTable.erase(line_addr);
@@ -309,7 +309,7 @@
     // longer locked.
     //
     bool success = true;
-    if (request->ruby_request.type == RubyRequestType_Locked_Write) {
+    if (request->ruby_request.type == RubyRequestType_Store_Conditional) {
         if (!m_dataCache_ptr->isLocked(address, m_version)) {
             //
             // For failed SC requests, indicate the failure to the cpu by
@@ -328,7 +328,7 @@
         // Independent of success, all SC operations must clear the lock
         //
         m_dataCache_ptr->clearLocked(address);
-    } else if (request->ruby_request.type == RubyRequestType_Locked_Read) {
+    } else if (request->ruby_request.type == RubyRequestType_Load_Linked) {
         //
         // Note: To fully follow Alpha LLSC semantics, should the LL clear any
         // previously locked cache lines?
@@ -378,8 +378,8 @@
     assert((request->ruby_request.type == RubyRequestType_ST) ||
            (request->ruby_request.type == RubyRequestType_RMW_Read) ||
            (request->ruby_request.type == RubyRequestType_RMW_Write) ||
-           (request->ruby_request.type == RubyRequestType_Locked_Read) ||
-           (request->ruby_request.type == RubyRequestType_Locked_Write));
+           (request->ruby_request.type == RubyRequestType_Load_Linked) ||
+           (request->ruby_request.type == RubyRequestType_Store_Conditional));
 
     //
     // For Alpha, properly handle LL, SC, and write requests with respect to
@@ -510,7 +510,7 @@
         if ((type == RubyRequestType_LD) ||
             (type == RubyRequestType_IFETCH) ||
             (type == RubyRequestType_RMW_Read) ||
-            (type == RubyRequestType_Locked_Read)) {
+            (type == RubyRequestType_Load_Linked)) {
 
             memcpy(ruby_request.data,
                    data.getData(request_address.getOffset(), ruby_request.len),
@@ -623,8 +623,8 @@
       case RubyRequestType_ST:
         ctype = CacheRequestType_ST;
         break;
-      case RubyRequestType_Locked_Read:
-      case RubyRequestType_Locked_Write:
+      case RubyRequestType_Load_Linked:
+      case RubyRequestType_Store_Conditional:
         ctype = CacheRequestType_ATOMIC;
         break;
       case RubyRequestType_RMW_Read: