1 files changed, 22 insertions, 24 deletions

diff --git a/src/node.c b/src/node.c
index 337507a9..93c2214a 100644
--- a/src/node.c
+++ b/src/node.c
@@ -117,28 +117,28 @@ serd_node_equals(const SerdNode* const a, const SerdNode* const b)
 }
 
 SerdNode
-serd_node_new_uri_from_node(const SerdNode* const    uri_node,
-                            const SerdURIView* const base,
-                            SerdURIView* const       out)
+serd_new_uri_from_node(const SerdNode* const    uri_node,
+                       const SerdURIView* const base,
+                       SerdURIView* const       out)
 {
   return (uri_node->type == SERD_URI && uri_node->buf)
-           ? serd_node_new_uri_from_string(uri_node->buf, base, out)
+           ? serd_new_uri_from_string(uri_node->buf, base, out)
            : SERD_NODE_NULL;
 }
 
 SerdNode
-serd_node_new_uri_from_string(const char* const        str,
-                              const SerdURIView* const base,
-                              SerdURIView* const       out)
+serd_new_uri_from_string(const char* const        str,
+                         const SerdURIView* const base,
+                         SerdURIView* const       out)
 {
   if (!str || str[0] == '\0') {
     // Empty URI => Base URI, or nothing if no base is given
-    return base ? serd_node_new_uri(base, NULL, out) : SERD_NODE_NULL;
+    return base ? serd_new_uri(base, NULL, out) : SERD_NODE_NULL;
   }
 
   SerdURIView uri;
   serd_uri_parse(str, &uri);
-  return serd_node_new_uri(&uri, base, out); // Resolve/Serialise
+  return serd_new_uri(&uri, base, out); // Resolve/Serialise
 }
 
 static bool
@@ -178,9 +178,9 @@ is_uri_path_char(const char c)
 }
 
 SerdNode
-serd_node_new_file_uri(const char* const  path,
-                       const char* const  hostname,
-                       SerdURIView* const out)
+serd_new_file_uri(const char* const  path,
+                  const char* const  hostname,
+                  SerdURIView* const out)
 {
   const size_t path_len     = strlen(path);
   const size_t hostname_len = hostname ? strlen(hostname) : 0;
@@ -228,9 +228,9 @@ serd_node_new_file_uri(const char* const  path,
 }
 
 SerdNode
-serd_node_new_uri(const SerdURIView* const uri,
-                  const SerdURIView* const base,
-                  SerdURIView* const       out)
+serd_new_uri(const SerdURIView* const uri,
+             const SerdURIView* const base,
+             SerdURIView* const       out)
 {
   SerdURIView abs_uri = *uri;
   if (base) {
@@ -254,10 +254,10 @@ serd_node_new_uri(const SerdURIView* const uri,
 }
 
 SerdNode
-serd_node_new_relative_uri(const SerdURIView* const uri,
-                           const SerdURIView* const base,
-                           const SerdURIView* const root,
-                           SerdURIView* const       out)
+serd_new_relative_uri(const SerdURIView* const uri,
+                      const SerdURIView* const base,
+                      const SerdURIView* const root,
+                      SerdURIView* const       out)
 {
   const size_t uri_len  = serd_uri_string_length(uri);
   const size_t base_len = serd_uri_string_length(base);
@@ -285,7 +285,7 @@ serd_digits(const double abs)
 }
 
 SerdNode
-serd_node_new_decimal(const double d, const unsigned frac_digits)
+serd_new_decimal(const double d, const unsigned frac_digits)
 {
   if (isnan(d) || isinf(d)) {
     return SERD_NODE_NULL;
@@ -340,7 +340,7 @@ serd_node_new_decimal(const double d, const unsigned frac_digits)
 }
 
 SerdNode
-serd_node_new_integer(const int64_t i)
+serd_new_integer(const int64_t i)
 {
   uint64_t       abs_i  = (i < 0) ? -i : i;
   const unsigned digits = serd_digits((double)abs_i);
@@ -365,9 +365,7 @@ serd_node_new_integer(const int64_t i)
 }
 
 SerdNode
-serd_node_new_blob(const void* const buf,
-                   const size_t      size,
-                   const bool        wrap_lines)
+serd_new_blob(const void* const buf, const size_t size, const bool wrap_lines)
 {
   const size_t len  = serd_base64_get_length(size, wrap_lines);
   uint8_t*     str  = (uint8_t*)calloc(len + 2, 1);