diff --git a/gobex/gobex.c b/gobex/gobex.c
index c24ea38..9232bf7 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -309,7 +309,7 @@ void g_obex_header_free(GObexHeader *header)
 	g_free(header);
 }
 
-GObexHeader *g_obex_header_unicode(guint8 id, const char *str)
+GObexHeader *g_obex_header_new_unicode(guint8 id, const char *str)
 {
 	GObexHeader *header;
 	size_t len;
@@ -330,7 +330,7 @@ GObexHeader *g_obex_header_unicode(guint8 id, const char *str)
 	return header;
 }
 
-GObexHeader *g_obex_header_bytes(guint8 id, void *data, size_t len,
+GObexHeader *g_obex_header_new_bytes(guint8 id, void *data, size_t len,
 						GObexDataPolicy data_policy)
 {
 	GObexHeader *header;
@@ -360,7 +360,7 @@ GObexHeader *g_obex_header_bytes(guint8 id, void *data, size_t len,
 	return header;
 }
 
-GObexHeader *g_obex_header_uint8(guint8 id, guint8 val)
+GObexHeader *g_obex_header_new_uint8(guint8 id, guint8 val)
 {
 	GObexHeader *header;
 
@@ -377,7 +377,7 @@ GObexHeader *g_obex_header_uint8(guint8 id, guint8 val)
 	return header;
 }
 
-GObexHeader *g_obex_header_uint32(guint8 id, guint32 val)
+GObexHeader *g_obex_header_new_uint32(guint8 id, guint32 val)
 {
 	GObexHeader *header;
 
diff --git a/gobex/gobex.h b/gobex/gobex.h
index 05d1527..7c60422 100644
--- a/gobex/gobex.h
+++ b/gobex/gobex.h
@@ -81,11 +81,11 @@ typedef void (*GObexRequestFunc) (GObex *obex, GObexPacket *req,
 typedef void (*GObexResponseFunc) (GObex *obex, GError *err, GObexPacket *rsp,
 							gpointer user_data);
 
-GObexHeader *g_obex_header_unicode(guint8 id, const char *str);
-GObexHeader *g_obex_header_bytes(guint8 id, void *data, size_t len,
+GObexHeader *g_obex_header_new_unicode(guint8 id, const char *str);
+GObexHeader *g_obex_header_new_bytes(guint8 id, void *data, size_t len,
 						GObexDataPolicy data_policy);
-GObexHeader *g_obex_header_uint8(guint8 id, guint8 val);
-GObexHeader *g_obex_header_uint32(guint8 id, guint32 val);
+GObexHeader *g_obex_header_new_uint8(guint8 id, guint8 val);
+GObexHeader *g_obex_header_new_uint32(guint8 id, guint32 val);
 
 size_t g_obex_header_encode(GObexHeader *header, void *hdr_ptr, size_t buf_len);
 GObexHeader *g_obex_header_decode(const void *data, size_t len,
diff --git a/unit/test-gobex.c b/unit/test-gobex.c
index 668e52e..f2c327a 100644
--- a/unit/test-gobex.c
+++ b/unit/test-gobex.c
@@ -380,7 +380,7 @@ static void test_header_name_ascii(void)
 	uint8_t buf[1024];
 	size_t len;
 
-	header = g_obex_header_unicode(G_OBEX_HDR_ID_NAME, "foo");
+	header = g_obex_header_new_unicode(G_OBEX_HDR_ID_NAME, "foo");
 
 	g_assert(header != NULL);
 
@@ -397,7 +397,7 @@ static void test_header_name_umlaut(void)
 	uint8_t buf[1024];
 	size_t len;
 
-	header = g_obex_header_unicode(G_OBEX_HDR_ID_NAME, "åäö");
+	header = g_obex_header_new_unicode(G_OBEX_HDR_ID_NAME, "åäö");
 
 	g_assert(header != NULL);
 
@@ -414,9 +414,8 @@ static void test_header_bytes(void)
 	uint8_t buf[1024], data[] = { 1, 2, 3, 4 };
 	size_t len;
 
-	header = g_obex_header_bytes(G_OBEX_HDR_ID_BODY, data, sizeof(data),
-							G_OBEX_DATA_REF);
-
+	header = g_obex_header_new_bytes(G_OBEX_HDR_ID_BODY, data,
+						sizeof(data), G_OBEX_DATA_REF);
 	g_assert(header != NULL);
 
 	len = g_obex_header_encode(header, buf, sizeof(buf));
@@ -432,7 +431,7 @@ static void test_header_uint8(void)
 	uint8_t buf[1024];
 	size_t len;
 
-	header = g_obex_header_uint8(G_OBEX_HDR_ID_ACTION, 0x00);
+	header = g_obex_header_new_uint8(G_OBEX_HDR_ID_ACTION, 0x00);
 
 	g_assert(header != NULL);
 
@@ -449,7 +448,8 @@ static void test_header_uint32(void)
 	uint8_t buf[1024];
 	size_t len;
 
-	header = g_obex_header_uint32(G_OBEX_HDR_ID_CONNECTION, 0x01020304);
+	header = g_obex_header_new_uint32(G_OBEX_HDR_ID_CONNECTION,
+								0x01020304);
 
 	len = g_obex_header_encode(header, buf, sizeof(buf));