diff --git a/girepository/giobjectinfo.c b/girepository/giobjectinfo.c
index 846505b7d..908e64e17 100644
--- a/girepository/giobjectinfo.c
+++ b/girepository/giobjectinfo.c
@@ -904,18 +904,18 @@ _get_func(GIObjectInfo *info,
 }
 
 /**
- * gi_object_info_get_ref_function:
+ * gi_object_info_get_ref_function_name:
  * @info: a #GIObjectInfo
  *
  * Obtain the symbol name of the function that should be called to ref this
  * object type. It's mainly used fundamental types. The type signature for
  * the symbol is %GIObjectInfoRefFunction, to fetch the function pointer
- * see gi_object_info_get_ref_function().
+ * see gi_object_info_get_ref_function_name().
  *
  * Returns: (nullable): the symbol or %NULL
  */
 const char *
-gi_object_info_get_ref_function (GIObjectInfo *info)
+gi_object_info_get_ref_function_name (GIObjectInfo *info)
 {
   GIRealInfo *rinfo = (GIRealInfo *)info;
   ObjectBlob *blob;
@@ -948,22 +948,22 @@ gi_object_info_get_ref_function_pointer (GIObjectInfo *info)
   g_return_val_if_fail (info != NULL, NULL);
   g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL);
 
-  return (GIObjectInfoRefFunction)_get_func(info, (SymbolGetter)gi_object_info_get_ref_function);
+  return (GIObjectInfoRefFunction)_get_func(info, (SymbolGetter)gi_object_info_get_ref_function_name);
 }
 
 /**
- * gi_object_info_get_unref_function:
+ * gi_object_info_get_unref_function_name:
  * @info: a #GIObjectInfo
  *
  * Obtain the symbol name of the function that should be called to unref this
  * object type. It's mainly used fundamental types. The type signature for
  * the symbol is %GIObjectInfoUnrefFunction, to fetch the function pointer
- * see gi_object_info_get_unref_function().
+ * see gi_object_info_get_unref_function_name().
  *
  * Returns: (nullable): the symbol or %NULL
  */
 const char *
-gi_object_info_get_unref_function (GIObjectInfo *info)
+gi_object_info_get_unref_function_name (GIObjectInfo *info)
 {
   GIRealInfo *rinfo = (GIRealInfo *)info;
   ObjectBlob *blob;
@@ -996,23 +996,23 @@ gi_object_info_get_unref_function_pointer (GIObjectInfo *info)
   g_return_val_if_fail (info != NULL, NULL);
   g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL);
 
-  return (GIObjectInfoUnrefFunction)_get_func(info, (SymbolGetter)gi_object_info_get_unref_function);
+  return (GIObjectInfoUnrefFunction)_get_func(info, (SymbolGetter)gi_object_info_get_unref_function_name);
 }
 
 /**
- * gi_object_info_get_set_value_function:
+ * gi_object_info_get_set_value_function_name:
  * @info: a #GIObjectInfo
  *
  * Obtain the symbol name of the function that should be called to convert
  * set a GValue giving an object instance pointer of this object type.
  * I's mainly used fundamental types. The type signature for the symbol
  * is %GIObjectInfoSetValueFunction, to fetch the function pointer
- * see gi_object_info_get_set_value_function().
+ * see gi_object_info_get_set_value_function_name().
  *
  * Returns: (nullable): the symbol or %NULL
  */
 const char *
-gi_object_info_get_set_value_function (GIObjectInfo *info)
+gi_object_info_get_set_value_function_name (GIObjectInfo *info)
 {
   GIRealInfo *rinfo = (GIRealInfo *)info;
   ObjectBlob *blob;
@@ -1045,23 +1045,23 @@ gi_object_info_get_set_value_function_pointer (GIObjectInfo *info)
   g_return_val_if_fail (info != NULL, NULL);
   g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL);
 
-  return (GIObjectInfoSetValueFunction)_get_func(info, (SymbolGetter)gi_object_info_get_set_value_function);
+  return (GIObjectInfoSetValueFunction)_get_func(info, (SymbolGetter)gi_object_info_get_set_value_function_name);
 }
 
 /**
- * gi_object_info_get_get_value_function:
+ * gi_object_info_get_get_value_function_name:
  * @info: a #GIObjectInfo
  *
  * Obtain the symbol name of the function that should be called to convert
  * an object instance pointer of this object type to a GValue.
  * I's mainly used fundamental types. The type signature for the symbol
  * is %GIObjectInfoGetValueFunction, to fetch the function pointer
- * see gi_object_info_get_get_value_function().
+ * see gi_object_info_get_get_value_function_name().
  *
  * Returns: (nullable): the symbol or %NULL
  */
 const char *
