--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -31,8 +31,8 @@ extern PyTypeObject block_object_type;
 extern PyTypeObject value_object_type;
 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_make_value_from_int (PyObject *self, PyObject *args);
+PyObject *gdbpy_get_value_from_history (PyObject *self, PyObject *args);
 PyObject *gdbpy_breakpoints (PyObject *, PyObject *);
 PyObject *gdbpy_get_frames (PyObject *, PyObject *);
 PyObject *gdbpy_get_current_frame (PyObject *, PyObject *);
@@ -40,13 +40,13 @@ 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);
 
-PyObject *value_from_value (struct value *v);
 PyObject *variable_to_python (struct cmd_list_element *);
 PyObject *symtab_and_line_to_sal_object (struct symtab_and_line sal);
 PyObject *symtab_to_symtab_object (struct symtab *symtab);
 PyObject *symbol_to_symbol_object (struct symbol *sym);
 PyObject *block_to_block_object (struct block *block);
 PyObject *value_to_value_object (struct value *v);
+PyObject *gdb_owned_value_to_value_object (struct value *v);
 
 struct block *block_object_to_block (PyObject *obj);
 struct symbol *symbol_object_to_symbol (PyObject *obj);

--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -60,10 +60,10 @@ demand_python ()
   if (!initialized)
     {
       static PyMethodDef GdbMethods[] = {
-	{"value_from_int", gdb_value_from_int, METH_VARARGS,
-	 "Get a value from int"},
-	{"value_from_history", gdb_value_from_history, METH_VARARGS,
-	 "Get a value from history"},
+	{ "make_value_from_int", gdbpy_make_value_from_int, METH_VARARGS,
+	  "Make a value from int" },
+	{ "get_value_from_history", gdbpy_get_value_from_history, METH_VARARGS,
+	  "Get a value from history" },
 	{ "execute", execute_gdb_command, METH_VARARGS,
 	  "Execute a gdb command" },
 	{ "show", get_show_variable, METH_VARARGS,
@@ -150,7 +150,7 @@ pretty_print_value (struct value *value, const char *pretty_printer)
     }
   
   tuple = PyTuple_New (1);
-  PyTuple_SetItem (tuple, 0, value_from_value (value));
+  PyTuple_SetItem (tuple, 0, gdb_owned_value_to_value_object (value));
   
   result = PyObject_Call (format, tuple, Py_None);
   if (result && PyString_Check (result))
@@ -194,7 +194,7 @@ list_varobj_children (struct varobj *var, const char *function)
     }
   
   tuple = PyTuple_New (1);
-  PyTuple_SetItem (tuple, 0, value_from_value (varobj_get_raw_value (var)));
+  PyTuple_SetItem (tuple, 0, gdb_owned_value_to_value_object (varobj_get_raw_value (var)));
   
   result = PyObject_Call (format, tuple, Py_None);
   if (!result)

--- a/gdb/python/value.c
+++ b/gdb/python/value.c
@@ -35,7 +35,7 @@ struct value *values_in_python;
 
 static void valpy_dealloc (PyObject *obj);
 static PyObject *valpy_dereference (PyObject *self, PyObject *args);
-static PyObject *valpy_element (PyObject *self, PyObject *args);
+static PyObject *valpy_get_element (PyObject *self, PyObject *args);
 static PyObject *valpy_str (PyObject *self);
 static PyObject *valpy_increment (PyObject *self, PyObject *args);
 static PyObject *valpy_equal_p (PyObject *self, PyObject *args);
@@ -45,7 +45,8 @@ static PyObject * valpy_common_print (PyObject *self, PyObject *args);
 
 static PyMethodDef value_object_methods[] = {
   { "dereference", valpy_dereference, METH_NOARGS, "Dereferences the value." },
-  { "element", valpy_element, METH_VARARGS, "Obtains element inside value." },
+  { "get_element", valpy_get_element, METH_VARARGS,
+    "Obtains element inside value." },
   { "increment", valpy_increment, METH_VARARGS,
     "Increment value by the given amount." },
   { "equals", valpy_equal_p, METH_VARARGS, "Compare values." },
@@ -133,7 +134,7 @@ valpy_dereference (PyObject *self, PyObject *args)
 
 /* Takes value and string name of element inside that value.  */
 static PyObject *
-valpy_element (PyObject *self, PyObject *args)
+valpy_get_element (PyObject *self, PyObject *args)
 {
   value_object *self_value = (value_object *) self;
   char *field;
@@ -300,10 +301,11 @@ valpy_common_print (PyObject *self, PyObject *args)
   return PyInt_FromLong (ret);
 }
 
-/* FIXME: clarify the naming to say the value
-   won't be deleted by the Python code.  */
+/* A value owned by GDB is in the all_values chain, so it will be freed
+   automatically when not needed anymore (i.e., before the current command
+   completes).  */
 PyObject *
-value_from_value (struct value *v)
+gdb_owned_value_to_value_object (struct value *v)
 {
   value_object *result = PyObject_New (value_object, &value_object_type);
   if (result != NULL)					      
@@ -311,11 +313,16 @@ value_from_value (struct value *v)
       result->value = v;
       result->owned_by_gdb = 1;
       /* FIXME: should we do it? What is it? */
+      /* I don't think it is needed, since a GDB owned value has a very short
+         lifetime. The purpose of the list is explained in the comment above
+         its declaration. -- bauermann  */
       value_prepend_to_list (&values_in_python, v);
     }
   return (PyObject *)result;
 }
 
+/* Returns an object for a value which is released from the all_values chain,
+   so its lifetime is not bound to the execution of a command.  */
 PyObject *
 value_to_value_object (struct value *v)
 {
@@ -324,8 +331,15 @@ value_to_value_object (struct value *v)
   VALPY_RETURN_VALUE (val_obj, v);
 }
 
+struct value *
+value_object_to_value (PyObject *self)
+{
+  value_object *real = (value_object *)self;
+  return real->value;
+}
+
 PyObject *
-gdb_value_from_int (PyObject *self, PyObject *args)
+gdbpy_make_value_from_int (PyObject *self, PyObject *args)
 {
   int i;
   struct value *res_val = NULL;   /* Initialize to appease gcc warning.  */
@@ -345,7 +359,7 @@ gdb_value_from_int (PyObject *self, PyObject *args)
 }
 
 PyObject *
-gdb_value_from_history (PyObject *self, PyObject *args)
+gdbpy_get_value_from_history (PyObject *self, PyObject *args)
 {
   int i;
   struct value *res_val = NULL;	  /* Initialize to appease gcc warning.  */
@@ -376,10 +390,3 @@ gdbpy_initialize_values (void)
 
   values_in_python = NULL;
 }
-
-struct value *
-value_object_to_value (PyObject *self)
-{
-  value_object *real = (value_object *)self;
-  return real->value;
-}

--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -857,7 +857,7 @@ int update_dynamic_varobj_children (struct varobj *var,
   tuple = PyTuple_New (1);
   back_to = make_cleanup_py_decref (tuple);
   /* Steals the reference.  */
-  PyTuple_SetItem (tuple, 0, value_from_value (var->value));
+  PyTuple_SetItem (tuple, 0, gdb_owned_value_to_value_object (var->value));
   children = PyObject_Call (var->children_lister, tuple, Py_None);
   make_cleanup_py_decref (children);
       
@@ -2107,7 +2107,7 @@ value_get_print_value (struct value *value, enum varobj_display_formats format,
       PyObject *py_s;
       char *s;
 
-      py_value = value_from_value (value);
+      py_value = gdb_owned_value_to_value_object (value);
       tuple = PyTuple_New (1);
       back_to = make_cleanup_py_decref (tuple);
       /* Steals the reference.  */