Remove _v2 suffix from raptor_uri constructors

28 files changed, 152 insertions, 152 deletions

diff --git a/src/ntriples_parse.c b/src/ntriples_parse.c
index bd9dc2c4..f4cf0e29 100644
--- a/src/ntriples_parse.c
+++ b/src/ntriples_parse.c
@@ -139,7 +139,7 @@ raptor_ntriples_generate_statement(raptor_parser* parser,
     statement->subject.value = subject;
   } else {
     /* must be RAPTOR_TERM_TYPE_URI */
-    subject_uri = raptor_new_uri_v2(parser->world, subject);
+    subject_uri = raptor_new_uri(parser->world, subject);
     if(!subject_uri) {
       raptor_parser_error(parser, "Could not create subject uri '%s', skipping", subject);
       goto cleanup;
@@ -148,7 +148,7 @@ raptor_ntriples_generate_statement(raptor_parser* parser,
   }
 
   if(object_literal_datatype) {
-    datatype_uri = raptor_new_uri_v2(parser->world, object_literal_datatype);
+    datatype_uri = raptor_new_uri(parser->world, object_literal_datatype);
     if(!datatype_uri) {
       raptor_parser_error(parser, "Could not create object literal datatype uri '%s', skipping", object_literal_datatype);
       goto cleanup;
@@ -163,7 +163,7 @@ raptor_ntriples_generate_statement(raptor_parser* parser,
       raptor_parser_error(parser, "Illegal ordinal value %d in property '%s'.", predicate_ordinal, predicate);
   }
   
-  predicate_uri = raptor_new_uri_v2(parser->world, predicate);
+  predicate_uri = raptor_new_uri(parser->world, predicate);
   if(!predicate_uri) {
     raptor_parser_error(parser, "Could not create predicate uri '%s', skipping", predicate);
     goto cleanup;
@@ -177,7 +177,7 @@ raptor_ntriples_generate_statement(raptor_parser* parser,
 
   statement->object.type = object_type;
   if(object_type == RAPTOR_TERM_TYPE_URI) {
-    object_uri = raptor_new_uri_v2(parser->world, (const unsigned char*)object);
+    object_uri = raptor_new_uri(parser->world, (const unsigned char*)object);
     if(!object_uri) {
       raptor_parser_error(parser, "Could not create object uri '%s', skipping", (const char *)object);
       goto cleanup;
diff --git a/src/raptor.h b/src/raptor.h
index 35bf4cda..c2a6c6fd 100644
--- a/src/raptor.h
+++ b/src/raptor.h
@@ -908,15 +908,15 @@ void* raptor_calloc_memory(size_t nmemb, size_t size);
 
 /* URI functions */
 RAPTOR_API
-raptor_uri* raptor_new_uri_v2(raptor_world* world, const unsigned char *uri_string);
+raptor_uri* raptor_new_uri(raptor_world* world, const unsigned char *uri_string);
 RAPTOR_API
-raptor_uri* raptor_new_uri_from_uri_local_name_v2(raptor_world* world, raptor_uri *uri, const unsigned char *local_name);
+raptor_uri* raptor_new_uri_from_uri_local_name(raptor_world* world, raptor_uri *uri, const unsigned char *local_name);
 RAPTOR_API
-raptor_uri* raptor_new_uri_relative_to_base_v2(raptor_world* world, raptor_uri *base_uri, const unsigned char *uri_string);
+raptor_uri* raptor_new_uri_relative_to_base(raptor_world* world, raptor_uri *base_uri, const unsigned char *uri_string);
 RAPTOR_API
-raptor_uri* raptor_new_uri_from_id_v2(raptor_world* world, raptor_uri *base_uri, const unsigned char *id);
+raptor_uri* raptor_new_uri_from_id(raptor_world* world, raptor_uri *base_uri, const unsigned char *id);
 RAPTOR_API
-raptor_uri* raptor_new_uri_for_rdf_concept_v2(raptor_world* world, const char *name);
+raptor_uri* raptor_new_uri_for_rdf_concept(raptor_world* world, const char *name);
 RAPTOR_API
 void raptor_free_uri_v2(raptor_world* world, raptor_uri *uri);
 RAPTOR_API
@@ -930,9 +930,9 @@ unsigned char* raptor_uri_as_string_v2(raptor_world* world, raptor_uri *uri);
 RAPTOR_API
 unsigned char* raptor_uri_as_counted_string_v2(raptor_world* world, raptor_uri *uri, size_t* len_p);
 RAPTOR_API
-raptor_uri* raptor_new_uri_for_xmlbase_v2(raptor_world* world, raptor_uri* old_uri);
+raptor_uri* raptor_new_uri_for_xmlbase(raptor_world* world, raptor_uri* old_uri);
 RAPTOR_API
-raptor_uri* raptor_new_uri_for_retrieval_v2(raptor_world* world, raptor_uri* old_uri);
+raptor_uri* raptor_new_uri_for_retrieval(raptor_world* world, raptor_uri* old_uri);
 
 /* Identifier functions */
 RAPTOR_API
diff --git a/src/raptor_abbrev.c b/src/raptor_abbrev.c
index 5fac688b..07087107 100644
--- a/src/raptor_abbrev.c
+++ b/src/raptor_abbrev.c
@@ -774,7 +774,7 @@ raptor_new_qname_from_resource(raptor_sequence* namespaces,
     return NULL;
 
   c=*name; *name='\0';
-  ns_uri = raptor_new_uri_v2(node->world, uri_string);
+  ns_uri = raptor_new_uri(node->world, uri_string);
   if(!ns_uri)
     return NULL;
   
diff --git a/src/raptor_feature.c b/src/raptor_feature.c
index 16d5b4c9..57a1f2c7 100644
--- a/src/raptor_feature.c
+++ b/src/raptor_feature.c
@@ -134,11 +134,11 @@ raptor_features_enumerate_common(raptor_world* world,
         *name=raptor_features_list[i].name;
       
       if(uri) {
-        raptor_uri *base_uri = raptor_new_uri_v2(world, (const unsigned char*)raptor_feature_uri_prefix);
+        raptor_uri *base_uri = raptor_new_uri(world, (const unsigned char*)raptor_feature_uri_prefix);
         if(!base_uri)
           return -1;
         
-        *uri=raptor_new_uri_from_uri_local_name_v2(world,
+        *uri=raptor_new_uri_from_uri_local_name(world,
                                                    base_uri,
                                                    (const unsigned char*)raptor_features_list[i].name);
         raptor_free_uri_v2(world, base_uri);
diff --git a/src/raptor_grddl.c b/src/raptor_grddl.c
index f5b1a1fe..f2f7f2a7 100644
--- a/src/raptor_grddl.c
+++ b/src/raptor_grddl.c
@@ -279,8 +279,8 @@ raptor_grddl_parse_init(raptor_parser* rdf_parser, const char *name)
   /* Sequence of URIs from <head profile> */
   grddl_parser->profile_uris = raptor_new_sequence_v2((raptor_sequence_free_handler_v2*)grddl_free_xml_context, NULL, (void*)world);
 
-  grddl_parser->namespace_transformation_uri = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2003/g/data-view#namespaceTransformation");
-  grddl_parser->profile_transformation_uri = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2003/g/data-view#profileTransformation");
+  grddl_parser->namespace_transformation_uri = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2003/g/data-view#namespaceTransformation");
+  grddl_parser->profile_transformation_uri = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2003/g/data-view#profileTransformation");
 
   /* Sequence of URIs visited - may be overwritten if this is not
    * the depth 0 grddl parser
@@ -1095,7 +1095,7 @@ raptor_grddl_run_xpath_match(raptor_parser* rdf_parser,
     
     
     if(base_uri_string) {
-      base_uri = raptor_new_uri_v2(rdf_parser->world, base_uri_string);
+      base_uri = raptor_new_uri(rdf_parser->world, base_uri_string);
       xmlFree(base_uri_string);
 #if RAPTOR_DEBUG > 1
       RAPTOR_DEBUG2("XML base URI of match is '%s'\n", raptor_uri_as_string_v2(rdf_parser->world, base_uri));
@@ -1128,7 +1128,7 @@ raptor_grddl_run_xpath_match(raptor_parser* rdf_parser,
         RAPTOR_DEBUG2("Got list match URI '%s'\n", start);
 #endif
         
-        uri = raptor_new_uri_relative_to_base_v2(rdf_parser->world,
+        uri = raptor_new_uri_relative_to_base(rdf_parser->world,
                                                base_uri,
                                                (const unsigned char*)start);
         if(flags & MATCH_IS_PROFILE &&
@@ -1154,7 +1154,7 @@ raptor_grddl_run_xpath_match(raptor_parser* rdf_parser,
       RAPTOR_DEBUG2("Got single match URI '%s'\n", uri_string);
 #endif
 
-      uri = raptor_new_uri_relative_to_base_v2(rdf_parser->world, base_uri, uri_string);
+      uri = raptor_new_uri_relative_to_base(rdf_parser->world, base_uri, uri_string);
       xml_context = raptor_new_xml_context(rdf_parser->world, uri, base_uri);
       raptor_sequence_push(seq, xml_context);
       raptor_free_uri_v2(rdf_parser->world, uri);
@@ -1579,7 +1579,7 @@ raptor_grddl_parse_chunk(raptor_parser* rdf_parser,
       if(ns_uri_string) {
         grddl_xml_context* xml_context;
 
-        grddl_parser->root_ns_uri = raptor_new_uri_relative_to_base_v2(rdf_parser->world,
+        grddl_parser->root_ns_uri = raptor_new_uri_relative_to_base(rdf_parser->world,
                                                                      rdf_parser->base_uri, 
                                                                      ns_uri_string);
         xml_context = raptor_new_xml_context(rdf_parser->world,
@@ -1744,7 +1744,7 @@ raptor_grddl_parse_chunk(raptor_parser* rdf_parser,
         raptor_free_sequence(result);
         result = raptor_new_sequence((raptor_sequence_free_handler*)grddl_free_xml_context, NULL);
         
-        uri = raptor_new_uri_relative_to_base_v2(rdf_parser->world, rdf_parser->base_uri, uri_string);
+        uri = raptor_new_uri_relative_to_base(rdf_parser->world, rdf_parser->base_uri, uri_string);
 
         xml_context = raptor_new_xml_context(rdf_parser->world, uri, rdf_parser->base_uri);
         raptor_sequence_push(result, xml_context);
diff --git a/src/raptor_json_writer.c b/src/raptor_json_writer.c
index 8e48a971..ec5cc9f8 100644
--- a/src/raptor_json_writer.c
+++ b/src/raptor_json_writer.c
@@ -107,10 +107,10 @@ raptor_new_json_writer(raptor_world* world,
   json_writer->base_uri = base_uri;
 
 #if RAPTOR_JSON_WRITER_DATATYPES == 1
-  json_writer->xsd_boolean_uri = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#boolean");
-  json_writer->xsd_decimal_uri = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#decimal");
-  json_writer->xsd_double_uri = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#double");
-  json_writer->xsd_integer_uri = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#integer");
+  json_writer->xsd_boolean_uri = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#boolean");
+  json_writer->xsd_decimal_uri = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#decimal");
+  json_writer->xsd_double_uri = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#double");
+  json_writer->xsd_integer_uri = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#integer");
 #endif
 
   json_writer->indent_step = 2;
diff --git a/src/raptor_librdfa.c b/src/raptor_librdfa.c
index 2e50eb5f..611b1148 100644
--- a/src/raptor_librdfa.c
+++ b/src/raptor_librdfa.c
@@ -113,14 +113,14 @@ raptor_librdfa_generate_statement(rdftriple* triple, void* callback_data)
     s->subject.value = (triple->subject + 2);
   } else {
     s->subject.type = RAPTOR_TERM_TYPE_URI;
-    subject_uri = raptor_new_uri_v2(parser->world, (const unsigned char*)triple->subject);
+    subject_uri = raptor_new_uri(parser->world, (const unsigned char*)triple->subject);
     if(!subject_uri)
       goto cleanup;
     s->subject.value = subject_uri;
   }
   
 
-  predicate_uri = raptor_new_uri_v2(parser->world, (const unsigned char*)triple->predicate);
+  predicate_uri = raptor_new_uri(parser->world, (const unsigned char*)triple->predicate);
   if(!predicate_uri)
     goto cleanup;
   s->predicate.value = predicate_uri;
@@ -135,7 +135,7 @@ raptor_librdfa_generate_statement(rdftriple* triple, void* callback_data)
       s->object.value = (triple->object + 2);
     } else {
       s->object.type = RAPTOR_TERM_TYPE_URI;
-      object_uri = raptor_new_uri_v2(parser->world, (const unsigned char*)triple->object);
+      object_uri = raptor_new_uri(parser->world, (const unsigned char*)triple->object);
       if(!object_uri)
         goto cleanup;
       s->object.value = object_uri;
@@ -146,14 +146,14 @@ raptor_librdfa_generate_statement(rdftriple* triple, void* callback_data)
       s->object.literal_language = (const unsigned char*)triple->language;
   } else if(triple->object_type == RDF_TYPE_XML_LITERAL) {
     s->object.type = RAPTOR_TERM_TYPE_LITERAL;
-    datatype_uri = raptor_new_uri_v2(parser->world, (const unsigned char*)raptor_xml_literal_datatype_uri_string);
+    datatype_uri = raptor_new_uri(parser->world, (const unsigned char*)raptor_xml_literal_datatype_uri_string);
     s->object.literal_datatype = datatype_uri;
   } else if(triple->object_type == RDF_TYPE_TYPED_LITERAL) {
     s->object.type = RAPTOR_TERM_TYPE_LITERAL;
     if(triple->language)
       s->object.literal_language = (const unsigned char*)triple->language;
     if(triple->datatype) {
-      datatype_uri = raptor_new_uri_v2(parser->world, (const unsigned char*)triple->datatype);
+      datatype_uri = raptor_new_uri(parser->world, (const unsigned char*)triple->datatype);
       if(!datatype_uri)
         goto cleanup;
       s->object.literal_datatype = datatype_uri;
diff --git a/src/raptor_namespace.c b/src/raptor_namespace.c
index d94ccdfa..71420490 100644
--- a/src/raptor_namespace.c
+++ b/src/raptor_namespace.c
@@ -149,11 +149,11 @@ raptor_namespaces_init_v2(raptor_world* world,
 
   nstack->def_namespace = NULL;
 
-  nstack->rdf_ms_uri = raptor_new_uri_v2(nstack->world,
+  nstack->rdf_ms_uri = raptor_new_uri(nstack->world,
                                          (const unsigned char*)raptor_rdf_namespace_uri);
   failures += !nstack->rdf_ms_uri;
    
-  nstack->rdf_schema_uri = raptor_new_uri_v2(nstack->world,
+  nstack->rdf_schema_uri = raptor_new_uri(nstack->world,
                                              (const unsigned char*)raptor_rdf_schema_namespace_uri);
   failures += !nstack->rdf_schema_uri;
 
@@ -591,7 +591,7 @@ raptor_new_namespace(raptor_namespace_stack *nstack,
     ns_uri_string = NULL;
 
   if(ns_uri_string) {
-    ns_uri = raptor_new_uri_v2(nstack->world, ns_uri_string);
+    ns_uri = raptor_new_uri(nstack->world, ns_uri_string);
     if(!ns_uri)
       return NULL;
   }
diff --git a/src/raptor_qname.c b/src/raptor_qname.c
index 601c1228..e8249885 100644
--- a/src/raptor_qname.c
+++ b/src/raptor_qname.c
@@ -205,7 +205,7 @@ raptor_new_qname(raptor_namespace_stack *nstack,
   if(qname->nspace && local_name_length) {
     raptor_uri *uri = raptor_namespace_get_uri(qname->nspace);
     if(uri)
-      uri = raptor_new_uri_from_uri_local_name_v2(qname->world, uri, new_name);
+      uri = raptor_new_uri_from_uri_local_name(qname->world, uri, new_name);
 
     qname->uri = uri;
   }
@@ -274,7 +274,7 @@ raptor_new_qname_from_namespace_local_name_v2(raptor_world* world,
   if(qname->nspace) {
     qname->uri = raptor_namespace_get_uri(qname->nspace);
     if(qname->uri)
-      qname->uri = raptor_new_uri_from_uri_local_name_v2(qname->world, qname->uri, new_name);
+      qname->uri = raptor_new_uri_from_uri_local_name(qname->world, qname->uri, new_name);
   }
   
   return qname;
@@ -325,7 +325,7 @@ raptor_qname_copy(raptor_qname *qname) {
 
   new_qname->uri = raptor_namespace_get_uri(new_qname->nspace);
   if(new_qname->uri)
-    new_qname->uri = raptor_new_uri_from_uri_local_name_v2(qname->world, new_qname->uri, new_name);
+    new_qname->uri = raptor_new_uri_from_uri_local_name(qname->world, new_qname->uri, new_name);
   
   return new_qname;
 }
@@ -476,7 +476,7 @@ raptor_qname_string_to_uri(raptor_namespace_stack *nstack,
    */
   if(ns && (uri = raptor_namespace_get_uri(ns))) {
     if(local_name_length)
-      uri = raptor_new_uri_from_uri_local_name_v2(nstack->world, uri, local_name);
+      uri = raptor_new_uri_from_uri_local_name(nstack->world, uri, local_name);
     else
       uri = raptor_uri_copy_v2(nstack->world, uri);
   }
diff --git a/src/raptor_rdfxml.c b/src/raptor_rdfxml.c
index da904986..6d9bd848 100644
--- a/src/raptor_rdfxml.c
+++ b/src/raptor_rdfxml.c
@@ -1050,34 +1050,34 @@ raptor_rdfxml_parse_init(raptor_parser* rdf_parser, const char *name)
   raptor_sax2_set_namespace_handler(sax2, raptor_rdfxml_sax2_new_namespace_handler);
 
   /* Allocate uris */  
-  RAPTOR_RDF_type_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "type");
-  RAPTOR_RDF_value_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "value");
-  RAPTOR_RDF_subject_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "subject");
-  RAPTOR_RDF_predicate_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "predicate");
-  RAPTOR_RDF_object_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "object");
-  RAPTOR_RDF_Statement_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "Statement");
+  RAPTOR_RDF_type_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "type");
+  RAPTOR_RDF_value_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "value");
+  RAPTOR_RDF_subject_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "subject");
+  RAPTOR_RDF_predicate_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "predicate");
+  RAPTOR_RDF_object_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "object");
+  RAPTOR_RDF_Statement_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "Statement");
 