-gi_object_info_get_get_value_function (GIObjectInfo *info)
+gi_object_info_get_get_value_function_name (GIObjectInfo *info)
 {
   GIRealInfo *rinfo = (GIRealInfo *)info;
   ObjectBlob *blob;
@@ -1094,7 +1094,7 @@ gi_object_info_get_get_value_function_pointer (GIObjectInfo *info)
   g_return_val_if_fail (info != NULL, NULL);
   g_return_val_if_fail (GI_IS_OBJECT_INFO (info), NULL);
 
-  return (GIObjectInfoGetValueFunction)_get_func(info, (SymbolGetter)gi_object_info_get_get_value_function);
+  return (GIObjectInfoGetValueFunction)_get_func(info, (SymbolGetter)gi_object_info_get_get_value_function_name);
 }
 
 void
diff --git a/girepository/giobjectinfo.h b/girepository/giobjectinfo.h
index c0d4bc5f7..d6ec9023b 100644
--- a/girepository/giobjectinfo.h
+++ b/girepository/giobjectinfo.h
@@ -177,28 +177,28 @@ GIStructInfo *    gi_object_info_get_class_struct (GIObjectInfo *info);
 
 
 GI_AVAILABLE_IN_ALL
-const char *                 gi_object_info_get_ref_function               (GIObjectInfo *info);
+const char *                 gi_object_info_get_ref_function_name          (GIObjectInfo *info);
 
 GI_AVAILABLE_IN_ALL
 GIObjectInfoRefFunction      gi_object_info_get_ref_function_pointer       (GIObjectInfo *info);
 
 
 GI_AVAILABLE_IN_ALL
-const char *                 gi_object_info_get_unref_function             (GIObjectInfo *info);
+const char *                 gi_object_info_get_unref_function_name        (GIObjectInfo *info);
 
 GI_AVAILABLE_IN_ALL
 GIObjectInfoUnrefFunction    gi_object_info_get_unref_function_pointer     (GIObjectInfo *info);
 
 
 GI_AVAILABLE_IN_ALL
-const char *                 gi_object_info_get_set_value_function         (GIObjectInfo *info);
+const char *                 gi_object_info_get_set_value_function_name    (GIObjectInfo *info);
 
 GI_AVAILABLE_IN_ALL
 GIObjectInfoSetValueFunction gi_object_info_get_set_value_function_pointer (GIObjectInfo *info);
 
 
 GI_AVAILABLE_IN_ALL
-const char *                 gi_object_info_get_get_value_function         (GIObjectInfo *info);
+const char *                 gi_object_info_get_get_value_function_name    (GIObjectInfo *info);
 
 GI_AVAILABLE_IN_ALL
 GIObjectInfoGetValueFunction gi_object_info_get_get_value_function_pointer (GIObjectInfo *info);
diff --git a/girepository/girwriter.c b/girepository/girwriter.c
index 164031f32..535c4f293 100644
--- a/girepository/girwriter.c
+++ b/girepository/girwriter.c
@@ -1077,19 +1077,19 @@ write_object_info (const gchar  *ns,
   if (is_fundamental)
     xml_printf (file, " glib:fundamental=\"1\"");
 
-  func = gi_object_info_get_unref_function (info);
+  func = gi_object_info_get_unref_function_name (info);
   if (func)
     xml_printf (file, " glib:unref-function=\"%s\"", func);
 
-  func = gi_object_info_get_ref_function (info);
+  func = gi_object_info_get_ref_function_name (info);
   if (func)
     xml_printf (file, " glib:ref-function=\"%s\"", func);
 
-  func = gi_object_info_get_set_value_function (info);
+  func = gi_object_info_get_set_value_function_name (info);
   if (func)
     xml_printf (file, " glib:set-value-function=\"%s\"", func);
 
-  func = gi_object_info_get_get_value_function (info);
+  func = gi_object_info_get_get_value_function_name (info);
   if (func)
     xml_printf (file, " glib:get-value-function=\"%s\"", func);