+2014-05-30  Andrew Burgess  <aburgess@broadcom.com>
+
+       * frame.c (frame_stop_reason_string): Rename to ...
+       (unwind_stop_reason_to_string): this.
+       * frame.h (frame_stop_reason_string): Rename to ...
+       (unwind_stop_reason_to_string): this.
+       * stack.c (frame_info): Update call to frame_stop_reason_string.
+       (backtrace_command_1): Likewise.
+       * guile/scm-frame.c (gdbscm_unwind_stop_reason_string): Likewise.
+       * python/py-frame.c (gdbpy_frame_stop_reason_string): Likewise.
+
 2014-05-30  Andrew Burgess  <aburgess@broadcom.com>
 
        * frame.c (remove_prev_frame): New function.
 
 /* Return a string explaining REASON.  */
 
 const char *
-frame_stop_reason_string (enum unwind_stop_reason reason)
+unwind_stop_reason_to_string (enum unwind_stop_reason reason)
 {
   switch (reason)
     {
 
 
 /* Translate a reason code to an informative string.  */
 
-const char *frame_stop_reason_string (enum unwind_stop_reason);
+const char *unwind_stop_reason_to_string (enum unwind_stop_reason);
 
 /* Unwind the stack frame so that the value of REGNUM, in the previous
    (up, older) frame is returned.  If VALUEP is NULL, don't
 
   if (reason < UNWIND_FIRST || reason > UNWIND_LAST)
     scm_out_of_range (FUNC_NAME, reason_scm);
 
-  str = frame_stop_reason_string (reason);
+  str = unwind_stop_reason_to_string (reason);
   return gdbscm_scm_from_c_string (str);
 }
 \f
 
       return NULL;
     }
 
-  str = frame_stop_reason_string (reason);
+  str = unwind_stop_reason_to_string (reason);
   return PyUnicode_Decode (str, strlen (str), host_charset (), NULL);
 }
 
 
       reason = get_frame_unwind_stop_reason (fi);
       if (reason != UNWIND_NO_REASON)
        printf_filtered (_(" Outermost frame: %s\n"),
-                        frame_stop_reason_string (reason));
+                        unwind_stop_reason_to_string (reason));
     }
   else if (get_frame_type (fi) == TAILCALL_FRAME)
     puts_filtered (" tail call frame");
          reason = get_frame_unwind_stop_reason (trailing);
          if (reason >= UNWIND_FIRST_ERROR)
            printf_filtered (_("Backtrace stopped: %s\n"),
-                            frame_stop_reason_string (reason));
+                            unwind_stop_reason_to_string (reason));
        }
     }
 }