-  RAPTOR_RDF_Seq_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "Seq");
-  RAPTOR_RDF_Bag_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "Bag");
-  RAPTOR_RDF_Alt_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "Alt");
+  RAPTOR_RDF_Seq_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "Seq");
+  RAPTOR_RDF_Bag_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "Bag");
+  RAPTOR_RDF_Alt_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "Alt");
 
-  RAPTOR_RDF_List_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "List");
-  RAPTOR_RDF_first_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "first");
-  RAPTOR_RDF_rest_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "rest");
-  RAPTOR_RDF_nil_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "nil");
+  RAPTOR_RDF_List_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "List");
+  RAPTOR_RDF_first_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "first");
+  RAPTOR_RDF_rest_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "rest");
+  RAPTOR_RDF_nil_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "nil");
 
-  RAPTOR_DAML_NS_URI(rdf_xml_parser) = raptor_new_uri_v2(world, (const unsigned char*)"http://www.daml.org/2001/03/daml+oil#");
+  RAPTOR_DAML_NS_URI(rdf_xml_parser) = raptor_new_uri(world, (const unsigned char*)"http://www.daml.org/2001/03/daml+oil#");
 
-  RAPTOR_DAML_List_URI(rdf_xml_parser) = raptor_new_uri_from_uri_local_name_v2(world, RAPTOR_DAML_NS_URI(rdf_xml_parser), (const unsigned char *)"List");
-  RAPTOR_DAML_first_URI(rdf_xml_parser) = raptor_new_uri_from_uri_local_name_v2(world, RAPTOR_DAML_NS_URI(rdf_xml_parser) ,(const unsigned char *)"first");
-  RAPTOR_DAML_rest_URI(rdf_xml_parser) = raptor_new_uri_from_uri_local_name_v2(world, RAPTOR_DAML_NS_URI(rdf_xml_parser), (const unsigned char *)"rest");
-  RAPTOR_DAML_nil_URI(rdf_xml_parser) = raptor_new_uri_from_uri_local_name_v2(world, RAPTOR_DAML_NS_URI(rdf_xml_parser), (const unsigned char *)"nil");
+  RAPTOR_DAML_List_URI(rdf_xml_parser) = raptor_new_uri_from_uri_local_name(world, RAPTOR_DAML_NS_URI(rdf_xml_parser), (const unsigned char *)"List");
+  RAPTOR_DAML_first_URI(rdf_xml_parser) = raptor_new_uri_from_uri_local_name(world, RAPTOR_DAML_NS_URI(rdf_xml_parser) ,(const unsigned char *)"first");
+  RAPTOR_DAML_rest_URI(rdf_xml_parser) = raptor_new_uri_from_uri_local_name(world, RAPTOR_DAML_NS_URI(rdf_xml_parser), (const unsigned char *)"rest");
+  RAPTOR_DAML_nil_URI(rdf_xml_parser) = raptor_new_uri_from_uri_local_name(world, RAPTOR_DAML_NS_URI(rdf_xml_parser), (const unsigned char *)"nil");
 
