diff --git a/lib/base/db.c b/lib/base/db.c
index 3767d21fb..ec415bcb1 100644
--- a/lib/base/db.c
+++ b/lib/base/db.c
@@ -599,7 +599,7 @@ heim_db_commit(heim_db_t db, heim_error_t *error)
 	    heim_release(a);
 	    goto err;
 	}
-	journal_contents = heim_copy_serialize(a, 0, error);
+	journal_contents = heim_json_copy_serialize(a, 0, error);
 	heim_release(a);
 
 	/* Write replay log */
@@ -1491,7 +1491,7 @@ json_db_sync(void *db, heim_error_t *error)
 
     heim_assert(jsondb->fd > -1, "DB not locked when sync attempted");
 
-    json = heim_copy_serialize(jsondb->dict, 0, &e);
+    json = heim_json_copy_serialize(jsondb->dict, 0, &e);
     if (json == NULL) {
 	if (error)
 	    *error = e;
diff --git a/lib/base/heimbase.h b/lib/base/heimbase.h
index e56c77b02..00925c029 100644
--- a/lib/base/heimbase.h
+++ b/lib/base/heimbase.h
@@ -368,8 +368,8 @@ heim_object_t heim_json_create(const char *, size_t, heim_json_flags_t,
 heim_object_t heim_json_create_with_bytes(const void *, size_t, size_t,
 					  heim_json_flags_t,
 					  heim_error_t *);
-heim_string_t heim_copy_serialize(heim_object_t, heim_json_flags_t,
-				  heim_error_t *);
+heim_string_t heim_json_copy_serialize(heim_object_t, heim_json_flags_t,
+				       heim_error_t *);
 
 
 /*
diff --git a/lib/base/json.c b/lib/base/json.c
index d5349d038..290714ce8 100644
--- a/lib/base/json.c
+++ b/lib/base/json.c
@@ -764,7 +764,7 @@ strbuf_add(void *ctx, const char *str)
 #define STRBUF_INIT_SZ 64
 
 heim_string_t
-heim_copy_serialize(heim_object_t obj, heim_json_flags_t flags, heim_error_t *error)
+heim_json_copy_serialize(heim_object_t obj, heim_json_flags_t flags, heim_error_t *error)
 {
     heim_string_t str;
     struct strbuf strbuf;
diff --git a/lib/base/version-script.map b/lib/base/version-script.map
index ef3d0884b..1d07307ef 100644
--- a/lib/base/version-script.map
+++ b/lib/base/version-script.map
@@ -65,6 +65,7 @@ HEIMDAL_BASE_1.0 {
 		heim_get_tid;
 		heim_json_create;
 		heim_json_create_with_bytes;
+		heim_json_copy_serialize;
 		heim_null_create;
 		heim_number_create;
 		heim_number_get_int;
@@ -79,7 +80,6 @@ HEIMDAL_BASE_1.0 {
 		heim_path_vcopy;
 		heim_release;
 		heim_retain;
-		heim_copy_serialize;
 		heim_show;
 		heim_sorted_text_file_dbtype;
 		heim_string_create;