--- a/gdb/python/frame.c
+++ b/gdb/python/frame.c
@@ -458,7 +458,7 @@ frapy_read_var_value (PyObject *self, PyObject *args)
 }
 
 PyObject *
-gdbpy_frames (PyObject *self, PyObject *args)
+gdbpy_get_frames (PyObject *self, PyObject *args)
 {
   int result = 0;
   struct frame_info *frame;
@@ -502,7 +502,7 @@ gdbpy_frames (PyObject *self, PyObject *args)
 }
 
 PyObject *
-gdbpy_current_frame (PyObject *self, PyObject *args)
+gdbpy_get_current_frame (PyObject *self, PyObject *args)
 {
   struct frame_info *frame;
   frame_object *frame_obj = NULL;   /* Initialize to appease gcc warning.  */

--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -34,8 +34,8 @@ extern PyTypeObject symbol_object_type;
 PyObject *gdb_value_from_int (PyObject *self, PyObject *args);
 PyObject *gdb_value_from_history (PyObject *self, PyObject *args);
 PyObject *gdbpy_breakpoints (PyObject *, PyObject *);
-PyObject *gdbpy_frames (PyObject *, PyObject *);
-PyObject *gdbpy_current_frame (PyObject *, PyObject *);
+PyObject *gdbpy_get_frames (PyObject *, PyObject *);
+PyObject *gdbpy_get_current_frame (PyObject *, PyObject *);
 PyObject *gdbpy_frame_stop_reason_string (PyObject *, PyObject *);
 PyObject *gdbpy_lookup_symbol (PyObject *self, PyObject *args);
 PyObject *gdbpy_get_selected_frame (PyObject *self, PyObject *args);

--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -72,9 +72,9 @@ demand_python ()
 	{ "breakpoints", gdbpy_breakpoints, METH_NOARGS,
 	  "Return a tuple of all breakpoint objects" },
 
-	{ "frames", gdbpy_frames, METH_NOARGS,
+	{ "get_frames", gdbpy_get_frames, METH_NOARGS,
 	  "Return a tuple of all frame objects" },
-	{ "current_frame", gdbpy_current_frame, METH_NOARGS,
+	{ "get_current_frame", gdbpy_get_current_frame, METH_NOARGS,
 	  "Return the current frame object" },
 	{ "get_selected_frame", gdbpy_get_selected_frame, METH_NOARGS,
 	  "Return the selected frame object" },