-  RAPTOR_RDF_RDF_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "RDF");
-  RAPTOR_RDF_Description_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "Description");
-  RAPTOR_RDF_li_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept_v2(world, "li");
+  RAPTOR_RDF_RDF_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "RDF");
+  RAPTOR_RDF_Description_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "Description");
+  RAPTOR_RDF_li_URI(rdf_xml_parser) = raptor_new_uri_for_rdf_concept(world, "li");
 
-  RAPTOR_RDF_XMLLiteral_URI(rdf_xml_parser) = raptor_new_uri_v2(world, raptor_xml_literal_datatype_uri_string);
+  RAPTOR_RDF_XMLLiteral_URI(rdf_xml_parser) = raptor_new_uri(world, raptor_xml_literal_datatype_uri_string);
 
   /* Check for uri allocation failures */
   if(!RAPTOR_RDF_type_URI(rdf_xml_parser) ||
@@ -1580,9 +1580,9 @@ raptor_rdfxml_process_property_attributes(raptor_parser *rdf_parser,
       continue;
     }
 
-    property_uri = raptor_new_uri_for_rdf_concept_v2(rdf_parser->world, (rdf_syntax_terms_info[i].name));
+    property_uri = raptor_new_uri_for_rdf_concept(rdf_parser->world, (rdf_syntax_terms_info[i].name));
     
-    object_uri = object_is_literal ? (raptor_uri*)value : raptor_new_uri_relative_to_base_v2(rdf_parser->world, raptor_rdfxml_inscope_base_uri(rdf_parser), value);
+    object_uri = object_is_literal ? (raptor_uri*)value : raptor_new_uri_relative_to_base(rdf_parser->world, raptor_rdfxml_inscope_base_uri(rdf_parser), value);
     object_type = object_is_literal ? RAPTOR_TERM_TYPE_LITERAL : RAPTOR_TERM_TYPE_URI;
     
     raptor_rdfxml_generate_statement(rdf_parser, 
@@ -1778,7 +1778,7 @@ raptor_rdfxml_start_element_grammar(raptor_parser *rdf_parser,
         if(element->rdf_attr[RDF_ATTR_ID]) {
           element->subject.id = element->rdf_attr[RDF_ATTR_ID];
           element->rdf_attr[RDF_ATTR_ID] = NULL;
-          element->subject.uri = raptor_new_uri_from_id_v2(rdf_parser->world, base_uri, element->subject.id);
+          element->subject.uri = raptor_new_uri_from_id(rdf_parser->world, base_uri, element->subject.id);
           if(!element->subject.uri)
             goto oom;
           element->subject.type = RAPTOR_TERM_TYPE_URI;
@@ -1797,7 +1797,7 @@ raptor_rdfxml_start_element_grammar(raptor_parser *rdf_parser,
             break;
           }
         } else if(element->rdf_attr[RDF_ATTR_about]) {
-          element->subject.uri = raptor_new_uri_relative_to_base_v2(rdf_parser->world, base_uri, (const unsigned char*)element->rdf_attr[RDF_ATTR_about]);
+          element->subject.uri = raptor_new_uri_relative_to_base(rdf_parser->world, base_uri, (const unsigned char*)element->rdf_attr[RDF_ATTR_about]);
           RAPTOR_FREE(cstring, (void*)element->rdf_attr[RDF_ATTR_about]);
           element->rdf_attr[RDF_ATTR_about] = NULL;
           if(!element->subject.uri)
@@ -1834,7 +1834,7 @@ raptor_rdfxml_start_element_grammar(raptor_parser *rdf_parser,
           if(rdf_parser->features[RAPTOR_FEATURE_ALLOW_BAGID]) {
             element->bag.id = element->rdf_attr[RDF_ATTR_bagID];
             element->rdf_attr[RDF_ATTR_bagID] = NULL;
-            element->bag.uri = raptor_new_uri_from_id_v2(rdf_parser->world, base_uri, element->bag.id);
+            element->bag.uri = raptor_new_uri_from_id(rdf_parser->world, base_uri, element->bag.id);
             if(!element->bag.uri)
               goto oom;
             element->bag.type = RAPTOR_TERM_TYPE_URI;
@@ -2101,7 +2101,7 @@ raptor_rdfxml_start_element_grammar(raptor_parser *rdf_parser,
         if(element->rdf_attr[RDF_ATTR_ID]) {
           element->reified.id = element->rdf_attr[RDF_ATTR_ID];
           element->rdf_attr[RDF_ATTR_ID] = NULL;
-          element->reified.uri = raptor_new_uri_from_id_v2(rdf_parser->world, base_uri, element->reified.id);
+          element->reified.uri = raptor_new_uri_from_id(rdf_parser->world, base_uri, element->reified.id);
           if(!element->reified.uri)
             goto oom;
           element->reified.type = RAPTOR_TERM_TYPE_URI;
@@ -2127,7 +2127,7 @@ raptor_rdfxml_start_element_grammar(raptor_parser *rdf_parser,
          *   http://www.w3.org/TR/rdf-syntax-grammar/#literalPropertyElt 
          */
         if(element->rdf_attr[RDF_ATTR_datatype]) {
-          element->object_literal_datatype = raptor_new_uri_relative_to_base_v2(rdf_parser->world, base_uri, (const unsigned char*)element->rdf_attr[RDF_ATTR_datatype]);
+          element->object_literal_datatype = raptor_new_uri_relative_to_base(rdf_parser->world, base_uri, (const unsigned char*)element->rdf_attr[RDF_ATTR_datatype]);
           RAPTOR_FREE(cstring, (void*)element->rdf_attr[RDF_ATTR_datatype]); 
           element->rdf_attr[RDF_ATTR_datatype] = NULL; 
           if(!element->object_literal_datatype)
@@ -2147,7 +2147,7 @@ raptor_rdfxml_start_element_grammar(raptor_parser *rdf_parser,
             } else {
               element->bag.id = element->rdf_attr[RDF_ATTR_bagID];
               element->rdf_attr[RDF_ATTR_bagID] = NULL;
-              element->bag.uri = raptor_new_uri_from_id_v2(rdf_parser->world, base_uri, element->bag.id);
+              element->bag.uri = raptor_new_uri_from_id(rdf_parser->world, base_uri, element->bag.id);
               if(!element->bag.uri)
                 goto oom;
               element->bag.type = RAPTOR_TERM_TYPE_URI;
@@ -2277,7 +2277,7 @@ raptor_rdfxml_start_element_grammar(raptor_parser *rdf_parser,
            * using this id
            */
           if(element->reified.id && !element->reified.uri) {
-            element->reified.uri = raptor_new_uri_from_id_v2(rdf_parser->world, base_uri, element->reified.id);
+            element->reified.uri = raptor_new_uri_from_id(rdf_parser->world, base_uri, element->reified.id);
             if(!element->reified.uri)
               goto oom;
             element->reified.type = RAPTOR_TERM_TYPE_URI;
@@ -2558,7 +2558,7 @@ raptor_rdfxml_end_element_grammar(raptor_parser *rdf_parser,
 
             if(element->object.type == RAPTOR_TERM_TYPE_UNKNOWN) {
               if(element->rdf_attr[RDF_ATTR_resource]) {
-                element->object.uri = raptor_new_uri_relative_to_base_v2(rdf_parser->world,
+                element->object.uri = raptor_new_uri_relative_to_base(rdf_parser->world,
                                                                        raptor_rdfxml_inscope_base_uri(rdf_parser),
                                                                        (const unsigned char*)element->rdf_attr[RDF_ATTR_resource]);
                 RAPTOR_FREE(cstring, (void*)element->rdf_attr[RDF_ATTR_resource]);
diff --git a/src/raptor_rss.c b/src/raptor_rss.c
index 692d092b..32b28293 100644
--- a/src/raptor_rss.c
+++ b/src/raptor_rss.c
@@ -352,7 +352,7 @@ raptor_rss_block_set_field(raptor_world *world, raptor_uri *base_uri,
   int offset = bfi->offset;
   if(attribute_type == RSS_BLOCK_FIELD_TYPE_URL) {
     raptor_uri* uri;
-    uri = raptor_new_uri_relative_to_base_v2(world, base_uri,
+    uri = raptor_new_uri_relative_to_base(world, base_uri,
                                              (const unsigned char*)string);
     block->urls[offset] = uri;
   } else if(attribute_type == RSS_BLOCK_FIELD_TYPE_STRING) {
@@ -447,7 +447,7 @@ raptor_rss_start_element_handler(void *user_data,
         if(!strcmp(attrName, "about")) {
           if(update_item) {
             raptor_uri *new_uri;
-            update_item->uri = raptor_new_uri_v2(rdf_parser->world, attrValue);
+            update_item->uri = raptor_new_uri(rdf_parser->world, attrValue);
             new_uri = raptor_uri_copy_v2(rdf_parser->world, update_item->uri);
             raptor_set_identifier_uri(&update_item->identifier, new_uri);
           }
@@ -598,7 +598,7 @@ raptor_rss_start_element_handler(void *user_data,
             raptor_rss_item_add_field(update_item, RAPTOR_RSS_FIELD_GUID, field);
             if(!strcmp((const char*)attrValue, "true")) {
               RAPTOR_DEBUG2("    setting guid to URI '%s'\n", attrValue);
-              field->uri = raptor_new_uri_relative_to_base_v2(rdf_parser->world, base_uri,
+              field->uri = raptor_new_uri_relative_to_base(rdf_parser->world, base_uri,
                                                               (const unsigned char*)attrValue);
             } else {
               size_t len = strlen((const char*)attrValue);
@@ -614,7 +614,7 @@ raptor_rss_start_element_handler(void *user_data,
           RAPTOR_DEBUG2("  setting href as URI string for type %s\n", raptor_rss_items_info[rss_parser->current_type].name);
           if(rss_element->uri)
             raptor_free_uri_v2(rdf_parser->world, rss_element->uri);
-          rss_element->uri = raptor_new_uri_relative_to_base_v2(rdf_parser->world, base_uri,
+          rss_element->uri = raptor_new_uri_relative_to_base(rdf_parser->world, base_uri,
                                                                 (const unsigned char*)attrValue);
         }
       } else if(!strcmp((const char*)attrName, "type")) {
@@ -761,7 +761,7 @@ raptor_rss_end_element_handler(void *user_data,
       if(raptor_rss_fields_info[rss_parser->current_field].flags & 
          RAPTOR_RSS_INFO_FLAG_URI_VALUE) {
         RAPTOR_DEBUG4("Added URI %s to field %s of type %s\n", cdata, raptor_rss_fields_info[rss_parser->current_field].name, raptor_rss_items_info[rss_parser->current_type].name);
-        field->uri = raptor_new_uri_relative_to_base_v2(rdf_parser->world, base_uri, cdata);
+        field->uri = raptor_new_uri_relative_to_base(rdf_parser->world, base_uri, cdata);
       } else {
         RAPTOR_DEBUG4("Added text '%s' to field %s of type %s\n", cdata, raptor_rss_fields_info[rss_parser->current_field].name, raptor_rss_items_info[rss_parser->current_type].name);
         field->uri = NULL;
@@ -982,7 +982,7 @@ raptor_rss_insert_identifiers(raptor_parser* rdf_parser)
           for(field = item->fields[url_fields[f]]; field; field = field->next) {
             raptor_uri *new_uri;
             if(field->value)
-              new_uri = raptor_new_uri_v2(rdf_parser->world,
+              new_uri = raptor_new_uri(rdf_parser->world,
                                           (const unsigned char*)field->value);
             else if(field->uri)
               new_uri = raptor_uri_copy_v2(rdf_parser->world, field->uri);
@@ -1025,14 +1025,14 @@ raptor_rss_insert_identifiers(raptor_parser* rdf_parser)
     } else {
       if(item->fields[RAPTOR_RSS_FIELD_LINK]) {
         if(item->fields[RAPTOR_RSS_FIELD_LINK]->value)
-          uri = raptor_new_uri_v2(rdf_parser->world,
+          uri = raptor_new_uri(rdf_parser->world,
                                   (const unsigned char*)item->fields[RAPTOR_RSS_FIELD_LINK]->value);
         else if(item->fields[RAPTOR_RSS_FIELD_LINK]->uri)
           uri = raptor_uri_copy_v2(rdf_parser->world,
                                    item->fields[RAPTOR_RSS_FIELD_LINK]->uri);
       } else if(item->fields[RAPTOR_RSS_FIELD_ATOM_ID]) {
         if(item->fields[RAPTOR_RSS_FIELD_ATOM_ID]->value)
-          uri = raptor_new_uri_v2(rdf_parser->world,
+          uri = raptor_new_uri(rdf_parser->world,
                                   (const unsigned char*)item->fields[RAPTOR_RSS_FIELD_ATOM_ID]->value);
         else if(item->fields[RAPTOR_RSS_FIELD_ATOM_ID]->uri)
           uri = raptor_uri_copy_v2(rdf_parser->world,
diff --git a/src/raptor_rss_common.c b/src/raptor_rss_common.c
index f7a1659e..872428bd 100644
--- a/src/raptor_rss_common.c
+++ b/src/raptor_rss_common.c
@@ -313,7 +313,7 @@ raptor_rss_common_init(raptor_world* world) {
   for(i = 0; i < RAPTOR_RSS_NAMESPACES_SIZE;i++) {
     const char *uri_string = raptor_rss_namespaces_info[i].uri_string;
     if(uri_string) {
-      world->rss_namespaces_info_uris[i] = raptor_new_uri_v2(world, (const unsigned char*)uri_string);
+      world->rss_namespaces_info_uris[i] = raptor_new_uri(world, (const unsigned char*)uri_string);
       if(!world->rss_namespaces_info_uris[i])
         return -1;
     }
@@ -326,7 +326,7 @@ raptor_rss_common_init(raptor_world* world) {
     int n = raptor_rss_items_info[i].nspace;
     namespace_uri = world->rss_namespaces_info_uris[n];
     if(namespace_uri) {
-      world->rss_types_info_uris[i] = raptor_new_uri_from_uri_local_name_v2(world, namespace_uri, (const unsigned char*)raptor_rss_items_info[i].name);
+      world->rss_types_info_uris[i] = raptor_new_uri_from_uri_local_name(world, namespace_uri, (const unsigned char*)raptor_rss_items_info[i].name);
       if(!world->rss_types_info_uris[i])
         return -1;
     }
@@ -338,7 +338,7 @@ raptor_rss_common_init(raptor_world* world) {
   for(i = 0; i< RAPTOR_RSS_FIELDS_SIZE; i++) {
     namespace_uri = world->rss_namespaces_info_uris[raptor_rss_fields_info[i].nspace];
     if(namespace_uri) {
-      world->rss_fields_info_uris[i] = raptor_new_uri_from_uri_local_name_v2(world, namespace_uri,
+      world->rss_fields_info_uris[i] = raptor_new_uri_from_uri_local_name(world, namespace_uri,
                                                                            (const unsigned char*)raptor_rss_fields_info[i].name);
       if(!world->rss_fields_info_uris[i])
         return -1;
@@ -394,9 +394,9 @@ raptor_rss_model_init(raptor_world* world, raptor_rss_model* rss_model)
   rss_model->last = rss_model->items = NULL;
   rss_model->items_count = 0;
 
-  RAPTOR_RSS_RDF_type_URI(rss_model) = raptor_new_uri_for_rdf_concept_v2(world, "type");
-  RAPTOR_RSS_RDF_Seq_URI(rss_model) = raptor_new_uri_for_rdf_concept_v2(world, "Seq");
-  RAPTOR_RSS_RSS_items_URI(rss_model) = raptor_new_uri_relative_to_base_v2(world, world->rss_namespaces_info_uris[RSS1_0_NS], (const unsigned char*)"items");
+  RAPTOR_RSS_RDF_type_URI(rss_model) = raptor_new_uri_for_rdf_concept(world, "type");
+  RAPTOR_RSS_RDF_Seq_URI(rss_model) = raptor_new_uri_for_rdf_concept(world, "Seq");
+  RAPTOR_RSS_RSS_items_URI(rss_model) = raptor_new_uri_relative_to_base(world, world->rss_namespaces_info_uris[RSS1_0_NS], (const unsigned char*)"items");
 }
   
 
diff --git a/src/raptor_sax2.c b/src/raptor_sax2.c
index 02ceb3dd..33456462 100644
--- a/src/raptor_sax2.c
+++ b/src/raptor_sax2.c
@@ -879,8 +879,8 @@ raptor_sax2_start_element(void* user_data, const unsigned char *name,
         raptor_uri* base_uri;
         raptor_uri* xuri;
         base_uri = raptor_sax2_inscope_base_uri(sax2);
-        xuri = raptor_new_uri_relative_to_base_v2(sax2->world, base_uri, atts[i+1]);
-        xml_base = raptor_new_uri_for_xmlbase_v2(sax2->world, xuri);
+        xuri = raptor_new_uri_relative_to_base(sax2->world, base_uri, atts[i+1]);
+        xml_base = raptor_new_uri_for_xmlbase(sax2->world, xuri);
         raptor_free_uri_v2(sax2->world, xuri);
       }
 
diff --git a/src/raptor_serialize.c b/src/raptor_serialize.c
index 70729eec..2e5e96b7 100644
--- a/src/raptor_serialize.c
+++ b/src/raptor_serialize.c
@@ -486,7 +486,7 @@ raptor_serialize_start_to_filename(raptor_serializer *rdf_serializer,
   if(rdf_serializer->base_uri)
     raptor_free_uri_v2(rdf_serializer->world, rdf_serializer->base_uri);
 
-  rdf_serializer->base_uri = raptor_new_uri_v2(rdf_serializer->world, uri_string);
+  rdf_serializer->base_uri = raptor_new_uri(rdf_serializer->world, uri_string);
   rdf_serializer->locator.uri = rdf_serializer->base_uri;
   rdf_serializer->locator.line = rdf_serializer->locator.column = 0;
 
@@ -923,7 +923,7 @@ raptor_serializer_set_feature_string(raptor_serializer *serializer,
   switch(feature) {
     case RAPTOR_FEATURE_START_URI:
       if(value)
-        serializer->feature_start_uri = raptor_new_uri_v2(serializer->world, value);
+        serializer->feature_start_uri = raptor_new_uri(serializer->world, value);
       else
         return -1;
       break;
diff --git a/src/raptor_serialize_rdfxml.c b/src/raptor_serialize_rdfxml.c
index 7da5f1c3..96fc871d 100644
--- a/src/raptor_serialize_rdfxml.c
+++ b/src/raptor_serialize_rdfxml.c
@@ -104,7 +104,7 @@ raptor_rdfxml_serialize_init(raptor_serializer* serializer, const char *name)
 
   context->namespaces = raptor_new_sequence(NULL, NULL);
 
-  context->rdf_xml_literal_uri = raptor_new_uri_v2(serializer->world, raptor_xml_literal_datatype_uri_string);
+  context->rdf_xml_literal_uri = raptor_new_uri(serializer->world, raptor_xml_literal_datatype_uri_string);
 
   if(!context->xml_nspace || !context->rdf_nspace || !context->namespaces ||
      !context->rdf_xml_literal_uri) {
@@ -398,7 +398,7 @@ raptor_rdfxml_serialize_statement(raptor_serializer* serializer,
     }
 
     c=*name; *name='\0';
-    predicate_ns_uri = raptor_new_uri_v2(serializer->world, uri_string);
+    predicate_ns_uri = raptor_new_uri(serializer->world, uri_string);
     if(!predicate_ns_uri)
       goto oom;
     *name=c;
diff --git a/src/raptor_serialize_rdfxmla.c b/src/raptor_serialize_rdfxmla.c
index 26781129..5bbc5f15 100644
--- a/src/raptor_serialize_rdfxmla.c
+++ b/src/raptor_serialize_rdfxmla.c
@@ -882,7 +882,7 @@ raptor_rdfxmla_serialize_init(raptor_serializer* serializer, const char *name)
                        (raptor_data_compare_function)raptor_abbrev_node_cmp,
                        (raptor_data_free_function)raptor_free_abbrev_node, 0);
 
-  rdf_type_uri = raptor_new_uri_for_rdf_concept_v2(serializer->world, "type");
+  rdf_type_uri = raptor_new_uri_for_rdf_concept(serializer->world, "type");
   if(rdf_type_uri) {    
     context->rdf_type = raptor_new_abbrev_node(serializer->world,
                                                RAPTOR_TERM_TYPE_URI,
@@ -890,7 +890,7 @@ raptor_rdfxmla_serialize_init(raptor_serializer* serializer, const char *name)
     raptor_free_uri_v2(serializer->world, rdf_type_uri);
   }
 
-  context->rdf_xml_literal_uri = raptor_new_uri_v2(serializer->world, raptor_xml_literal_datatype_uri_string);
+  context->rdf_xml_literal_uri = raptor_new_uri(serializer->world, raptor_xml_literal_datatype_uri_string);
 
   if(!context->xml_nspace || !context->rdf_nspace || !context->namespaces ||
      !context->subjects || !context->blanks || !context->nodes ||
diff --git a/src/raptor_serialize_rss.c b/src/raptor_serialize_rss.c
index 57534453..5121c0a3 100644
--- a/src/raptor_serialize_rss.c
+++ b/src/raptor_serialize_rss.c
@@ -210,7 +210,7 @@ raptor_rss10_serialize_init(raptor_serializer* serializer, const char *name)
 
   rss_serializer->nstack = raptor_new_namespaces_v2(serializer->world, 1);
 
-  rss_serializer->xml_literal_dt = raptor_new_uri_v2(serializer->world, raptor_xml_literal_datatype_uri_string);
+  rss_serializer->xml_literal_dt = raptor_new_uri(serializer->world, raptor_xml_literal_datatype_uri_string);
 
   return 0;
 }
@@ -332,7 +332,7 @@ raptor_rss10_move_statements(raptor_rss10_serializer_context *rss_serializer,
      * for this item, and to the group map (blank node closure)
      */
     if(s->object.type == RAPTOR_TERM_TYPE_BLANK) {
-      raptor_uri* fake_uri = raptor_new_uri_v2(rss_serializer->world, (const unsigned char*)s->object.value);
+      raptor_uri* fake_uri = raptor_new_uri(rss_serializer->world, (const unsigned char*)s->object.value);
       raptor_rss10_set_item_group(rss_serializer, fake_uri, item);
       raptor_free_uri_v2(rss_serializer->world, fake_uri);
 
@@ -468,7 +468,7 @@ raptor_rss10_move_anonymous_statements(raptor_rss10_serializer_context *rss_seri
       if(s->subject.type != RAPTOR_TERM_TYPE_BLANK)
         continue;
       
-      fake_uri = raptor_new_uri_v2(rss_serializer->world, (const unsigned char*)s->subject.value);
+      fake_uri = raptor_new_uri(rss_serializer->world, (const unsigned char*)s->subject.value);
       item = raptor_rss10_get_group_item(rss_serializer, fake_uri);
       raptor_free_uri_v2(rss_serializer->world, fake_uri);
       
@@ -482,7 +482,7 @@ raptor_rss10_move_anonymous_statements(raptor_rss10_serializer_context *rss_seri
 #endif
 
         if(s->object.type == RAPTOR_TERM_TYPE_BLANK) {
-          fake_uri = raptor_new_uri_v2(rss_serializer->world, (const unsigned char*)s->object.value);
+          fake_uri = raptor_new_uri(rss_serializer->world, (const unsigned char*)s->object.value);
           raptor_rss10_set_item_group(rss_serializer, fake_uri, item);
           raptor_free_uri_v2(rss_serializer->world, fake_uri);
         }
@@ -648,7 +648,7 @@ raptor_rss10_store_statement(raptor_rss10_serializer_context *rss_serializer,
   int is_atom = rss_serializer->is_atom;
   raptor_uri* fake_uri;
   
-  fake_uri = raptor_new_uri_v2(rss_serializer->world, (const unsigned char*)s->subject.value);
+  fake_uri = raptor_new_uri(rss_serializer->world, (const unsigned char*)s->subject.value);
   item = raptor_rss10_get_group_item(rss_serializer, fake_uri);
   raptor_free_uri_v2(rss_serializer->world, fake_uri);
 
@@ -814,7 +814,7 @@ raptor_rss10_serialize_statement(raptor_serializer* serializer,
     if(statement->subject.type == RAPTOR_TERM_TYPE_BLANK) {
       RAPTOR_DEBUG2("Saw rdf:Seq with blank node %s\n",
                     (char*)statement->subject.value);
-      rss_serializer->seq_uri = raptor_new_uri_v2(rss_serializer->world,
+      rss_serializer->seq_uri = raptor_new_uri(rss_serializer->world,
                                                   (unsigned char*)statement->subject.value);
     } else {
       RAPTOR_DEBUG2("Saw rdf:Seq with URI <%s>\n",
@@ -946,7 +946,7 @@ raptor_rss10_build_items(raptor_rss10_serializer_context *rss_serializer)
   
 
     if(s->subject.type == RAPTOR_TERM_TYPE_BLANK)
-      fake_uri = raptor_new_uri_v2(rss_serializer->world, (unsigned char*)s->subject.value);
+      fake_uri = raptor_new_uri(rss_serializer->world, (unsigned char*)s->subject.value);
     else
       fake_uri = raptor_uri_copy_v2(rss_serializer->world, (raptor_uri*)s->subject.value);
       
@@ -2032,7 +2032,7 @@ raptor_rss10_serialize_end(raptor_serializer* serializer) {
     raptor_rss10_remove_mapped_fields(rss_serializer);
 
     if(serializer->feature_atom_entry_uri) {
-      entry_uri = raptor_new_uri_v2(rss_serializer->world, serializer->feature_atom_entry_uri);
+      entry_uri = raptor_new_uri(rss_serializer->world, serializer->feature_atom_entry_uri);
       for(i = 0; i < raptor_sequence_size(rss_serializer->items); i++) {
         raptor_rss_item* item;
         item = (raptor_rss_item*)raptor_sequence_get_at(rss_serializer->items, i);
diff --git a/src/raptor_serialize_turtle.c b/src/raptor_serialize_turtle.c
index bec0fe4d..d4fc3f4f 100644
--- a/src/raptor_serialize_turtle.c
+++ b/src/raptor_serialize_turtle.c
@@ -774,7 +774,7 @@ raptor_turtle_serialize_init(raptor_serializer* serializer, const char *name)
                        (raptor_data_compare_function)raptor_abbrev_node_cmp,
                        (raptor_data_free_function)raptor_free_abbrev_node, 0);
 
-  rdf_type_uri = raptor_new_uri_for_rdf_concept_v2(serializer->world, "type");
+  rdf_type_uri = raptor_new_uri_for_rdf_concept(serializer->world, "type");
   if(rdf_type_uri) {
     context->rdf_type = raptor_new_abbrev_node(serializer->world,
                                                RAPTOR_TERM_TYPE_URI,
@@ -783,10 +783,10 @@ raptor_turtle_serialize_init(raptor_serializer* serializer, const char *name)
   } else
     context->rdf_type = NULL;
 
-  context->rdf_xml_literal_uri = raptor_new_uri_v2(serializer->world, raptor_xml_literal_datatype_uri_string);
-  context->rdf_first_uri = raptor_new_uri_v2(serializer->world, (const unsigned char*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#first");
-  context->rdf_rest_uri = raptor_new_uri_v2(serializer->world, (const unsigned char*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#rest");
-  context->rdf_nil_uri = raptor_new_uri_v2(serializer->world, (const unsigned char*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
+  context->rdf_xml_literal_uri = raptor_new_uri(serializer->world, raptor_xml_literal_datatype_uri_string);
+  context->rdf_first_uri = raptor_new_uri(serializer->world, (const unsigned char*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#first");
+  context->rdf_rest_uri = raptor_new_uri(serializer->world, (const unsigned char*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#rest");
+  context->rdf_nil_uri = raptor_new_uri(serializer->world, (const unsigned char*)"http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
 
   if(!context->rdf_nspace || !context->namespaces ||
      !context->subjects || !context->blanks || !context->nodes ||
diff --git a/src/raptor_set.c b/src/raptor_set.c
index 9722b077..441d1e7c 100644
--- a/src/raptor_set.c
+++ b/src/raptor_set.c
@@ -273,7 +273,7 @@ main(int argc, char *argv[])
   if(!world || raptor_world_open(world))
     exit(1);
     
-  base_uri = raptor_new_uri_v2(world, (const unsigned char*)"http://example.org/base#");
+  base_uri = raptor_new_uri(world, (const unsigned char*)"http://example.org/base#");
 
 #if RAPTOR_DEBUG > 1
   fprintf(stderr, "%s: Creating set\n", program);
diff --git a/src/raptor_turtle_writer.c b/src/raptor_turtle_writer.c
index 4a38ae0b..6797a521 100644
--- a/src/raptor_turtle_writer.c
+++ b/src/raptor_turtle_writer.c
@@ -182,10 +182,10 @@ raptor_new_turtle_writer(raptor_world* world,
     raptor_turtle_writer_base(turtle_writer, base_uri);
   turtle_writer->base_uri = base_uri;
 
-  turtle_writer->xsd_boolean_uri = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#boolean");
-  turtle_writer->xsd_decimal_uri = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#decimal");
-  turtle_writer->xsd_double_uri = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#double");
-  turtle_writer->xsd_integer_uri = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#integer");
+  turtle_writer->xsd_boolean_uri = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#boolean");
+  turtle_writer->xsd_decimal_uri = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#decimal");
+  turtle_writer->xsd_double_uri = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#double");
+  turtle_writer->xsd_integer_uri = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#integer");
   
   return turtle_writer;
 }
@@ -922,7 +922,7 @@ main(int argc, char *argv[])
 
   nstack = raptor_new_namespaces_v2(world, 1);
 
-  base_uri = raptor_new_uri_v2(world, base_uri_string);
+  base_uri = raptor_new_uri(world, base_uri_string);
 
   turtle_writer = raptor_new_turtle_writer(world, base_uri, 1, nstack, iostr);
   if(!turtle_writer) {
@@ -964,7 +964,7 @@ main(int argc, char *argv[])
 
   raptor_turtle_writer_raw_counted(turtle_writer, (const unsigned char*)" ", 1);
 
-  datatype = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#decimal");
+  datatype = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#decimal");
   raptor_turtle_writer_literal(turtle_writer, nstack,
                                (const unsigned char*)"10.0", NULL,
                                datatype);
diff --git a/src/raptor_uri.c b/src/raptor_uri.c
index ce47ba3b..cc401f0e 100644
--- a/src/raptor_uri.c
+++ b/src/raptor_uri.c
@@ -65,7 +65,7 @@
 
 
 /**
- * raptor_new_uri_v2:
+ * raptor_new_uri:
  * @world: raptor_world object
  * @uri_string: URI string.
  * 
@@ -74,7 +74,7 @@
  * Return value: a new #raptor_uri object or NULL on failure.
  **/
 raptor_uri*
-raptor_new_uri_v2(raptor_world* world, const unsigned char *uri_string) 
+raptor_new_uri(raptor_world* world, const unsigned char *uri_string) 
 {
   unsigned char *p;
   size_t len;
@@ -101,7 +101,7 @@ raptor_new_uri_v2(raptor_world* world, const unsigned char *uri_string)
           return NULL;
         *new_fragment='#';
         strcpy((char*)new_fragment+1, (const char*)fragment);
-        new_uri = raptor_new_uri_relative_to_base_v2(world, uri, new_fragment);
+        new_uri = raptor_new_uri_relative_to_base(world, uri, new_fragment);
         RAPTOR_FREE(cstring, new_fragment);
         raptor_free_uri_v2(world, uri);
         uri = new_uri;
@@ -125,7 +125,7 @@ raptor_new_uri_v2(raptor_world* world, const unsigned char *uri_string)
 
 
 /**
- * raptor_new_uri_from_uri_local_name_v2:
+ * raptor_new_uri_from_uri_local_name:
  * @world: raptor_world object
  * @uri: existing #raptor_uri
  * @local_name: local name
@@ -139,7 +139,7 @@ raptor_new_uri_v2(raptor_world* world, const unsigned char *uri_string)
  * Return value: a new #raptor_uri object or NULL on failure.
  **/
 raptor_uri*
-raptor_new_uri_from_uri_local_name_v2(raptor_world* world, raptor_uri *uri, const unsigned char *local_name)
+raptor_new_uri_from_uri_local_name(raptor_world* world, raptor_uri *uri, const unsigned char *local_name)
 {
   int uri_length;
   unsigned char *p;
@@ -161,7 +161,7 @@ raptor_new_uri_from_uri_local_name_v2(raptor_world* world, raptor_uri *uri, cons
 
 
 /**
- * raptor_new_uri_relative_to_base_v2:
+ * raptor_new_uri_relative_to_base:
  * @world: raptor_world object
  * @base_uri: existing base URI
  * @uri_string: relative URI string
@@ -171,7 +171,7 @@ raptor_new_uri_from_uri_local_name_v2(raptor_world* world, raptor_uri *uri, cons
  * Return value: a new #raptor_uri object or NULL on failure.
  **/
 raptor_uri*
-raptor_new_uri_relative_to_base_v2(raptor_world* world,
+raptor_new_uri_relative_to_base(raptor_world* world,
                                    raptor_uri *base_uri, 
                                    const unsigned char *uri_string) 
 {
@@ -202,7 +202,7 @@ raptor_new_uri_relative_to_base_v2(raptor_world* world,
 
 
 /**
- * raptor_new_uri_from_id_v2:
+ * raptor_new_uri_from_id:
  * @world: raptor_world object
  * @base_uri: existing base URI
  * @id: RDF ID
@@ -215,7 +215,7 @@ raptor_new_uri_relative_to_base_v2(raptor_world* world,
  * Return value: a new #raptor_uri object or NULL on failure.
  **/
 raptor_uri*
-raptor_new_uri_from_id_v2(raptor_world *world, raptor_uri *base_uri,
+raptor_new_uri_from_id(raptor_world *world, raptor_uri *base_uri,
                           const unsigned char *id) 
 {
   raptor_uri *new_uri;
@@ -236,14 +236,14 @@ raptor_new_uri_from_id_v2(raptor_world *world, raptor_uri *base_uri,
     return NULL;
   *local_name='#';
   strcpy((char*)local_name+1, (char*)id);
-  new_uri = raptor_new_uri_relative_to_base_v2(world, base_uri, local_name);
+  new_uri = raptor_new_uri_relative_to_base(world, base_uri, local_name);
   RAPTOR_FREE(cstring, local_name);
   return new_uri;
 }
 
 
 /**
- * raptor_new_uri_for_rdf_concept_v2:
+ * raptor_new_uri_for_rdf_concept:
  * @world: raptor_world object
  * @name: RDF namespace concept
  * 
@@ -255,7 +255,7 @@ raptor_new_uri_from_id_v2(raptor_world *world, raptor_uri *base_uri,
  * Return value: a new #raptor_uri object or NULL on failure
  **/
 raptor_uri*
-raptor_new_uri_for_rdf_concept_v2(raptor_world* world, const char *name) 
+raptor_new_uri_for_rdf_concept(raptor_world* world, const char *name) 
 {
   raptor_uri *new_uri;
   const unsigned char *base_uri = raptor_rdf_namespace_uri;
@@ -760,7 +760,7 @@ raptor_uri_uri_string_is_file_uri(const unsigned char* uri_string) {
 
 
 /**
- * raptor_new_uri_for_xmlbase_v2:
+ * raptor_new_uri_for_xmlbase:
  * @world: raptor_world object
  * @old_uri: URI to transform
  *
@@ -772,7 +772,7 @@ raptor_uri_uri_string_is_file_uri(const unsigned char* uri_string) {
  * Return value: new #raptor_uri object or NULL on failure.
  **/
 raptor_uri*
-raptor_new_uri_for_xmlbase_v2(raptor_world* world, raptor_uri* old_uri)
+raptor_new_uri_for_xmlbase(raptor_world* world, raptor_uri* old_uri)
 {
   unsigned char *uri_string;
   unsigned char *new_uri_string;
@@ -800,7 +800,7 @@ raptor_new_uri_for_xmlbase_v2(raptor_world* world, raptor_uri* old_uri)
   if(!new_uri_string)
     return NULL;
   
-  new_uri = raptor_new_uri_v2(world, new_uri_string);
+  new_uri = raptor_new_uri(world, new_uri_string);
   RAPTOR_FREE(cstring, new_uri_string);
 
   return new_uri;
@@ -808,7 +808,7 @@ raptor_new_uri_for_xmlbase_v2(raptor_world* world, raptor_uri* old_uri)
 
 
 /**
- * raptor_new_uri_for_retrieval_v2:
+ * raptor_new_uri_for_retrieval:
  * @world: raptor_world object
  * @old_uri: URI to transform
  *
@@ -820,7 +820,7 @@ raptor_new_uri_for_xmlbase_v2(raptor_world* world, raptor_uri* old_uri)
  * Return value: new #raptor_uri object or NULL on failure.
  **/
 raptor_uri*
-raptor_new_uri_for_retrieval_v2(raptor_world* world, raptor_uri* old_uri)
+raptor_new_uri_for_retrieval(raptor_world* world, raptor_uri* old_uri)
 {
   unsigned char *uri_string;
   unsigned char *new_uri_string;
@@ -847,7 +847,7 @@ raptor_new_uri_for_retrieval_v2(raptor_world* world, raptor_uri* old_uri)
   if(!new_uri_string)
     return NULL;
   
-  new_uri = raptor_new_uri_v2(world, new_uri_string);
+  new_uri = raptor_new_uri(world, new_uri_string);
   RAPTOR_FREE(cstring, new_uri_string);
 
   return new_uri;
@@ -1303,7 +1303,7 @@ raptor_new_uri_from_rdf_ordinal(raptor_world* world, int ordinal)
           raptor_rdf_namespace_uri_len);
   sprintf((char*)uri_string+raptor_rdf_namespace_uri_len, "_%d",
           ordinal);
-  return raptor_new_uri_v2(world, uri_string);
+  return raptor_new_uri(world, uri_string);
 }
 
 
@@ -1375,11 +1375,11 @@ assert_uri_to_relative(raptor_world *world, const char *base, const char *uri, c
   unsigned char *output;
   int result;
   raptor_uri* base_uri = NULL;
-  raptor_uri* reference_uri = raptor_new_uri_v2(world, (const unsigned char*)uri);
+  raptor_uri* reference_uri = raptor_new_uri(world, (const unsigned char*)uri);
   size_t length = 0;
 
   if(base)
-    base_uri = raptor_new_uri_v2(world, (const unsigned char*)base);
+    base_uri = raptor_new_uri(world, (const unsigned char*)base);
   
   output = raptor_uri_to_relative_counted_uri_string_v2(world,
                                                       base_uri, reference_uri, 
@@ -1493,7 +1493,7 @@ main(int argc, char *argv[])
  
 #endif
 
-  uri1 = raptor_new_uri_v2(world, (const unsigned char*)base_uri);
+  uri1 = raptor_new_uri(world, (const unsigned char*)base_uri);
 
   str = raptor_uri_as_string_v2(world, uri1);
   if(strcmp((const char*)str, base_uri)) {
@@ -1503,7 +1503,7 @@ main(int argc, char *argv[])
     failures++;
   }
   
-  uri2 = raptor_new_uri_for_xmlbase_v2(world, uri1);
+  uri2 = raptor_new_uri_for_xmlbase(world, uri1);
   str = raptor_uri_as_string_v2(world, uri2);
   if(strcmp((const char*)str, base_uri_xmlbase)) {
     fprintf(stderr, 
@@ -1512,7 +1512,7 @@ main(int argc, char *argv[])
     failures++;
   }
   
-  uri3 = raptor_new_uri_for_retrieval_v2(world, uri1);
+  uri3 = raptor_new_uri_for_retrieval(world, uri1);
 
   str = raptor_uri_as_string_v2(world, uri3);
   if(strcmp((const char*)str, base_uri_retrievable)) {
@@ -1551,8 +1551,8 @@ main(int argc, char *argv[])
     raptor_uri* u1;
     raptor_uri* u2;
     
-    u1 = raptor_new_uri_v2(world, (const unsigned char *)"http://example.org/abc");
-    u2 = raptor_new_uri_v2(world, (const unsigned char *)"http://example.org/def");
+    u1 = raptor_new_uri(world, (const unsigned char *)"http://example.org/abc");
+    u2 = raptor_new_uri(world, (const unsigned char *)"http://example.org/def");
 
     ret = raptor_uri_compare_v2(world, u1, u2);
     if(!(ret < 0)) {
diff --git a/src/raptor_www.c b/src/raptor_www.c
index e87cc2c3..132dd108 100644
--- a/src/raptor_www.c
+++ b/src/raptor_www.c
@@ -636,7 +636,7 @@ raptor_www_fetch(raptor_www *www, raptor_uri *uri)
 {
   int status = 1;
   
-  www->uri = raptor_new_uri_for_retrieval_v2(www->world, uri);
+  www->uri = raptor_new_uri_for_retrieval(www->world, uri);
   
   www->locator.uri = uri;
   www->locator.line= -1;
diff --git a/src/raptor_www_curl.c b/src/raptor_www_curl.c
index 0b5abee5..4191420d 100644
--- a/src/raptor_www_curl.c
+++ b/src/raptor_www_curl.c
@@ -55,7 +55,7 @@ raptor_www_curl_update_status(raptor_www* www)
   
   if(curl_easy_getinfo(www->curl_handle, CURLINFO_EFFECTIVE_URL, 
                        &final_uri) == CURLE_OK) {
-    www->final_uri = raptor_new_uri_v2(www->world, (const unsigned char*)final_uri);
+    www->final_uri = raptor_new_uri(www->world, (const unsigned char*)final_uri);
     if(www->final_uri_handler)
       www->final_uri_handler(www, www->final_uri_userdata, www->final_uri);
   }
diff --git a/src/raptor_www_test.c b/src/raptor_www_test.c
index 5e8ef123..c4a08df7 100644
--- a/src/raptor_www_test.c
+++ b/src/raptor_www_test.c
@@ -67,7 +67,7 @@ int main (int argc, char *argv[])
   if(!world || raptor_world_open(world))
     exit(1);
 
-  uri = raptor_new_uri_v2(world, (const unsigned char*)uri_string);
+  uri = raptor_new_uri(world, (const unsigned char*)uri_string);
   if(!uri) {
     fprintf(stderr, "Failed to create Raptor URI for %s\n", uri_string);
     exit(1);
diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
index f2e5f917..425ef152 100644
--- a/src/raptor_xml_writer.c
+++ b/src/raptor_xml_writer.c
@@ -1127,7 +1127,7 @@ main(int argc, char *argv[])
     exit(1);
   }
 
-  base_uri = raptor_new_uri_v2(world, base_uri_string);
+  base_uri = raptor_new_uri(world, base_uri_string);
 
   foo_ns = raptor_new_namespace(nstack,
                               (const unsigned char*)"foo",
diff --git a/src/raptor_xsd.c b/src/raptor_xsd.c
index 49adab90..49ed19e9 100644
--- a/src/raptor_xsd.c
+++ b/src/raptor_xsd.c
@@ -57,7 +57,7 @@ raptor_new_identifier_from_double(raptor_world* world, double d)
     sprintf((char*)string, "%1g.0", d);
   else
     sprintf((char*)string, "%1g", d);
-  uri = raptor_new_uri_v2(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#double");
+  uri = raptor_new_uri(world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#double");
   return raptor_new_identifier_v2(world, RAPTOR_TERM_TYPE_LITERAL, NULL, NULL, string, uri, NULL);
 }
 
diff --git a/src/turtle_lexer.l b/src/turtle_lexer.l
index 63605f51..507a9870 100644
--- a/src/turtle_lexer.l
+++ b/src/turtle_lexer.l
@@ -329,7 +329,7 @@ EXPONENT [eE][+-]?[0-9]+
                     YY_FATAL_ERROR_EOF("raptor_stringbuffer_append_turtle_string failed");
                   }
                   uri_string = raptor_stringbuffer_as_string(sb);
-                  turtle_parser_lval->uri = raptor_new_uri_relative_to_base_v2(rdf_parser->world, rdf_parser->base_uri, uri_string);
+                  turtle_parser_lval->uri = raptor_new_uri_relative_to_base(rdf_parser->world, rdf_parser->base_uri, uri_string);
                   if(!turtle_parser_lval->uri) {
                     raptor_free_stringbuffer(sb);
                     TURTLE_LEXER_OOM();
diff --git a/src/turtle_parser.y b/src/turtle_parser.y
index d2ce9c39..539b5bb0 100644
--- a/src/turtle_parser.y
+++ b/src/turtle_parser.y
@@ -498,7 +498,7 @@ verb: predicate
   printf("verb predicate = rdf:type (a)\n");
 #endif
 
-  uri = raptor_new_uri_for_rdf_concept_v2(((raptor_parser*)rdf_parser)->world, "type");
+  uri = raptor_new_uri_for_rdf_concept(((raptor_parser*)rdf_parser)->world, "type");
   if(!uri)
     YYERROR;
   $$=raptor_new_identifier_v2(((raptor_parser*)rdf_parser)->world, RAPTOR_TERM_TYPE_URI, uri, NULL, NULL, NULL, NULL);
@@ -820,7 +820,7 @@ literal: STRING_LITERAL AT IDENTIFIER
 #if RAPTOR_DEBUG > 1  
   printf("resource integer=%s\n", $1);
 #endif
-  uri = raptor_new_uri_v2(((raptor_parser*)rdf_parser)->world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#integer");
+  uri = raptor_new_uri(((raptor_parser*)rdf_parser)->world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#integer");
   if(!uri) {
     RAPTOR_FREE(cstring, $1);
     YYERROR;
@@ -835,7 +835,7 @@ literal: STRING_LITERAL AT IDENTIFIER
 #if RAPTOR_DEBUG > 1  
   printf("resource double=%s\n", $1);
 #endif
-  uri = raptor_new_uri_v2(((raptor_parser*)rdf_parser)->world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#double");
+  uri = raptor_new_uri(((raptor_parser*)rdf_parser)->world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#double");
   if(!uri) {
     RAPTOR_FREE(cstring, $1);
     YYERROR;
@@ -850,7 +850,7 @@ literal: STRING_LITERAL AT IDENTIFIER
 #if RAPTOR_DEBUG > 1  
   printf("resource decimal=%s\n", $1);
 #endif
-  uri = raptor_new_uri_v2(((raptor_parser*)rdf_parser)->world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#decimal");
+  uri = raptor_new_uri(((raptor_parser*)rdf_parser)->world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#decimal");
   if(!uri) {
     RAPTOR_FREE(cstring, $1);
     YYERROR;
@@ -866,7 +866,7 @@ literal: STRING_LITERAL AT IDENTIFIER
 #if RAPTOR_DEBUG > 1  
   fputs("resource boolean true\n", stderr);
 #endif
-  uri = raptor_new_uri_v2(((raptor_parser*)rdf_parser)->world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#boolean");
+  uri = raptor_new_uri(((raptor_parser*)rdf_parser)->world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#boolean");
   if(!uri)
     YYERROR;
   string = (unsigned char*)RAPTOR_MALLOC(cstring, 5);
@@ -886,7 +886,7 @@ literal: STRING_LITERAL AT IDENTIFIER
 #if RAPTOR_DEBUG > 1  
   fputs("resource boolean false\n", stderr);
 #endif
-  uri = raptor_new_uri_v2(((raptor_parser*)rdf_parser)->world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#boolean");
+  uri = raptor_new_uri(((raptor_parser*)rdf_parser)->world, (const unsigned char*)"http://www.w3.org/2001/XMLSchema#boolean");
   if(!uri)
     YYERROR;
   string = (unsigned char*)RAPTOR_MALLOC(cstring, 6);
@@ -1289,9 +1289,9 @@ raptor_turtle_parse_init(raptor_parser* rdf_parser, const char *name) {
   if(raptor_namespaces_init_v2(rdf_parser->world, &turtle_parser->namespaces, 0))
     return 1;
 
-  turtle_parser->nil_uri = raptor_new_uri_for_rdf_concept_v2(rdf_parser->world, "nil");
-  turtle_parser->first_uri = raptor_new_uri_for_rdf_concept_v2(rdf_parser->world, "first");
-  turtle_parser->rest_uri = raptor_new_uri_for_rdf_concept_v2(rdf_parser->world, "rest");
+  turtle_parser->nil_uri = raptor_new_uri_for_rdf_concept(rdf_parser->world, "nil");
+  turtle_parser->first_uri = raptor_new_uri_for_rdf_concept(rdf_parser->world, "first");
+  turtle_parser->rest_uri = raptor_new_uri_for_rdf_concept(rdf_parser->world, "rest");
 
   if(!turtle_parser->nil_uri || !turtle_parser->first_uri || !turtle_parser->rest_uri)
     return 1;