--- a/src/pt-id.h	Fri Jun 01 19:24:15 2012 -0500
+++ b/src/pt-id.h	Sat Jun 02 10:04:55 2012 -0500
@@ -114,14 +114,14 @@
 
   void accept (tree_walker& tw);
 
-  symbol_table::symbol_record_ref symbol (void) const
+  symbol_table::symbol_reference symbol (void) const
   {
     return sym;
   }
 private:
 
   // The symbol record that this identifier references.
-  symbol_table::symbol_record_ref sym;
+  symbol_table::symbol_reference sym;
 
   // No copying!
 

--- a/src/symtab.h	Fri Jun 01 19:24:15 2012 -0500
+++ b/src/symtab.h	Sat Jun 02 10:04:55 2012 -0500
@@ -584,17 +584,17 @@
   // Always access a symbol from the current scope.
   // Useful for scripts, as they may be executed in more than one scope.
   class
-  symbol_record_ref
+  symbol_reference
   {
   public:
-    symbol_record_ref (void) : scope (-1) {}
-
-    symbol_record_ref (symbol_record record,
+    symbol_reference (void) : scope (-1) {}
+
+    symbol_reference (symbol_record record,
                        scope_id curr_scope = symbol_table::current_scope ())
       : scope (curr_scope), sym (record)
     {}
 
-    symbol_record_ref& operator = (const symbol_record_ref& ref)
+    symbol_reference& operator = (const symbol_reference& ref)
     {
       scope = ref.scope;
       sym = ref.sym;
@@ -616,12 +616,12 @@
       return &sym;
     }
 
-    // can be used to place symbol_record_ref in maps, we don't overload < as
-    // it doesn't make any sense for symbol_record_ref
+    // can be used to place symbol_reference in maps, we don't overload < as
+    // it doesn't make any sense for symbol_reference
     struct comparator
     {
-      bool operator ()(const symbol_record_ref& lhs,
-                       const symbol_record_ref& rhs) const
+      bool operator ()(const symbol_reference& lhs,
+                       const symbol_reference& rhs) const
       {
         return lhs.name () < rhs.name ();
       }