[tracker/wip/carlosg/last-api-changes: 4/4] ontologies: Move tracker: ontology in 11-rdf.ontology to NRL



commit edf1b09fad14a00564c0623b689057b857e8215a
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Jun 18 20:09:19 2020 +0200

    ontologies: Move tracker: ontology in 11-rdf.ontology to NRL
    
    NRL is about defining the data structure, all our additional properties
    somehow belong in that same domain. This also moves all tracker:*
    properties and classes out of the base ontology (except for the tracker
    namespace itself, sadly, as it's needed for functions).
    
    All users have been updated to the new namespace for these properties
    and classes.

 docs/manpages/tracker-sparql.1.txt                 |  12 +-
 .../examples/ontologies/defining-fts-indexes-1.txt |   4 +-
 .../examples/ontologies/defining-indexes-1.txt     |   2 +-
 .../examples/ontologies/defining-namespaces-1.txt  |   7 +-
 docs/reference/libtracker-sparql/ontologies.xml    |  12 +-
 docs/tools/ttl_loader.c                            |  37 +++--
 src/libtracker-data/tracker-data-manager.c         | 168 ++++++++-------------
 src/libtracker-data/tracker-data-update.c          |   8 +-
 src/libtracker-fts/tracker-fts-tokenizer.c         |   4 +-
 src/ontologies/10-xsd.ontology                     |  20 +--
 src/ontologies/11-rdf.ontology                     | 138 +++--------------
 src/ontologies/12-nrl.ontology                     | 105 ++++++++++++-
 src/ontologies/20-dc.ontology                      |  19 ++-
 src/ontologies/nepomuk/30-nie.ontology             |  50 +++---
 src/ontologies/nepomuk/31-nao.ontology             |  21 ++-
 src/ontologies/nepomuk/32-nco.ontology             | 143 +++++++++---------
 src/ontologies/nepomuk/33-nfo.ontology             |  74 ++++-----
 src/ontologies/nepomuk/38-nmm.ontology             |  86 +++++------
 src/ontologies/nepomuk/41-mfo.ontology             |  13 +-
 src/ontologies/nepomuk/90-tracker.ontology         |  10 +-
 src/ontologies/nepomuk/92-slo.ontology             |  18 +--
 src/ontologies/nepomuk/93-libosinfo.ontology       |   7 +-
 src/tracker/tracker-export.c                       |   2 +-
 src/tracker/tracker-sparql.c                       |  20 +--
 tests/functional-tests/ontology-changes.py         |  40 ++---
 tests/functional-tests/sparql-bugs.py              |   2 +-
 .../test-ontologies/add-class/91-test.ontology     |   7 +-
 .../add-domainIndex/91-test.ontology               |  11 +-
 .../test-ontologies/add-prop/91-test.ontology      |   7 +-
 .../test-ontologies/basic-future/91-test.ontology  |   7 +-
 .../test-ontologies/basic/91-test.ontology         |   7 +-
 .../test-ontologies/cardinality/91-test.ontology   |   7 +-
 .../test-ontologies/indexed/91-test.ontology       |  11 +-
 .../test-ontologies/notify/91-test.ontology        |   9 +-
 .../property-promotion/91-test.ontology            |   7 +-
 .../property-range-int-to-string/91-test.ontology  |   7 +-
 .../property-range-string-to-date/91-test.ontology |   7 +-
 .../superclass-remove/91-test.ontology             |   7 +-
 tests/libtracker-data/aggregates/test.ontology     |   6 +-
 tests/libtracker-data/algebra/test-1.ontology      |   6 +-
 tests/libtracker-data/algebra/test-2.ontology      |   1 -
 tests/libtracker-data/anon/test.ontology           |   6 +-
 tests/libtracker-data/ask/data.ontology            |   6 +-
 tests/libtracker-data/basic/test.ontology          |  14 +-
 tests/libtracker-data/bind/data.ontology           |   6 +-
 .../bnode-coreference/data.ontology                |   6 +-
 tests/libtracker-data/bnode/data.ontology          |   6 +-
 tests/libtracker-data/bound/data.ontology          |   6 +-
 .../change/source/99-example.ontology.v1           |   8 +-
 .../change/source/99-example.ontology.v10          |  17 +--
 .../change/source/99-example.ontology.v11          |  15 +-
 .../change/source/99-example.ontology.v12          |  15 +-
 .../change/source/99-example.ontology.v13          |  15 +-
 .../change/source/99-example.ontology.v2           |  10 +-
 .../change/source/99-example.ontology.v3           |   9 +-
 .../change/source/99-example.ontology.v4           |  11 +-
 .../change/source/99-example.ontology.v5           |  13 +-
 .../change/source/99-example.ontology.v6           |  13 +-
 .../change/source/99-example.ontology.v7           |  13 +-
 .../change/source/99-example.ontology.v8           |  17 +--
 .../change/source/99-example.ontology.v9           |  17 +--
 tests/libtracker-data/change/test-5.rq             |   2 +-
 tests/libtracker-data/construct/test.ontology      |   6 +-
 tests/libtracker-data/datetime/test.ontology       |   6 +-
 tests/libtracker-data/describe/test.ontology       |   6 +-
 tests/libtracker-data/error/test.ontology          |   6 +-
 tests/libtracker-data/expr-ops/data.ontology       |   6 +-
 tests/libtracker-data/functions/test-1.ontology    |   6 +-
 tests/libtracker-data/functions/test-2.ontology    |   1 -
 tests/libtracker-data/graph/graph-4.rq             |   2 +-
 tests/libtracker-data/graph/graph-5.rq             |   2 +-
 tests/libtracker-data/graph/test.ontology          |   6 +-
 tests/libtracker-data/langstring/test.ontology     |   6 +-
 tests/libtracker-data/lists/test.ontology          |   6 +-
 .../mixed-cardinality/test.ontology                |   5 +-
 tests/libtracker-data/optional/test-1.ontology     |   6 +-
 tests/libtracker-data/optional/test-2.ontology     |   5 +-
 tests/libtracker-data/property-paths/test.ontology |  10 +-
 tests/libtracker-data/regex/test.ontology          |   6 +-
 .../service/service-after-triples-1.rq             |   2 +-
 .../service/service-before-triples-1.rq            |   2 +-
 .../service/service-local-filter-1.rq              |   2 +-
 tests/libtracker-data/service/service-query-1.rq   |   2 +-
 .../service/service-union-with-local-1.rq          |   4 +-
 tests/libtracker-data/sort/test.ontology           |  13 +-
 .../subqueries/subqueries-minus-5.out              |  27 ++--
 tests/libtracker-data/subqueries/test.ontology     |   5 +-
 tests/libtracker-data/tracker-service-test.c       |   4 +-
 tests/libtracker-data/tracker-sparql-test.c        |   4 +-
 tests/libtracker-data/turtle/test.ontology         |  26 ++--
 tests/libtracker-data/update/test.ontology         |   6 +-
 tests/libtracker-fts/data.ontology                 |  17 +--
 tests/libtracker-sparql/statement/limit.rq         |   2 +-
 tests/libtracker-sparql/statement/offset.rq        |   2 +-
 tests/libtracker-sparql/tracker-sparql-test.c      |   6 +-
 tests/libtracker-sparql/tracker-statement-test.c   |   4 +-
 96 files changed, 730 insertions(+), 843 deletions(-)
---
diff --git a/docs/manpages/tracker-sparql.1.txt b/docs/manpages/tracker-sparql.1.txt
index d943de5dd..7544b0990 100644
--- a/docs/manpages/tracker-sparql.1.txt
+++ b/docs/manpages/tracker-sparql.1.txt
@@ -145,9 +145,9 @@ ROOT
   |  --> rdf:type (P)
   |  --> rdfs:comment (P)
   |  --> rdfs:label (P)
-  |  --> tracker:added (P)
-  |  --> tracker:damaged (P)
-  |  --> tracker:modified (P)
+  |  --> nrl:added (P)
+  |  --> nrl:damaged (P)
+  |  --> nrl:modified (P)
   |  +-- nie:DataObject (C)
   |  |  --> nfo:belongsToContainer (P)
   |  |  --> nie:byteSize (P)
@@ -157,7 +157,7 @@ ROOT
   |  |  --> nie:isPartOf (P)
   |  |  --> nie:lastRefreshed (P)
   |  |  --> nie:url (P)
-  |  |  --> tracker:available (P)
+  |  |  --> nrl:available (P)
   |  |  +-- nfo:FileDataObject (C)
   |  |  |  --> nfo:fileCreated (P)
   |  |  |  --> nfo:fileLastAccessed (P)
@@ -230,8 +230,8 @@ List all class namespace prefixes::
 +
 ----
 $ tracker sparql -q "SELECT ?prefix ?ns WHERE {
-    ?ns a tracker:Namespace ;
-    tracker:prefix ?prefix
+    ?ns a nrl:Namespace ;
+    nrl:prefix ?prefix
 }"
 ----
 
diff --git a/docs/reference/libtracker-sparql/examples/ontologies/defining-fts-indexes-1.txt 
b/docs/reference/libtracker-sparql/examples/ontologies/defining-fts-indexes-1.txt
index 801a7467b..e704b3758 100644
--- a/docs/reference/libtracker-sparql/examples/ontologies/defining-fts-indexes-1.txt
+++ b/docs/reference/libtracker-sparql/examples/ontologies/defining-fts-indexes-1.txt
@@ -1,5 +1,5 @@
 ex:name a rdf:Property;
         rdfs:domain ex:Mammal;
         rdfs:range xsd:string;
-        tracker:fulltextIndexed true;
-        tracker:weight 10.
+        nrl:fulltextIndexed true;
+        nrl:weight 10.
diff --git a/docs/reference/libtracker-sparql/examples/ontologies/defining-indexes-1.txt 
b/docs/reference/libtracker-sparql/examples/ontologies/defining-indexes-1.txt
index 462ea56aa..2b180bbb9 100644
--- a/docs/reference/libtracker-sparql/examples/ontologies/defining-indexes-1.txt
+++ b/docs/reference/libtracker-sparql/examples/ontologies/defining-indexes-1.txt
@@ -2,4 +2,4 @@
 ex:Mammal a rdfs:Class;
           rdfs:subclassOf ex:Animal;
           rdfs:comment "A mammal";
-          tracker:domainIndex ex:dateOfBirth.
+          nrl:domainIndex ex:dateOfBirth.
diff --git a/docs/reference/libtracker-sparql/examples/ontologies/defining-namespaces-1.txt 
b/docs/reference/libtracker-sparql/examples/ontologies/defining-namespaces-1.txt
index 38c4eeeb5..93132adaf 100644
--- a/docs/reference/libtracker-sparql/examples/ontologies/defining-namespaces-1.txt
+++ b/docs/reference/libtracker-sparql/examples/ontologies/defining-namespaces-1.txt
@@ -3,13 +3,12 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 # This is our example namespace
 @prefix ex: <http://example.org/#>
 
-ex: a tracker:Namespace, tracker:Ontology
-    tracker:prefix "ex"
+ex: a nrl:Namespace, nrl:Ontology
+    nrl:prefix "ex"
     rdfs:comment "example ontology"
-    tracker:lastModified "2017-01-01T15:00:00Z"
+    nrl:lastModified "2017-01-01T15:00:00Z"
diff --git a/docs/reference/libtracker-sparql/ontologies.xml b/docs/reference/libtracker-sparql/ontologies.xml
index 615ff74d0..26e3f4e7a 100644
--- a/docs/reference/libtracker-sparql/ontologies.xml
+++ b/docs/reference/libtracker-sparql/ontologies.xml
@@ -186,7 +186,7 @@
       <para>
        It may be the case that SPARQL queries performed on the endpoint are
        known to match, sort, or filter on certain properties more often than others.
-       In this case, the ontology may use tracker:domainIndex in the class definition:
+       In this case, the ontology may use nrl:domainIndex in the class definition:
       </para>
       <programlisting><xi:include href="./examples/ontologies/defining-indexes-1.txt" 
parse="text"/></programlisting>
       <para>
@@ -202,12 +202,12 @@
       <title>Defining full-text search properties</title>
       <para>
        Tracker provides nonstandard full-text search capabilities, in order to use
-       these, the string properties can use tracker:fulltextIndexed:
+       these, the string properties can use nrl:fulltextIndexed:
       </para>
       <programlisting><xi:include href="./examples/ontologies/defining-fts-indexes-1.txt" 
parse="text"/></programlisting>
       <para>
        Weighting can also be applied, so certain properties rank higher than others
-       in full-text search queries. With tracker:fulltextIndexed in place, sparql
+       in full-text search queries. With nrl:fulltextIndexed in place, sparql
        queries may use full-text search capabilities:
       </para>
       <programlisting><xi:include href="./examples/ontologies/defining-fts-indexes-2.rq" 
parse="text"/></programlisting>
@@ -277,13 +277,13 @@
       </variablelist>
     </formalpara>
     <formalpara>
-      <title><systemitem>Adding and removing tracker:domainIndex from a class.</systemitem></title>
+      <title><systemitem>Adding and removing nrl:domainIndex from a class.</systemitem></title>
     </formalpara>
     <formalpara>
-      <title><systemitem>Adding and removing tracker:fulltextIndexed from a property.</systemitem></title>
+      <title><systemitem>Adding and removing nrl:fulltextIndexed from a property.</systemitem></title>
     </formalpara>
     <formalpara>
-      <title><systemitem>Changing the tracker:weight on a property.</systemitem></title>
+      <title><systemitem>Changing the nrl:weight on a property.</systemitem></title>
     </formalpara>
     <formalpara>
       <title><systemitem>Removing nrl:maxCardinality from a property.</systemitem></title>
diff --git a/docs/tools/ttl_loader.c b/docs/tools/ttl_loader.c
index b5b291582..dfa9ce5db 100644
--- a/docs/tools/ttl_loader.c
+++ b/docs/tools/ttl_loader.c
@@ -35,16 +35,15 @@
 #define RDFS_LABEL "http://www.w3.org/2000/01/rdf-schema#label";
 #define RDFS_SUBPROPERTYOF "http://www.w3.org/2000/01/rdf-schema#subPropertyOf";
 
-#define NRL_MAX_CARDINALITY "http://tracker.api.gnome.org/ontology/v3/nrl#maxCardinality";
+#define NRL_NS "http://tracker.api.gnome.org/ontology/v3/nrl#";
+#define NRL_MAX_CARDINALITY NRL_NS "maxCardinality"
 
-/* #define TRACKER_NAMESPACE "http://tracker.api.gnome.org/ontology/v3/tracker#Namespace"; */
-#define TRACKER_NS "http://tracker.api.gnome.org/ontology/v3/tracker#";
-#define TRACKER_CLASS_SPECIFICATION TRACKER_NS "classSpecification"
-#define TRACKER_PROPERTY_SPECIFICATION TRACKER_NS "propertySpecification"
-#define TRACKER_NOTIFY TRACKER_NS "notify"
-#define TRACKER_FTS_INDEXED TRACKER_NS "fulltextIndexed"
-#define TRACKER_FTS_WEIGHT TRACKER_NS "weight"
-#define TRACKER_DEPRECATED TRACKER_NS "deprecated"
+#define NRL_CLASS_SPECIFICATION NRL_NS "classSpecification"
+#define NRL_PROPERTY_SPECIFICATION NRL_NS "propertySpecification"
+#define NRL_NOTIFY NRL_NS "notify"
+#define NRL_FTS_INDEXED NRL_NS "fulltextIndexed"
+#define NRL_FTS_WEIGHT NRL_NS "weight"
+#define NRL_DEPRECATED NRL_NS "deprecated"
 
 /* Ontology description */
 #define DSC_PREFIX "http://tracker.api.gnome.org/ontology/v3/dsc#";
@@ -130,9 +129,9 @@ load_in_memory (Ontology    *ontology,
                        def->subclasses = g_list_prepend (def->subclasses,
                                                          g_strdup (turtle_subject));
                }
-       } else if (!g_strcmp0 (turtle_predicate, TRACKER_NOTIFY)) {
+       } else if (!g_strcmp0 (turtle_predicate, NRL_NOTIFY)) {
                /*
-                * A tracker:notify TRUE
+                * A nrl:notify TRUE
                 */
                OntologyClass *def;
 
@@ -143,9 +142,9 @@ load_in_memory (Ontology    *ontology,
 
                def->notify = string_to_boolean (turtle_object);
 
-       } else if (!g_strcmp0 (turtle_predicate, TRACKER_FTS_INDEXED)) {
+       } else if (!g_strcmp0 (turtle_predicate, NRL_FTS_INDEXED)) {
                /*
-                * A tracker:fulltextIndexed TRUE
+                * A nrl:fulltextIndexed TRUE
                 */
                OntologyProperty *prop;
 
@@ -156,9 +155,9 @@ load_in_memory (Ontology    *ontology,
 
                prop->fulltextIndexed = string_to_boolean (turtle_object);
 
-       } else if (!g_strcmp0 (turtle_predicate, TRACKER_FTS_WEIGHT)) {
+       } else if (!g_strcmp0 (turtle_predicate, NRL_FTS_WEIGHT)) {
                /*
-                * A tracker:weight X
+                * A nrl:weight X
                 */
                OntologyProperty *prop;
 
@@ -185,7 +184,7 @@ load_in_memory (Ontology    *ontology,
                        }
                }
 
-       } else if (!g_strcmp0 (turtle_predicate, TRACKER_CLASS_SPECIFICATION)) {
+       } else if (!g_strcmp0 (turtle_predicate, NRL_CLASS_SPECIFICATION)) {
                OntologyClass *klass;
 
                klass = g_hash_table_lookup (ontology->classes, turtle_subject);
@@ -195,7 +194,7 @@ load_in_memory (Ontology    *ontology,
                        g_error ("Error in specification (class %s doesn't exist)", turtle_subject);
                }
 
-       } else if (!g_strcmp0 (turtle_predicate, TRACKER_PROPERTY_SPECIFICATION)) {
+       } else if (!g_strcmp0 (turtle_predicate, NRL_PROPERTY_SPECIFICATION)) {
                OntologyProperty *prop;
 
                prop = g_hash_table_lookup (ontology->properties, turtle_subject);
@@ -280,9 +279,9 @@ load_in_memory (Ontology    *ontology,
                                                               g_strdup (turtle_subject));
                }
 
-       } else if (!g_strcmp0 (turtle_predicate, TRACKER_DEPRECATED)) {
+       } else if (!g_strcmp0 (turtle_predicate, NRL_DEPRECATED)) {
                /*
-                * X tracker:deprecated true
+                * X nrl:deprecated true
                 *
                 * This can apply to classes OR properties OR
                 * namespaces!
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 89c25e280..1423911aa 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -60,7 +60,7 @@
 #define NRL_INVERSE_FUNCTIONAL_PROPERTY TRACKER_PREFIX_NRL "InverseFunctionalProperty"
 #define NRL_MAX_CARDINALITY             TRACKER_PREFIX_NRL "maxCardinality"
 
-#define TRACKER_LAST_MODIFIED           TRACKER_PREFIX_TRACKER "lastModified"
+#define NRL_LAST_MODIFIED           TRACKER_PREFIX_NRL "lastModified"
 
 #define ZLIBBUFSIZ 8192
 
@@ -767,7 +767,6 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                                        tracker_property_set_indexed (property, FALSE);
                                        tracker_property_set_cardinality_changed (property, FALSE);
                                        tracker_property_set_secondary_index (property, NULL);
-                                       tracker_property_set_writeback (property, FALSE);
                                        tracker_property_set_is_inverse_functional_property (property, FALSE);
                                        tracker_property_set_multiple_values (property, TRUE);
                                        tracker_property_set_fulltext_indexed (property, FALSE);
@@ -805,7 +804,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                        }
 
                        tracker_property_set_is_inverse_functional_property (property, TRUE);
-               } else if (g_strcmp0 (object, TRACKER_PREFIX_TRACKER "Namespace") == 0) {
+               } else if (g_strcmp0 (object, TRACKER_PREFIX_NRL "Namespace") == 0) {
                        TrackerNamespace *namespace;
 
                        if (tracker_ontologies_get_namespace_by_uri (manager->ontologies, subject) != NULL) {
@@ -821,7 +820,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                        tracker_ontologies_add_namespace (manager->ontologies, namespace);
                        g_object_unref (namespace);
 
-               } else if (g_strcmp0 (object, TRACKER_PREFIX_TRACKER "Ontology") == 0) {
+               } else if (g_strcmp0 (object, TRACKER_PREFIX_NRL "Ontology") == 0) {
                        TrackerOntology *ontology;
 
                        if (tracker_ontologies_get_ontology_by_uri (manager->ontologies, subject) != NULL) {
@@ -916,7 +915,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
 
                tracker_class_add_super_class (class, super_class);
 
-       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "notify") == 0) {
+       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_NRL "notify") == 0) {
                TrackerClass *class;
 
                class = tracker_ontologies_get_class_by_uri (manager->ontologies, subject);
@@ -927,7 +926,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                }
 
                tracker_class_set_notify (class, (strcmp (object, "true") == 0));
-       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "domainIndex") == 0) {
+       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_NRL "domainIndex") == 0) {
                TrackerClass *class;
                TrackerProperty *property;
                TrackerProperty **properties;
@@ -947,7 +946,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                if (property == NULL) {
 
                        /* In this case the import of the TTL will still make the introspection
-                        * have the URI set as a tracker:domainIndex for class. The critical
+                        * have the URI set as a nrl:domainIndex for class. The critical
                         * will have happened, but future operations might not cope with this
                         * situation. TODO: add error handling so that the entire ontology
                         * change operation is discarded, for example ignore the entire
@@ -959,14 +958,14 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                         * not. Let's just not make mistakes when changing the .ontology
                         * files for now. */
 
-                       g_critical ("%s: Unknown property %s for tracker:domainIndex in %s."
+                       g_critical ("%s: Unknown property %s for nrl:domainIndex in %s."
                                    "Don't release this .ontology change!",
                                    ontology_path, object, subject);
                        return;
                }
 
                if (tracker_property_get_multiple_values (property)) {
-                       g_critical ("%s: Property %s has multiple values while trying to add it as 
tracker:domainIndex in %s, this isn't supported",
+                       g_critical ("%s: Property %s has multiple values while trying to add it as 
nrl:domainIndex in %s, this isn't supported",
                                    ontology_path, object, subject);
                        return;
                }
@@ -975,7 +974,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                for (i = 0; i < n_props; i++) {
                        if (tracker_property_get_domain (properties[i]) == class &&
                            properties[i] == property) {
-                               g_critical ("%s: Property %s is already a first-class property of %s while 
trying to add it as tracker:domainIndex",
+                               g_critical ("%s: Property %s is already a first-class property of %s while 
trying to add it as nrl:domainIndex",
                                            ontology_path, object, subject);
                        }
                }
@@ -984,7 +983,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                while (*properties) {
                        if (property == *properties) {
                                TRACKER_NOTE (ONTOLOGY_CHANGES,
-                                             g_message ("%s: Property %s already a tracker:domainIndex in 
%s",
+                                             g_message ("%s: Property %s already a nrl:domainIndex in %s",
                                                         ontology_path, object, subject));
                                ignore = TRUE;
                        }
@@ -1001,9 +1000,9 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                        }
                }
 
-               /* This doesn't detect removed tracker:domainIndex situations, it
+               /* This doesn't detect removed nrl:domainIndex situations, it
                 * only checks whether no new ones are being added. For
-                * detecting the removal of a tracker:domainIndex, please check the
+                * detecting the removal of a nrl:domainIndex, please check the
                 * tracker_data_ontology_process_changes_pre_db stuff */
 
                if (!ignore) {
@@ -1014,17 +1013,6 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                        tracker_property_add_domain_index (property, class);
                }
 
-       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "writeback") == 0) {
-               TrackerProperty *property;
-
-               property = tracker_ontologies_get_property_by_uri (manager->ontologies, subject);
-
-               if (property == NULL) {
-                       g_critical ("%s: Unknown property %s", ontology_path, subject);
-                       return;
-               }
-
-               tracker_property_set_writeback (property, (strcmp (object, "true") == 0));
        } else if (g_strcmp0 (predicate, RDFS_SUB_PROPERTY_OF) == 0) {
                TrackerProperty *property, *super_property;
                gboolean is_new;
@@ -1185,7 +1173,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                        tracker_property_set_last_multiple_values (property, TRUE);
                }
 
-       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "indexed") == 0) {
+       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_NRL "indexed") == 0) {
                TrackerProperty *property;
 
                property = tracker_ontologies_get_property_by_uri (manager->ontologies, subject);
@@ -1195,7 +1183,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                }
 
                tracker_property_set_indexed (property, (strcmp (object, "true") == 0));
-       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "secondaryIndex") == 0) {
+       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_NRL "secondaryIndex") == 0) {
                TrackerProperty *property, *secondary_index;
 
                property = tracker_ontologies_get_property_by_uri (manager->ontologies, subject);
@@ -1211,7 +1199,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                }
 
                tracker_property_set_secondary_index (property, secondary_index);
-       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "fulltextIndexed") == 0) {
+       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_NRL "fulltextIndexed") == 0) {
                TrackerProperty *property;
 
                property = tracker_ontologies_get_property_by_uri (manager->ontologies, subject);
@@ -1222,7 +1210,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
 
                tracker_property_set_fulltext_indexed (property,
                                                       strcmp (object, "true") == 0);
-       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "prefix") == 0) {
+       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_NRL "prefix") == 0) {
                TrackerNamespace *namespace;
 
                namespace = tracker_ontologies_get_namespace_by_uri (manager->ontologies, subject);
@@ -1236,7 +1224,7 @@ tracker_data_ontology_load_statement (TrackerDataManager  *manager,
                }
 
                tracker_namespace_set_prefix (namespace, object);
-       } else if (g_strcmp0 (predicate, TRACKER_LAST_MODIFIED) == 0) {
+       } else if (g_strcmp0 (predicate, NRL_LAST_MODIFIED) == 0) {
                TrackerOntology *ontology;
 
                ontology = tracker_ontologies_get_ontology_by_uri (manager->ontologies, subject);
@@ -1315,7 +1303,7 @@ check_for_deleted_domain_index (TrackerDataManager *manager,
                for (l = hfound; l != NULL; l = l->next) {
                        TrackerProperty *prop = l->data;
                        TRACKER_NOTE (ONTOLOGY_CHANGES,
-                                     g_message ("Ontology change: keeping tracker:domainIndex: %s",
+                                     g_message ("Ontology change: keeping nrl:domainIndex: %s",
                                                 tracker_property_get_name (prop)));
                        tracker_property_set_is_new_domain_index (prop, class, TRUE);
                }
@@ -1327,7 +1315,7 @@ check_for_deleted_domain_index (TrackerDataManager *manager,
                        GBytes *bytes;
 
                        TRACKER_NOTE (ONTOLOGY_CHANGES,
-                                     g_message ("Ontology change: deleting tracker:domainIndex: %s",
+                                     g_message ("Ontology change: deleting nrl:domainIndex: %s",
                                                 tracker_property_get_name (prop)));
                        tracker_property_del_domain_index (prop, class);
                        tracker_class_del_domain_index (class, prop);
@@ -1336,7 +1324,7 @@ check_for_deleted_domain_index (TrackerDataManager *manager,
                        bytes = g_bytes_new (uri, strlen (uri) + 1);
                        tracker_data_delete_statement (manager->data_update, NULL,
                                                       tracker_class_get_uri (class),
-                                                      TRACKER_PREFIX_TRACKER "domainIndex",
+                                                      TRACKER_PREFIX_NRL "domainIndex",
                                                       bytes,
                                                       &error);
                        g_bytes_unref (bytes);
@@ -1589,7 +1577,7 @@ tracker_data_ontology_process_changes_post_db (TrackerDataManager  *manager,
 
        /* This updates property-property changes and marks classes for necessity
         * of having their tables recreated later. There's support for
-        * tracker:notify, tracker:writeback and tracker:indexed */
+        * nrl:notify and nrl:indexed */
 
        if (seen_classes) {
                for (i = 0; i < seen_classes->len; i++) {
@@ -1601,16 +1589,16 @@ tracker_data_ontology_process_changes_post_db (TrackerDataManager  *manager,
 
                        if (tracker_class_get_notify (class)) {
                                update_property_value (manager, ontology_path,
-                                                      "tracker:notify",
+                                                      "nrl:notify",
                                                       subject,
-                                                      TRACKER_PREFIX_TRACKER "notify",
+                                                      TRACKER_PREFIX_NRL "notify",
                                                       "true", allowed_boolean_conversions,
                                                       class, NULL, &n_error);
                        } else {
                                update_property_value (manager, ontology_path,
-                                                      "tracker:notify",
+                                                      "nrl:notify",
                                                       subject,
-                                                      TRACKER_PREFIX_TRACKER "notify",
+                                                      TRACKER_PREFIX_NRL "notify",
                                                       "false", allowed_boolean_conversions,
                                                       class, NULL, &n_error);
                        }
@@ -1666,33 +1654,11 @@ tracker_data_ontology_process_changes_post_db (TrackerDataManager  *manager,
                                g_object_unref (cursor);
                        }
 
-                       /* Check for possibly supported changes */
-                       if (tracker_property_get_writeback (property)) {
-                               update_property_value (manager, ontology_path,
-                                                      "tracker:writeback",
-                                                      subject,
-                                                      TRACKER_PREFIX_TRACKER "writeback",
-                                                      "true", allowed_boolean_conversions,
-                                                      NULL, property, &n_error);
-                       } else {
-                               update_property_value (manager, ontology_path,
-                                                      "tracker:writeback",
-                                                      subject,
-                                                      TRACKER_PREFIX_TRACKER "writeback",
-                                                      "false", allowed_boolean_conversions,
-                                                      NULL, property, &n_error);
-                       }
-
-                       if (n_error) {
-                               g_propagate_error (error, n_error);
-                               return;
-                       }
-
                        if (tracker_property_get_indexed (property)) {
                                if (update_property_value (manager, ontology_path,
-                                                          "tracker:indexed",
+                                                          "nrl:indexed",
                                                           subject,
-                                                          TRACKER_PREFIX_TRACKER "indexed",
+                                                          TRACKER_PREFIX_NRL "indexed",
                                                           "true", allowed_boolean_conversions,
                                                           NULL, property, &n_error)) {
                                        fix_indexed (manager, property, TRUE, &n_error);
@@ -1700,9 +1666,9 @@ tracker_data_ontology_process_changes_post_db (TrackerDataManager  *manager,
                                }
                        } else {
                                if (update_property_value (manager, ontology_path,
-                                                          "tracker:indexed",
+                                                          "nrl:indexed",
                                                           subject,
-                                                          TRACKER_PREFIX_TRACKER "indexed",
+                                                          TRACKER_PREFIX_NRL "indexed",
                                                           "false", allowed_boolean_conversions,
                                                           NULL, property, &n_error)) {
                                        fix_indexed (manager, property, TRUE, &n_error);
@@ -1719,9 +1685,9 @@ tracker_data_ontology_process_changes_post_db (TrackerDataManager  *manager,
 
                        if (secondary_index) {
                                if (update_property_value (manager, ontology_path,
-                                                          "tracker:secondaryIndex",
+                                                          "nrl:secondaryIndex",
                                                           subject,
-                                                          TRACKER_PREFIX_TRACKER "secondaryIndex",
+                                                          TRACKER_PREFIX_NRL "secondaryIndex",
                                                           tracker_property_get_uri (secondary_index), NULL,
                                                           NULL, property, &n_error)) {
                                        if (!indexed_set) {
@@ -1730,9 +1696,9 @@ tracker_data_ontology_process_changes_post_db (TrackerDataManager  *manager,
                                }
                        } else {
                                if (update_property_value (manager, ontology_path,
-                                                          "tracker:secondaryIndex",
+                                                          "nrl:secondaryIndex",
                                                           subject,
-                                                          TRACKER_PREFIX_TRACKER "secondaryIndex",
+                                                          TRACKER_PREFIX_NRL "secondaryIndex",
                                                           NULL, NULL,
                                                           NULL, property, &n_error)) {
                                        if (!indexed_set) {
@@ -1860,7 +1826,7 @@ get_ontology_from_file (TrackerDataManager *manager,
                                           &subject, &predicate, &object,
                                           NULL, &error)) {
                if (g_strcmp0 (predicate, RDF_TYPE) == 0) {
-                       if (g_strcmp0 (object, TRACKER_PREFIX_TRACKER "Ontology") == 0) {
+                       if (g_strcmp0 (object, TRACKER_PREFIX_NRL "Ontology") == 0) {
                                TrackerOntology *ontology;
 
                                ontology = tracker_ontology_new ();
@@ -1872,7 +1838,7 @@ get_ontology_from_file (TrackerDataManager *manager,
                                                     g_strdup (subject),
                                                     ontology);
                        }
-               } else if (g_strcmp0 (predicate, TRACKER_LAST_MODIFIED) == 0) {
+               } else if (g_strcmp0 (predicate, NRL_LAST_MODIFIED) == 0) {
                        TrackerOntology *ontology;
 
                        ontology = g_hash_table_lookup (ontology_uris, subject);
@@ -1903,7 +1869,7 @@ get_ontology_from_file (TrackerDataManager *manager,
 
        if (ret == NULL) {
                gchar *uri = g_file_get_uri (file);
-               g_critical ("Ontology file has no tracker:lastModified header: %s", uri);
+               g_critical ("Ontology file has no nrl:lastModified header: %s", uri);
                g_free (uri);
        }
 
@@ -1938,7 +1904,7 @@ tracker_data_ontology_process_statement (TrackerDataManager *manager,
                        if (prop && tracker_property_get_is_new (prop) != in_update) {
                                return;
                        }
-               } else if (g_strcmp0 (object, TRACKER_PREFIX_TRACKER "Namespace") == 0) {
+               } else if (g_strcmp0 (object, TRACKER_PREFIX_NRL "Namespace") == 0) {
                        TrackerNamespace *namespace;
 
                        namespace = tracker_ontologies_get_namespace_by_uri (manager->ontologies, subject);
@@ -1946,7 +1912,7 @@ tracker_data_ontology_process_statement (TrackerDataManager *manager,
                        if (namespace && tracker_namespace_get_is_new (namespace) != in_update) {
                                return;
                        }
-               } else if (g_strcmp0 (object, TRACKER_PREFIX_TRACKER "Ontology") == 0) {
+               } else if (g_strcmp0 (object, TRACKER_PREFIX_NRL "Ontology") == 0) {
                        TrackerOntology *ontology;
 
                        ontology = tracker_ontologies_get_ontology_by_uri (manager->ontologies, subject);
@@ -1967,8 +1933,8 @@ tracker_data_ontology_process_statement (TrackerDataManager *manager,
                   g_strcmp0 (predicate, RDFS_DOMAIN) == 0                   ||
                   g_strcmp0 (predicate, RDFS_RANGE) == 0                    ||
                   /* g_strcmp0 (predicate, NRL_MAX_CARDINALITY) == 0        || */
-                  g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "indexed") == 0      ||
-                  g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "fulltextIndexed") == 0) {
+                  g_strcmp0 (predicate, TRACKER_PREFIX_NRL "indexed") == 0      ||
+                  g_strcmp0 (predicate, TRACKER_PREFIX_NRL "fulltextIndexed") == 0) {
                TrackerProperty *prop;
 
                prop = tracker_ontologies_get_property_by_uri (manager->ontologies, subject);
@@ -1976,7 +1942,7 @@ tracker_data_ontology_process_statement (TrackerDataManager *manager,
                if (prop && tracker_property_get_is_new (prop) != in_update) {
                        return;
                }
-       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "prefix") == 0) {
+       } else if (g_strcmp0 (predicate, TRACKER_PREFIX_NRL "prefix") == 0) {
                TrackerNamespace *namespace;
 
                namespace = tracker_ontologies_get_namespace_by_uri (manager->ontologies, subject);
@@ -1984,7 +1950,7 @@ tracker_data_ontology_process_statement (TrackerDataManager *manager,
                if (namespace && tracker_namespace_get_is_new (namespace) != in_update) {
                        return;
                }
-       } else if (g_strcmp0 (predicate, TRACKER_LAST_MODIFIED) == 0) {
+       } else if (g_strcmp0 (predicate, NRL_LAST_MODIFIED) == 0) {
                TrackerOntology *ontology;
 
                ontology = tracker_ontologies_get_ontology_by_uri (manager->ontologies, subject);
@@ -2099,8 +2065,8 @@ class_add_domain_indexes_from_db (TrackerDBInterface *iface,
        GError *error = NULL;
 
        stmt = tracker_db_interface_create_statement (iface, TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT, &error,
-                                                     "SELECT (SELECT Uri FROM Resource WHERE ID = 
\"tracker:domainIndex\") "
-                                                     "FROM \"rdfs:Class_tracker:domainIndex\" "
+                                                     "SELECT (SELECT Uri FROM Resource WHERE ID = 
\"nrl:domainIndex\") "
+                                                     "FROM \"rdfs:Class_nrl:domainIndex\" "
                                                      "WHERE ID = (SELECT ID FROM Resource WHERE Uri = ?)");
 
        if (!stmt) {
@@ -2178,9 +2144,9 @@ db_get_static_data (TrackerDBInterface  *iface,
        GError *internal_error = NULL;
 
        stmt = tracker_db_interface_create_statement (iface, TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT, 
&internal_error,
-                                                     "SELECT (SELECT Uri FROM Resource WHERE ID = 
\"tracker:Ontology\".ID), "
-                                                     "       \"tracker:lastModified\" "
-                                                     "FROM \"tracker:Ontology\"");
+                                                     "SELECT (SELECT Uri FROM Resource WHERE ID = 
\"nrl:Ontology\".ID), "
+                                                     "       \"nrl:lastModified\" "
+                                                     "FROM \"nrl:Ontology\"");
 
        if (stmt) {
                cursor = tracker_db_statement_start_cursor (stmt, &internal_error);
@@ -2217,9 +2183,9 @@ db_get_static_data (TrackerDBInterface  *iface,
        }
 
        stmt = tracker_db_interface_create_statement (iface, TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT, 
&internal_error,
-                                                     "SELECT (SELECT Uri FROM Resource WHERE ID = 
\"tracker:Namespace\".ID), "
-                                                     "\"tracker:prefix\" "
-                                                     "FROM \"tracker:Namespace\"");
+                                                     "SELECT (SELECT Uri FROM Resource WHERE ID = 
\"nrl:Namespace\".ID), "
+                                                     "\"nrl:prefix\" "
+                                                     "FROM \"nrl:Namespace\"");
 
        if (stmt) {
                cursor = tracker_db_statement_start_cursor (stmt, &internal_error);
@@ -2258,7 +2224,7 @@ db_get_static_data (TrackerDBInterface  *iface,
        stmt = tracker_db_interface_create_statement (iface, TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT, 
&internal_error,
                                                      "SELECT \"rdfs:Class\".ID, "
                                                      "(SELECT Uri FROM Resource WHERE ID = 
\"rdfs:Class\".ID), "
-                                                     "\"tracker:notify\" "
+                                                     "\"nrl:notify\" "
                                                      "FROM \"rdfs:Class\" ORDER BY ID");
 
        if (stmt) {
@@ -2320,10 +2286,9 @@ db_get_static_data (TrackerDBInterface  *iface,
                                                      "(SELECT Uri FROM Resource WHERE ID = \"rdfs:domain\"), 
"
                                                      "(SELECT Uri FROM Resource WHERE ID = \"rdfs:range\"), "
                                                      "\"nrl:maxCardinality\", "
-                                                     "\"tracker:indexed\", "
-                                                     "(SELECT Uri FROM Resource WHERE ID = 
\"tracker:secondaryIndex\"), "
-                                                     "\"tracker:fulltextIndexed\", "
-                                                     "\"tracker:writeback\", "
+                                                     "\"nrl:indexed\", "
+                                                     "(SELECT Uri FROM Resource WHERE ID = 
\"nrl:secondaryIndex\"), "
+                                                     "\"nrl:fulltextIndexed\", "
                                                      "(SELECT 1 FROM \"rdfs:Resource_rdf:type\" WHERE ID = 
\"rdf:Property\".ID AND "
                                                      "\"rdf:type\" = (SELECT ID FROM Resource WHERE Uri = '" 
NRL_INVERSE_FUNCTIONAL_PROPERTY "')) "
                                                      "FROM \"rdf:Property\" ORDER BY ID");
@@ -2340,7 +2305,6 @@ db_get_static_data (TrackerDBInterface  *iface,
                        const gchar     *uri, *domain_uri, *range_uri, *secondary_index_uri;
                        gboolean         multi_valued, indexed, fulltext_indexed;
                        gboolean         is_inverse_functional_property;
-                       gboolean         writeback;
                        gint             id;
 
                        property = tracker_property_new (FALSE);
@@ -2383,19 +2347,8 @@ db_get_static_data (TrackerDBInterface  *iface,
                                fulltext_indexed = FALSE;
                        }
 
-                       /* tracker:writeback column */
-                       tracker_db_cursor_get_value (cursor, 8, &value);
-
-                       if (G_VALUE_TYPE (&value) != 0) {
-                               writeback = (g_value_get_int64 (&value) == 1);
-                               g_value_unset (&value);
-                       } else {
-                               /* NULL */
-                               writeback = FALSE;
-                       }
-
                        /* NRL_INVERSE_FUNCTIONAL_PROPERTY column */
-                       tracker_db_cursor_get_value (cursor, 9, &value);
+                       tracker_db_cursor_get_value (cursor, 8, &value);
 
                        if (G_VALUE_TYPE (&value) != 0) {
                                is_inverse_functional_property = TRUE;
@@ -2418,7 +2371,6 @@ db_get_static_data (TrackerDBInterface  *iface,
                        tracker_property_set_indexed (property, indexed);
 
                        tracker_property_set_db_schema_changed (property, FALSE);
-                       tracker_property_set_writeback (property, writeback);
 
                        if (secondary_index_uri) {
                                tracker_property_set_secondary_index (property, 
tracker_ontologies_get_property_by_uri (manager->ontologies, secondary_index_uri));
@@ -3890,8 +3842,8 @@ update_ontology_last_modified (TrackerDataManager  *manager,
        ontology_uri = tracker_ontology_get_uri (ontology);
        last_mod = tracker_ontology_get_last_modified (ontology);
        stmt = tracker_db_interface_create_statement (iface, TRACKER_DB_STATEMENT_CACHE_TYPE_UPDATE, error,
-                                                     "UPDATE \"tracker:Ontology\" SET 
\"tracker:lastModified\"= ? "
-                                                     "WHERE \"tracker:Ontology\".ID = "
+                                                     "UPDATE \"nrl:Ontology\" SET \"nrl:lastModified\"= ? "
+                                                     "WHERE \"nrl:Ontology\".ID = "
                                                      "(SELECT Resource.ID FROM Resource WHERE "
                                                      "Resource.Uri = ?)");
        if (stmt) {
@@ -4287,13 +4239,13 @@ tracker_data_manager_initable_init (GInitable     *initable,
 
                /* check ontology against database */
 
-               /* Get a map of tracker:Ontology v. tracker:lastModified so that we can test
+               /* Get a map of nrl:Ontology v. nrl:lastModified so that we can test
                 * for all the ontology files in ontology_location whether the last-modified
                 * has changed since we dealt with the file last time. */
 
                stmt = tracker_db_interface_create_statement (iface, TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT, 
&n_error,
-                       "SELECT Resource.Uri, \"tracker:Ontology\".\"tracker:lastModified\" FROM 
\"tracker:Ontology\" "
-                       "INNER JOIN Resource ON Resource.ID = \"tracker:Ontology\".ID ");
+                       "SELECT Resource.Uri, \"nrl:Ontology\".\"nrl:lastModified\" FROM \"nrl:Ontology\" "
+                       "INNER JOIN Resource ON Resource.ID = \"nrl:Ontology\".ID ");
 
                if (stmt) {
                        cursor = tracker_db_statement_start_cursor (stmt, &n_error);
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index d944b859e..873ac6b76 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -494,7 +494,7 @@ tracker_data_update_get_next_modseq (TrackerData *data)
        temp_iface = tracker_data_manager_get_writable_db_interface (data->manager);
 
        stmt = tracker_db_interface_create_statement (temp_iface, TRACKER_DB_STATEMENT_CACHE_TYPE_SELECT, 
&error,
-                                                     "SELECT MAX(\"tracker:modified\") AS A FROM 
\"rdfs:Resource\"");
+                                                     "SELECT MAX(\"nrl:modified\") AS A FROM 
\"rdfs:Resource\"");
 
        if (stmt) {
                cursor = tracker_db_statement_start_cursor (stmt, &error);
@@ -634,7 +634,7 @@ cache_ensure_table (TrackerData *data,
        TrackerDataUpdateBufferTable *table;
 
        if (!data->resource_buffer->modified) {
-               /* first modification of this particular resource, update tracker:modified */
+               /* first modification of this particular resource, update nrl:modified */
 
                GValue gvalue = { 0 };
 
@@ -642,7 +642,7 @@ cache_ensure_table (TrackerData *data,
 
                g_value_init (&gvalue, G_TYPE_INT64);
                g_value_set_int64 (&gvalue, get_transaction_modseq (data));
-               cache_insert_value (data, "rdfs:Resource", "tracker:modified",
+               cache_insert_value (data, "rdfs:Resource", "nrl:modified",
                                    &gvalue, FALSE, FALSE, FALSE);
        }
 
@@ -986,7 +986,7 @@ tracker_data_resource_buffer_flush (TrackerData                      *data,
                                g_string_append (sql, " (ID");
 
                                if (strcmp (table_name, "rdfs:Resource") == 0) {
-                                       g_string_append (sql, ", \"tracker:added\", \"tracker:modified\"");
+                                       g_string_append (sql, ", \"nrl:added\", \"nrl:modified\"");
                                        g_string_append (values_sql, ", ?, ?");
                                }
                        } else {
diff --git a/src/libtracker-fts/tracker-fts-tokenizer.c b/src/libtracker-fts/tracker-fts-tokenizer.c
index e630d7d72..cfbedfb69 100644
--- a/src/libtracker-fts/tracker-fts-tokenizer.c
+++ b/src/libtracker-fts/tracker-fts-tokenizer.c
@@ -288,10 +288,10 @@ get_fts_weights (TrackerDBInterface *iface,
                weights = g_hash_table_new (g_str_hash, g_str_equal);
                db = sqlite3_context_db_handle (context);
                rc = sqlite3_prepare_v2 (db,
-                                        "SELECT \"rdf:Property\".\"tracker:weight\", "
+                                        "SELECT \"rdf:Property\".\"nrl:weight\", "
                                         "(SELECT Uri FROM Resource where Resource.ID=\"rdf:Property\".ID) "
                                         "FROM \"rdf:Property\" "
-                                        "WHERE \"rdf:Property\".\"tracker:fulltextIndexed\" = 1 ",
+                                        "WHERE \"rdf:Property\".\"nrl:fulltextIndexed\" = 1 ",
                                         -1, &stmt, NULL);
 
                manager = tracker_db_interface_get_user_data (iface);
diff --git a/src/ontologies/10-xsd.ontology b/src/ontologies/10-xsd.ontology
index 05581280d..44a7e3ca3 100644
--- a/src/ontologies/10-xsd.ontology
+++ b/src/ontologies/10-xsd.ontology
@@ -1,31 +1,31 @@
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-xsd: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "xsd" ;
-       tracker:lastModified "2010-02-16T11:00:00Z" .
+xsd: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "xsd" ;
+       nrl:lastModified "2010-02-16T11:00:00Z" .
 
 xsd:string a rdfs:Class ;
        rdfs:comment "The type of string properties." ;
-       tracker:classSpecification "https://www.w3.org/TR/xmlschema-2/#string"; .
+       nrl:classSpecification "https://www.w3.org/TR/xmlschema-2/#string"; .
 
 xsd:boolean a rdfs:Class ;
        rdfs:comment "The type of true / false properties." ;
-       tracker:classSpecification "https://www.w3.org/TR/xmlschema-2/#boolean"; .
+       nrl:classSpecification "https://www.w3.org/TR/xmlschema-2/#boolean"; .
 
 xsd:integer a rdfs:Class ;
        rdfs:comment "The type of integer properties." ;
-       tracker:classSpecification "https://www.w3.org/TR/xmlschema-2/#integer"; .
+       nrl:classSpecification "https://www.w3.org/TR/xmlschema-2/#integer"; .
 
 xsd:double a rdfs:Class ;
        rdfs:comment "The type of floating point properties." ;
-       tracker:classSpecification "https://www.w3.org/TR/xmlschema-2/#double"; .
+       nrl:classSpecification "https://www.w3.org/TR/xmlschema-2/#double"; .
 
 xsd:date a rdfs:Class ;
        rdfs:comment "The type of date properties." ;
-       tracker:classSpecification "https://www.w3.org/TR/xmlschema-2/#date"; .
+       nrl:classSpecification "https://www.w3.org/TR/xmlschema-2/#date"; .
 
 xsd:dateTime a rdfs:Class ;
        rdfs:comment "The type of date-time properties." ;
-       tracker:classSpecification "https://www.w3.org/TR/xmlschema-2/#dateTime"; .
+       nrl:classSpecification "https://www.w3.org/TR/xmlschema-2/#dateTime"; .
diff --git a/src/ontologies/11-rdf.ontology b/src/ontologies/11-rdf.ontology
index a879dac79..275069fa0 100644
--- a/src/ontologies/11-rdf.ontology
+++ b/src/ontologies/11-rdf.ontology
@@ -1,96 +1,99 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
+
+rdf: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "rdf" ;
+       nrl:lastModified "2019-06-09T21:00:00Z" .
 
-rdf: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "rdf" ;
-       tracker:lastModified "2019-06-09T21:00:00Z" .
+rdfs: a nrl:Namespace ;
+       nrl:prefix "rdfs" .
 
-rdfs: a tracker:Namespace ;
-       tracker:prefix "rdfs" .
+tracker: a nrl:Namespace ;
+       nrl:prefix "tracker" .
 
 rdfs:Resource a rdfs:Class ;
        rdfs:label "All Resources" ;
        rdfs:comment "All resources" ;
-       tracker:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_resource"; .
+       nrl:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_resource"; .
 
 rdfs:Class a rdfs:Class ;
        rdfs:label "Class" ;
        rdfs:comment "The class of classes" ;
        rdfs:subClassOf rdfs:Resource ;
-       tracker:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_class"; .
+       nrl:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_class"; .
 
 rdf:Property a rdfs:Class ;
        rdfs:label "Property" ;
        rdfs:comment "The class of RDF properties" ;
        rdfs:subClassOf rdfs:Resource ;
-       tracker:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_property"; .
+       nrl:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_property"; .
 
 rdfs:Literal a rdfs:Class ;
        rdfs:label "Literal" ;
        rdfs:comment "The class of literal values, eg. textual strings and integers" ;
        rdfs:subClassOf rdfs:Resource ;
-       tracker:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_literal"; .
+       nrl:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_literal"; .
 
 rdfs:Datatype a rdfs:Class ;
        rdfs:label "Datatype" ;
        rdfs:comment "The class of RDF datatypes." ;
        rdfs:subClassOf rdfs:Class ;
-       tracker:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_datatype"; .
+       nrl:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_datatype"; .
 
 rdf:langString a rdfs:Class, rdfs:Datatype ;
        rdfs:subClassOf rdfs:Literal ;
        rdfs:label "langString" ;
        rdfs:comment "The datatype of language-tagged string values" ;
-       tracker:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_langstring"; .
+       nrl:classSpecification "https://www.w3.org/TR/rdf-schema/#ch_langstring"; .
 
 rdf:type a rdf:Property ;
        rdfs:domain rdfs:Resource ;
        rdfs:comment "The subject is an instance of a class" ;
        rdfs:range rdfs:Class ;
-       tracker:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_type"; .
+       nrl:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_type"; .
 
 rdfs:subClassOf a rdf:Property ;
        rdfs:comment "The subject is a subclass of a class" ;
        rdfs:domain rdfs:Class ;
        rdfs:range rdfs:Class ;
-       tracker:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_subclassof"; .
+       nrl:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_subclassof"; .
 
 rdfs:subPropertyOf a rdf:Property ;
        rdfs:comment "The subject is a subproperty of a property" ;
        rdfs:domain rdf:Property ;
        rdfs:range rdf:Property ;
-       tracker:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_subpropertyof"; .
+       nrl:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_subpropertyof"; .
 
 rdfs:comment a rdf:Property ;
        rdfs:comment "A description of the subject resource" ;
        nrl:maxCardinality 1 ;
        rdfs:domain rdfs:Resource ;
        rdfs:range xsd:string ;
-       tracker:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_comment"; .
+       nrl:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_comment"; .
 
 rdfs:label a rdf:Property ;
        rdfs:comment "A human-readable name for the subject" ;
        nrl:maxCardinality 1 ;
        rdfs:domain rdfs:Resource ;
        rdfs:range xsd:string ;
-       tracker:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_label"; .
+       nrl:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_label"; .
 
 rdfs:domain a rdf:Property ;
        rdfs:comment "A domain of the subject property" ;
        nrl:maxCardinality 1 ;
        rdfs:domain rdf:Property ;
        rdfs:range rdfs:Resource ;
-       tracker:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_domain"; .
+       nrl:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_domain"; .
 
 rdfs:range a rdf:Property ;
        rdfs:comment "A range of the subject property" ;
        nrl:maxCardinality 1 ;
        rdfs:domain rdf:Property ;
        rdfs:range rdfs:Class ;
-       tracker:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_range"; .
+       nrl:propertySpecification "https://www.w3.org/TR/rdf-schema/#ch_range"; .
 
 rdf:List a rdfs:Class ;
        rdfs:label "List" ;
@@ -114,100 +117,3 @@ rdf:rest a rdf:Property ;
        rdfs:domain rdf:List ;
        rdfs:range rdf:List ;
        nrl:maxCardinality 1 .
-
-tracker: a tracker:Namespace ;
-       tracker:prefix "tracker" .
-
-tracker:Namespace a rdfs:Class ;
-       rdfs:label "Namespace" ;
-       rdfs:subClassOf rdfs:Resource .
-
-tracker:Ontology a rdfs:Class ;
-       rdfs:label "Ontology" ;
-       rdfs:comment "An ontology" ;
-       rdfs:subClassOf rdfs:Resource .
-
-tracker:lastModified a rdf:Property ;
-       rdfs:label "lastModified" ;
-       rdfs:comment "last modification date" ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain tracker:Ontology ;
-       rdfs:range xsd:dateTime .
-
-tracker:prefix a rdf:Property ;
-       rdfs:label "Base prefix of the subject namespace" ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain tracker:Namespace ;
-       rdfs:range xsd:string .
-
-tracker:domainIndex a rdf:Property ;
-       rdfs:comment "Property is a domain index for the subject class" ;
-       rdfs:domain rdfs:Class ;
-       rdfs:range rdf:Property .
-
-tracker:indexed a rdf:Property ;
-       rdfs:comment "Whether a property has an index" ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain rdf:Property ;
-       rdfs:range xsd:boolean .
-
-tracker:secondaryIndex a rdf:Property ;
-       rdfs:comment "Whether subject and object properties share an index" ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain rdf:Property ;
-       rdfs:range rdf:Property .
-
-tracker:fulltextIndexed a rdf:Property ;
-       rdfs:comment "Whether the property is full-text indexed" ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain rdf:Property ;
-       rdfs:range xsd:boolean .
-
-tracker:weight a rdf:Property ;
-       rdfs:comment "Property weight on full-text search relevance" ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain rdf:Property ;
-       rdfs:range xsd:integer .
-
-tracker:added a rdf:Property ;
-       rdfs:comment "Time of insertion of the resource" ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain rdfs:Resource ;
-       rdfs:range xsd:dateTime ;
-       tracker:indexed true .
-
-tracker:modified a rdf:Property ;
-       rdfs:comment "Modification sequence number" ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain rdfs:Resource ;
-       rdfs:range xsd:integer .
-
-tracker:notify a rdf:Property ;
-       rdfs:comment "Whether resources of this class emits notifications on changes" ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain rdfs:Class ;
-       rdfs:range xsd:boolean .
-
-tracker:writeback a rdf:Property ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain rdf:Property ;
-       rdfs:range xsd:boolean .
-
-tracker:deprecated a rdf:Property;
-       nrl:maxCardinality 1 ;
-       rdfs:domain rdfs:Resource;
-       rdfs:range xsd:boolean;
-       rdfs:label "deprecated";
-       rdfs:comment "If this property is assigned, the subject class, property, or resource, is deprecated 
and should not be used in production systems any longer. It may be removed without further notice." .
-
-tracker:classSpecification a rdf:Property ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain rdfs:Class ;
-       rdfs:range xsd:string ;
-       rdfs:comment "Link to upstream specification for an ontology class." .
-
-tracker:propertySpecification a rdf:Property ;
-       nrl:maxCardinality 1 ;
-       rdfs:domain rdf:Property ;
-       rdfs:range xsd:string ;
-       rdfs:comment "Link to upstream specification for an ontology property." .
diff --git a/src/ontologies/12-nrl.ontology b/src/ontologies/12-nrl.ontology
index 75041b0a2..a5d8f625b 100644
--- a/src/ontologies/12-nrl.ontology
+++ b/src/ontologies/12-nrl.ontology
@@ -1,12 +1,11 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-nrl: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "nrl" ;
-       tracker:lastModified "2010-02-16T11:00:00Z" .
+nrl: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "nrl" ;
+       nrl:lastModified "2010-02-16T11:00:00Z" .
 
 nrl:InverseFunctionalProperty a rdfs:Class ;
        rdfs:comment "A marker class to identify inverse functional properties" .
@@ -17,3 +16,101 @@ nrl:maxCardinality a rdf:Property ;
        rdfs:domain rdf:Property ;
        rdfs:range xsd:integer .
 
+nrl:Namespace a rdfs:Class ;
+       rdfs:label "Namespace" ;
+       rdfs:comment "Specifies a namespace. This is a Tracker extension" ;
+       rdfs:subClassOf rdfs:Resource .
+
+nrl:Ontology a rdfs:Class ;
+       rdfs:label "Ontology" ;
+       rdfs:comment "An ontology" ;
+       rdfs:subClassOf rdfs:Resource .
+
+nrl:lastModified a rdf:Property ;
+       rdfs:label "lastModified" ;
+       rdfs:comment "last modification date. This is a Tracker extension" ;
+       nrl:maxCardinality 1 ;
+       rdfs:domain nrl:Ontology ;
+       rdfs:range xsd:dateTime .
+
+nrl:prefix a rdf:Property ;
+       rdfs:label "Base prefix of the subject namespace" ;
+       rdfs:comment "This is a Tracker extension" ;
+       nrl:maxCardinality 1 ;
+       rdfs:domain nrl:Namespace ;
+       rdfs:range xsd:string .
+
+nrl:domainIndex a rdf:Property ;
+       rdfs:label "Domain Index" ;
+       rdfs:comment "Property is a domain index for the subject class. This is a Tracker extension" ;
+       rdfs:domain rdfs:Class ;
+       rdfs:range rdf:Property .
+
+nrl:indexed a rdf:Property ;
+       rdfs:label "Indexed" ;
+       rdfs:comment "Whether a property has an index. This is a Tracker extension" ;
+       nrl:maxCardinality 1 ;
+       rdfs:domain rdf:Property ;
+       rdfs:range xsd:boolean .
+
+nrl:secondaryIndex a rdf:Property ;
+       rdfs:label "Secondary indexed" ;
+       rdfs:comment "Whether subject and object properties share an index. This is a Tracker extension" ;
+       nrl:maxCardinality 1 ;
+       rdfs:domain rdf:Property ;
+       rdfs:range rdf:Property .
+
+nrl:fulltextIndexed a rdf:Property ;
+       rdfs:label "Full-text indexed" ;
+       rdfs:comment "Whether the property is full-text indexed. This is a Tracker extension" ;
+       nrl:maxCardinality 1 ;
+       rdfs:domain rdf:Property ;
+       rdfs:range xsd:boolean .
+
+nrl:weight a rdf:Property ;
+       rdfs:label "Full-text index weight" ;
+       rdfs:comment "Property weight on full-text search relevance. This is a Tracker extension" ;
+       nrl:maxCardinality 1 ;
+       rdfs:domain rdf:Property ;
+       rdfs:range xsd:integer .
+
+nrl:added a rdf:Property ;
+       rdfs:label "Insertion time" ;
+       rdfs:comment "Time of insertion of the resource. This is a Tracker extension" ;
+       nrl:maxCardinality 1 ;
+       rdfs:domain rdfs:Resource ;
+       rdfs:range xsd:dateTime ;
+       nrl:indexed true .
+
+nrl:modified a rdf:Property ;
+       rdfs:label "Modification sequence" ;
+       rdfs:comment "Modification sequence number. This is a Tracker extension" ;
+       nrl:maxCardinality 1 ;
+       rdfs:domain rdfs:Resource ;
+       rdfs:range xsd:integer .
+
+nrl:notify a rdf:Property ;
+       rdfs:label "Event notification" ;
+       rdfs:comment "Whether resources of this class emits notifications on changes. This is a Tracker 
extension" ;
+       nrl:maxCardinality 1 ;
+       rdfs:domain rdfs:Class ;
+       rdfs:range xsd:boolean .
+
+nrl:deprecated a rdf:Property;
+       nrl:maxCardinality 1 ;
+       rdfs:domain rdfs:Resource;
+       rdfs:range xsd:boolean;
+       rdfs:label "deprecated";
+       rdfs:comment "If this property is assigned, the subject class, property, or resource, is deprecated 
and should not be used in production systems any longer. It may be removed without further notice. This 
property is a Tracker extension" .
+
+nrl:classSpecification a rdf:Property ;
+       nrl:maxCardinality 1 ;
+       rdfs:domain rdfs:Class ;
+       rdfs:range xsd:string ;
+       rdfs:comment "Link to upstream specification for an ontology class. This is a Tracker extension" .
+
+nrl:propertySpecification a rdf:Property ;
+       nrl:maxCardinality 1 ;
+       rdfs:domain rdf:Property ;
+       rdfs:range xsd:string ;
+       rdfs:comment "Link to upstream specification for an ontology property. This is a Tracker extension" .
diff --git a/src/ontologies/20-dc.ontology b/src/ontologies/20-dc.ontology
index d5f00407f..d7da6882a 100644
--- a/src/ontologies/20-dc.ontology
+++ b/src/ontologies/20-dc.ontology
@@ -2,12 +2,11 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-dc: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "dc" ;
-       tracker:lastModified "2018-08-25T11:00:00Z" .
+dc: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "dc" ;
+       nrl:lastModified "2018-08-25T11:00:00Z" .
 
 dc:title a rdf:Property ;
        rdfs:label "Title" ;
@@ -15,7 +14,7 @@ dc:title a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain rdfs:Resource ;
        rdfs:range xsd:string ;
-       tracker:weight 10 .
+       nrl:weight 10 .
 
 dc:creator a rdf:Property ;
        rdfs:label "Creator" ;
@@ -23,7 +22,7 @@ dc:creator a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain rdfs:Resource ;
        rdfs:range xsd:string ;
-       tracker:weight 4 .
+       nrl:weight 4 .
 
 dc:subject a rdf:Property ;
        rdfs:label "Subject" ;
@@ -31,7 +30,7 @@ dc:subject a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain rdfs:Resource ;
        rdfs:range xsd:string ;
-       tracker:weight 5 .
+       nrl:weight 5 .
 
 dc:description a rdf:Property ;
        rdfs:label "Description" ;
@@ -39,7 +38,7 @@ dc:description a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain rdfs:Resource ;
        rdfs:range xsd:string ;
-       tracker:weight 3 .
+       nrl:weight 3 .
 
 dc:publisher a rdf:Property ;
        rdfs:label "Publisher" ;
@@ -47,14 +46,14 @@ dc:publisher a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain rdfs:Resource ;
        rdfs:range xsd:string ;
-       tracker:weight 4 .
+       nrl:weight 4 .
 
 dc:contributor a rdf:Property ;
        rdfs:label "Contributor" ;
        rdfs:comment "An entity responsible for making contributions to the resource." ;
        rdfs:domain rdfs:Resource ;
        rdfs:range xsd:string ;
-       tracker:weight 4 .
+       nrl:weight 4 .
 
 dc:date a rdf:Property ;
        rdfs:label "Date" ;
diff --git a/src/ontologies/nepomuk/30-nie.ontology b/src/ontologies/nepomuk/30-nie.ontology
index 753caab2f..b4010c58d 100644
--- a/src/ontologies/nepomuk/30-nie.ontology
+++ b/src/ontologies/nepomuk/30-nie.ontology
@@ -3,12 +3,11 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-nie: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "nie" ;
-       tracker:lastModified "2018-08-25T11:00:00Z" .
+nie: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "nie" ;
+       nrl:lastModified "2018-08-25T11:00:00Z" .
 
 nie:DataObject a rdfs:Class ;
        rdfs:label "Data Object" ;
@@ -32,9 +31,8 @@ nie:title a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nie:InformationElement ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 10 ;
-       tracker:writeback true .
+       nrl:fulltextIndexed true ;
+       nrl:weight 10 .
 
 nie:url a rdf:Property ;
        a nrl:InverseFunctionalProperty ;
@@ -43,7 +41,7 @@ nie:url a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nie:DataObject ;
        rdfs:range xsd:string ;
-       tracker:indexed true .
+       nrl:indexed true .
 
 nie:informationElementDate a rdf:Property ;
        rdfs:comment "A point or period of time associated with an event in the lifecycle of an Information 
Element. A common superproperty for all date-related properties of InformationElements in the NIE Framework" ;
@@ -65,8 +63,8 @@ nie:subject a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nie:InformationElement ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 5 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 5 .
 
 nie:mimeType a rdf:Property ;
        rdfs:label "Mime Type" ;
@@ -74,7 +72,7 @@ nie:mimeType a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nie:InformationElement ;
        rdfs:range xsd:string ;
-       tracker:indexed true .
+       nrl:indexed true .
 
 nie:byteSize a rdf:Property ;
        rdfs:label "Size" ;
@@ -96,8 +94,8 @@ nie:plainTextContent a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nie:InformationElement ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 2 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 2 .
 
 nie:legal a rdf:Property ;
        rdfs:comment "A common superproperty for all properties that point at legal information about an 
Information Element";
@@ -123,9 +121,8 @@ nie:description a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nie:InformationElement ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 3 ;
-       tracker:writeback true .
+       nrl:fulltextIndexed true ;
+       nrl:weight 3 .
 
 # Bug in nepomuk specification. Taking domain from superproperty
 nie:disclaimer a rdf:Property ;
@@ -161,28 +158,27 @@ nie:copyright a rdf:Property ;
        rdfs:comment "Content copyright" ;
        rdfs:subPropertyOf dc:rights , nie:legal ;
        rdfs:domain nie:InformationElement ;
-       rdfs:range xsd:string ;
-       tracker:writeback true .
+       rdfs:range xsd:string .
 
 nie:comment a rdf:Property ;
        rdfs:comment "A user comment about an InformationElement" ;
        nrl:maxCardinality 1 ;
        rdfs:domain nie:InformationElement ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 2 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 2 .
 
 nie:interpretedAs a rdf:Property ;
        rdfs:comment "Links the DataObject with the InformationElement it is interpreted as" ;
        rdfs:domain nie:DataObject ;
        rdfs:range nie:InformationElement ;
-       tracker:indexed true .
+       nrl:indexed true .
 
 nie:isStoredAs a rdf:Property ;
        rdfs:comment "Links the information element with the DataObject it is stored in" ;
        rdfs:domain nie:InformationElement ;
        rdfs:range nie:DataObject ;
-       tracker:indexed true .
+       nrl:indexed true .
 
 nie:version a rdf:Property ;
        rdfs:comment "The current version of the given data object. Exact semantics is unspecified at this 
level. Use more specific subproperties if needed" ;
@@ -195,8 +191,7 @@ nie:contentCreated a rdf:Property ;
        rdfs:subPropertyOf nie:informationElementDate ;
        nrl:maxCardinality 1 ;
        rdfs:domain nie:InformationElement ;
-       rdfs:range xsd:dateTime ;
-       tracker:writeback true .
+       rdfs:range xsd:dateTime .
 
 # Addition to nepomuk
 nie:contentAccessed a rdf:Property ;
@@ -236,9 +231,8 @@ nie:keyword a rdf:Property ;
        rdfs:comment "Adapted DublinCore: The topic of the content of the resource, as keyword. No sentences 
here. Recommended best practice is to select a value from a controlled vocabulary or formal classification 
scheme" ;
        rdfs:domain nie:InformationElement ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 5 ;
-       tracker:writeback true .
+       nrl:fulltextIndexed true ;
+       nrl:weight 5 .
 
 nie:hasLogicalPart a rdf:Property ;
        rdfs:comment "Generic property used to express 'logical' containment relationships between 
InformationElements. NIE extensions are encouraged to provide more specific subproperties of this one. It is 
advisable for actual instances of InformationElement to use those specific subproperties. Note the difference 
between 'physical' containment (hasPart) and logical containment (hasLogicalPart)" ;
@@ -292,4 +286,4 @@ nie:usageCounter a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nie:InformationElement ;
        rdfs:range xsd:integer ;
-       tracker:weight 3 .
+       nrl:weight 3 .
diff --git a/src/ontologies/nepomuk/31-nao.ontology b/src/ontologies/nepomuk/31-nao.ontology
index afb7e590c..2b7847b2d 100644
--- a/src/ontologies/nepomuk/31-nao.ontology
+++ b/src/ontologies/nepomuk/31-nao.ontology
@@ -3,26 +3,24 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-nao: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "nao" ;
-       tracker:lastModified "2010-12-25T16:00:00Z" .
+nao: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "nao" ;
+       nrl:lastModified "2010-12-25T16:00:00Z" .
 
 nao:Tag a rdfs:Class ;
        rdfs:comment "Represents a generic tag" ;
        rdfs:subClassOf rdfs:Resource ;
-       tracker:notify true .
+       nrl:notify true .
 
 nao:prefLabel a rdf:Property ;
        rdfs:comment "A preferred label for a resource" ;
        nrl:maxCardinality 1 ;
        rdfs:domain nao:Tag ;
        rdfs:range xsd:string ;
-       tracker:writeback true ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 10 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 10 .
 
 nao:description a rdf:Property ;
        nrl:maxCardinality 1 ;
@@ -30,15 +28,14 @@ nao:description a rdf:Property ;
        rdfs:range xsd:string ;
        rdfs:subPropertyOf rdfs:comment ;
        rdfs:comment "In the context of the social semantic desktop the textual annotation provided via 
rdfs:comment is meant for technical users, the textual annotation here is aimed at average users and is meant 
to be used to define custom descriptions of resources on the desktop" ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 3 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 3 .
 
 nao:hasTag a rdf:Property ;
        rdfs:comment "Defines an existing tag for a resource" ;
        rdfs:domain rdfs:Resource ;
        rdfs:range rdfs:Resource ;
-       tracker:writeback true ;
-       tracker:indexed true .
+       nrl:indexed true .
 
 nao:identifier a rdf:Property ;
        rdfs:comment "Defines a generic identifier for a resource" ;
diff --git a/src/ontologies/nepomuk/32-nco.ontology b/src/ontologies/nepomuk/32-nco.ontology
index 53a593f8f..f0d1286f1 100644
--- a/src/ontologies/nepomuk/32-nco.ontology
+++ b/src/ontologies/nepomuk/32-nco.ontology
@@ -5,12 +5,11 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-nco: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "nco" ;
-       tracker:lastModified "2016-02-28T21:30:00Z" .
+nco: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "nco" ;
+       nrl:lastModified "2016-02-28T21:30:00Z" .
 
 nco:Role a rdfs:Class ;
        rdfs:label "Role" ;
@@ -31,13 +30,13 @@ nco:ContactGroup a rdfs:Class ;
        rdfs:label "ContactGroup" ;
        rdfs:comment "A group of Contacts. Could be used to express a group in an addressbook or on a contact 
list of an IM application. One contact can belong to many groups." ;
        rdfs:subClassOf nie:InformationElement ;
-       tracker:notify true .
+       nrl:notify true .
 
 nco:ContactList a rdfs:Class ;
        rdfs:label "ContactList" ;
        rdfs:comment "A contact list, this class represents an addressbook or a contact list of an IM 
application. Contacts inside a contact list can belong to contact groups." ;
        rdfs:subClassOf nie:InformationElement ;
-       tracker:notify true .
+       nrl:notify true .
 
 # Maybe a bug? Shouldnt it be a subclass of nie:InformationElement?
 nco:ContactMedium a rdfs:Class ;
@@ -53,13 +52,13 @@ nco:EmailAddress a rdfs:Class ;
 nco:IMAddress a rdfs:Class ;
        rdfs:label "IM Address" ;
        rdfs:comment "An instant messaging address such as xmpp:foo bar com." ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nco:ContactMedium .
 
 nco:IMAccount a rdfs:Class ;
        rdfs:label "IMAccount" ;
        rdfs:comment "An account in an Instant Messaging system. This refers to IM accounts of the user 
'me'." ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nie:InformationElement .
 
 nco:OrganizationContact a rdfs:Class ;
@@ -70,7 +69,7 @@ nco:OrganizationContact a rdfs:Class ;
 nco:PersonContact a rdfs:Class ;
        rdfs:label "PersonContact" ;
        rdfs:comment "A Contact that denotes a Person. A person can have multiple Affiliations." ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nco:Contact .
 
 nco:default-contact-me a nco:PersonContact.
@@ -186,9 +185,9 @@ nco:nameFamily a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PersonContact ;
        rdfs:range xsd:string ;
-       tracker:indexed true ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 4 .
+       nrl:indexed true ;
+       nrl:fulltextIndexed true ;
+       nrl:weight 4 .
 
 nco:nameGiven a rdf:Property ;
        rdfs:label "nameGiven" ;
@@ -196,8 +195,8 @@ nco:nameGiven a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PersonContact ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 5 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 5 .
 
 nco:nameAdditional a rdf:Property ;
        rdfs:label "nameAdditional" ;
@@ -205,8 +204,8 @@ nco:nameAdditional a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PersonContact ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 5 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 5 .
 
 nco:fullname a rdf:Property ;
        rdfs:label "fullname" ;
@@ -215,8 +214,8 @@ nco:fullname a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:Contact ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 6 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 6 .
 
 nco:hasContactMedium a rdf:Property ;
        rdfs:label "hasContactMedium" ;
@@ -230,15 +229,14 @@ nco:url a rdf:Property ;
        rdfs:comment "A uniform resource locator associated with the given role of a Contact. Inspired by the 
'URL' property defined in RFC 2426 Sec. 3.6.8." ;
        rdfs:domain nco:Role ;
        rdfs:range rdfs:Resource ;
-       tracker:weight 4 .
+       nrl:weight 4 .
 
 nco:contributor a rdf:Property ;
        rdfs:label "contributor" ;
        rdfs:comment "An entity responsible for making contributions to the content of the 
InformationElement." ;
        rdfs:subPropertyOf dc:contributor ;
        rdfs:domain nie:InformationElement ;
-       rdfs:range nco:Contact ;
-       tracker:writeback true .
+       rdfs:range nco:Contact .
 
 nco:creator a rdf:Property ;
        rdfs:label "creator" ;
@@ -246,8 +244,7 @@ nco:creator a rdf:Property ;
        rdfs:subPropertyOf dc:creator , nco:contributor ;
        rdfs:domain nie:InformationElement ;
        rdfs:range nco:Contact ;
-       tracker:weight 4 ;
-       tracker:writeback true .
+       nrl:weight 4 .
 
 nco:region a rdf:Property ;
        rdfs:label "region" ;
@@ -255,8 +252,8 @@ nco:region a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PostalAddress ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 3 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 3 .
 
 nco:key a rdf:Property ;
        rdfs:label "key" ;
@@ -271,7 +268,7 @@ nco:nameHonorificSuffix a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PersonContact ;
        rdfs:range xsd:string ;
-       tracker:weight 3 .
+       nrl:weight 3 .
 
 nco:contactUID a rdf:Property ;
        rdfs:label "contactUID" ;
@@ -280,7 +277,7 @@ nco:contactUID a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:Contact ;
        rdfs:range xsd:string ;
-       tracker:weight 5 .
+       nrl:weight 5 .
 
 nco:contactLocalUID a rdf:Property;
        rdfs:label "local contact UID";
@@ -296,7 +293,7 @@ nco:publisher a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nie:InformationElement ;
        rdfs:range nco:Contact ;
-       tracker:weight 2 .
+       nrl:weight 2 .
 
 nco:country a rdf:Property ;
        rdfs:label "country" ;
@@ -304,8 +301,8 @@ nco:country a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PostalAddress ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 3 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 3 .
 
 nco:nameHonorificPrefix a rdf:Property ;
        rdfs:label "nameHonorificPrefix" ;
@@ -313,7 +310,7 @@ nco:nameHonorificPrefix a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PersonContact ;
        rdfs:range xsd:string ;
-       tracker:weight 3 .
+       nrl:weight 3 .
 
 nco:extendedAddress a rdf:Property ;
        rdfs:label "extendedAddress" ;
@@ -321,8 +318,8 @@ nco:extendedAddress a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PostalAddress ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 6 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 6 .
 
 nco:hasIMContact a rdf:Property ;
        rdfs:label "hasIMAccount" ;
@@ -343,9 +340,9 @@ nco:phoneNumber a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PhoneNumber ;
        rdfs:range xsd:string ;
-       tracker:indexed true ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 5 .
+       nrl:indexed true ;
+       nrl:fulltextIndexed true ;
+       nrl:weight 5 .
 
 nco:nickname a rdf:Property ;
        rdfs:label "nickname" ;
@@ -353,8 +350,8 @@ nco:nickname a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:Contact ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 5 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 5 .
 
 nco:containsContact a rdf:Property ;
        rdfs:label "containsContact" ;
@@ -369,8 +366,8 @@ nco:department a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:Affiliation ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 4 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 4 .
 
 nco:imID a rdf:Property ;
        rdfs:label "imID" ;
@@ -379,8 +376,8 @@ nco:imID a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:IMAddress ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 5 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 5 .
 
 nco:imAccountAddress a rdf:Property ;
        a nrl:InverseFunctionalProperty ;
@@ -397,15 +394,15 @@ nco:addressLocation a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PostalAddress ;
        rdfs:range rdfs:Resource ;
-       tracker:weight 3 .
+       nrl:weight 3 .
 
 nco:note a rdf:Property ;
        rdfs:label "note" ;
        rdfs:comment "A note about the object represented by this Contact. An equivalent for the 'NOTE' 
property defined in RFC 2426 Sec. 3.6.2" ;
        rdfs:domain nco:Contact ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 4 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 4 .
 
 nco:representative a rdf:Property ;
        rdfs:label "representative" ;
@@ -420,8 +417,8 @@ nco:streetAddress a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PostalAddress ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 6 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 6 .
 
 nco:hasPhoneNumber a rdf:Property ;
        rdfs:label "hasPhoneNumber" ;
@@ -452,7 +449,7 @@ nco:websiteUrl a rdf:Property ;
        rdfs:subPropertyOf nco:url ;
        rdfs:domain nco:Role ;
        rdfs:range rdfs:Resource ;
-       tracker:weight 5 .
+       nrl:weight 5 .
 
 nco:birthDate a rdf:Property ;
        rdfs:label "birthDate" ;
@@ -461,7 +458,7 @@ nco:birthDate a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:Contact ;
        rdfs:range xsd:dateTime ;
-       tracker:weight 5 .
+       nrl:weight 5 .
 
 nco:hasEmailAddress a rdf:Property ;
        rdfs:label "hasEmailAddress" ;
@@ -469,7 +466,7 @@ nco:hasEmailAddress a rdf:Property ;
        rdfs:subPropertyOf nco:hasContactMedium ;
        rdfs:domain nco:Role ;
        rdfs:range nco:EmailAddress ;
-       tracker:indexed true .
+       nrl:indexed true .
 
 nco:postalcode a rdf:Property ;
        rdfs:label "postalcode" ;
@@ -477,8 +474,8 @@ nco:postalcode a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PostalAddress ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 6 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 6 .
 
 nco:org a rdf:Property ;
        rdfs:label "org" ;
@@ -486,15 +483,15 @@ nco:org a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:Affiliation ;
        rdfs:range nco:OrganizationContact ;
-       tracker:weight 4 .
+       nrl:weight 4 .
 
 nco:title a rdf:Property ;
        rdfs:label "title" ;
        rdfs:domain nco:Affiliation ;
        rdfs:range xsd:string ;
        nrl:maxCardinality 1 ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 10 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 10 .
 
 nco:voiceMail a rdf:Property ;
        rdfs:label "voiceMail" ;
@@ -516,8 +513,8 @@ nco:contactGroupName a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:ContactGroup ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 4 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 4 .
 
 nco:contactMediumComment a rdf:Property ;
        rdfs:label "contactMediumComment" ;
@@ -542,8 +539,8 @@ nco:emailAddress a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:EmailAddress ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 4 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 4 .
 
 nco:locality a rdf:Property ;
        rdfs:label "locality" ;
@@ -551,8 +548,8 @@ nco:locality a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PostalAddress ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 4 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 4 .
 
 nco:county a rdf:Property ;
            rdfs:label "County" ;
@@ -560,8 +557,8 @@ nco:county a rdf:Property ;
            nrl:maxCardinality 1 ;
            rdfs:domain nco:PostalAddress ;
            rdfs:range xsd:string ;
-           tracker:fulltextIndexed true ;
-           tracker:weight 2 .
+           nrl:fulltextIndexed true ;
+           nrl:weight 2 .
 
 nco:district a rdf:Property ;
            rdfs:label "District" ;
@@ -569,8 +566,8 @@ nco:district a rdf:Property ;
            nrl:maxCardinality 1 ;
            rdfs:domain nco:PostalAddress ;
            rdfs:range xsd:string ;
-           tracker:fulltextIndexed true ;
-           tracker:weight 2 .
+           nrl:fulltextIndexed true ;
+           nrl:weight 2 .
 
 nco:sound a rdf:Property ;
        rdfs:label "sound" ;
@@ -585,8 +582,8 @@ nco:imNickname a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:IMAddress ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 5 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 5 .
 
 nco:imAvatar a rdf:Property ;
        rdfs:label "imAvatar" ;
@@ -601,7 +598,7 @@ nco:hobby a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PersonContact ;
        rdfs:range xsd:string ;
-       tracker:weight 2 .
+       nrl:weight 2 .
 
 # Same remarks as in url
 nco:blogUrl a rdf:Property ;
@@ -616,8 +613,8 @@ nco:role a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:Affiliation ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 2 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 2 .
 
 nco:hasPostalAddress a rdf:Property ;
        rdfs:label "hasPostalAddress" ;
@@ -625,7 +622,7 @@ nco:hasPostalAddress a rdf:Property ;
        rdfs:subPropertyOf nco:hasContactMedium ;
        rdfs:domain nco:Role ;
        rdfs:range nco:PostalAddress ;
-       tracker:indexed true .
+       nrl:indexed true .
 
 nco:imAccountType a rdf:Property ;
        rdfs:label "imAccountType" ;
@@ -647,8 +644,8 @@ nco:pobox a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nco:PostalAddress ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 5 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 5 .
 
 nco:imStatusMessage a rdf:Property ;
        rdfs:label "imStatusMessage" ;
diff --git a/src/ontologies/nepomuk/33-nfo.ontology b/src/ontologies/nepomuk/33-nfo.ontology
index 99bb938f2..8b06b369b 100644
--- a/src/ontologies/nepomuk/33-nfo.ontology
+++ b/src/ontologies/nepomuk/33-nfo.ontology
@@ -5,24 +5,23 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-nfo: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "nfo" ;
-       tracker:lastModified "2014-10-06T13:05:00Z" .
+nfo: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "nfo" ;
+       nrl:lastModified "2014-10-06T13:05:00Z" .
 
 nfo:Document a rdfs:Class ;
        rdfs:label "Document" ;
        rdfs:comment "A generic document. A common superclass for all documents on the desktop." ;
-       tracker:notify true;
+       nrl:notify true;
        rdfs:subClassOf nie:InformationElement .
 
 nfo:FileDataObject a rdfs:Class ;
        rdfs:label "FileDataObject" ;
        rdfs:comment "A resource containing a finite sequence of bytes with arbitrary information, that is 
available to a computer program and is usually based on some kind of durable storage. A file is durable in 
the sense that it remains available for programs to use after the current program has finished." ;
        rdfs:subClassOf nie:DataObject ;
-       tracker:notify true .
+       nrl:notify true .
 
 nfo:Software a rdfs:Class ;
        rdfs:label "Software" ;
@@ -37,13 +36,13 @@ nfo:Media a rdfs:Class ;
 nfo:Visual a rdfs:Class ;
        rdfs:label "Visual" ;
        rdfs:comment "File containing visual content." ;
-       tracker:domainIndex nie:contentCreated ;
+       nrl:domainIndex nie:contentCreated ;
        rdfs:subClassOf nfo:Media .
 
 nfo:Image a rdfs:Class ;
        rdfs:label "Image" ;
        rdfs:comment "A file containing an image." ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nfo:Visual .
 
 nfo:RasterImage a rdfs:Class ;
@@ -54,7 +53,7 @@ nfo:RasterImage a rdfs:Class ;
 nfo:DataContainer a rdfs:Class ;
        rdfs:label "DataContainer" ;
        rdfs:comment "A superclass for all entities, whose primary purpose is to serve as containers for 
other data object. They usually don't have any 'meaning' by themselves. Examples include folders, archives 
and optical disc images." ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nie:InformationElement .
 
 nfo:RemotePortAddress a rdfs:Class ;
@@ -75,7 +74,7 @@ nfo:VectorImage a rdfs:Class ;
 nfo:Audio a rdfs:Class ;
        rdfs:label "Audio" ;
        rdfs:comment "A file containing audio content" ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nfo:Media .
 
 nfo:CompressionType a rdfs:Class ;
@@ -161,7 +160,7 @@ nfo:PaginatedTextDocument a rdfs:Class ;
 nfo:Video a rdfs:Class ;
        rdfs:label "Video" ;
        rdfs:comment "A video file." ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nfo:Visual .
 
 nfo:Spreadsheet a rdfs:Class ;
@@ -222,7 +221,7 @@ nfo:MediaStream a rdfs:Class ;
 nfo:BookmarkFolder a rdfs:Class ;
        rdfs:label "Bookmark Folder" ;
        rdfs:comment "A folder with bookmarks of a webbrowser. Use nfo:containsBookmark to relate Bookmarks. 
Folders can contain subfolders, use containsBookmarkFolder to relate them." ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nie:InformationElement .
 
 nfo:FilesystemImage a rdfs:Class ;
@@ -243,7 +242,7 @@ nfo:Cursor a rdfs:Class ;
 nfo:Bookmark a rdfs:Class ;
        rdfs:label "Bookmark" ;
        rdfs:comment "A bookmark of a webbrowser. Use nie:title for the name/label, nie:contentCreated to 
represent the date when the user added the bookmark, and nie:contentLastModified for modifications. 
nfo:bookmarks to store the link." ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nie:InformationElement .
 
 nfo:DeletedResource a rdfs:Class ;
@@ -259,7 +258,7 @@ nfo:Website a rdfs:Class ;
 nfo:WebHistory a rdfs:Class ;
        rdfs:label "Web History" ;
        rdfs:comment "A web history entry" ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nie:InformationElement .
 
 nfo:count a rdf:Property ;
@@ -347,7 +346,6 @@ nfo:heading a rdf:Property ;
        rdfs:label "Heading" ;
        rdfs:comment "Specifies the direction of travelling while capturing image/video. The range of values 
from 0.00 to 359.99 (where 0 is due North, 90 is East, 180 South and 270 is West)";
        nrl:maxCardinality 1;
-       tracker:writeback true ;
        rdfs:domain nfo:Visual ;
        rdfs:range xsd:double .
 
@@ -441,8 +439,7 @@ nfo:hasMediaFileListEntry a rdf:Property ;
        rdfs:label "hasMediaFileListEntry" ;
        rdfs:comment "This property is intended to point to an RDF list of MediaFiles." ;
        rdfs:domain nfo:MediaList ;
-       rdfs:range nfo:MediaFileListEntry ;
-       tracker:writeback true .
+       rdfs:range nfo:MediaFileListEntry .
 
 # Propose in nepomuk
 nfo:entryCounter a rdf:Property ;
@@ -450,16 +447,14 @@ nfo:entryCounter a rdf:Property ;
        rdfs:comment "Number of entries in the list. Optimize some common queries" ;
        rdfs:domain nfo:MediaList ;
        rdfs:range xsd:integer ;
-       nrl:maxCardinality 1 ;
-       tracker:writeback true .
+       nrl:maxCardinality 1 .
 
 nfo:listDuration a rdf:Property ;
        rdfs:label "List duration" ;
        rdfs:comment "Sum of the duration of all items in the list. Optimize some common queries. In seconds";
        rdfs:domain nfo:MediaList ;
        rdfs:range xsd:integer ;
-       nrl:maxCardinality 1 ;
-       tracker:writeback true .
+       nrl:maxCardinality 1 .
 
 # Propose in nepomuk
 nfo:listPosition a rdf:Property ;
@@ -467,8 +462,7 @@ nfo:listPosition a rdf:Property ;
        rdfs:comment "Position of an entry in a list. Double, to optimize the poor insertions" ;
        nrl:maxCardinality 1 ;
        rdfs:domain nfo:MediaFileListEntry ;
-       rdfs:range xsd:double ;
-       tracker:writeback true .
+       rdfs:range xsd:double .
 
 
 # Propose in nepomuk
@@ -478,8 +472,7 @@ nfo:entryUrl a rdf:Property ;
        rdfs:comment "URL to the element in certain position of the list" ;
        nrl:maxCardinality 1 ;
        rdfs:domain nfo:MediaFileListEntry ;
-       rdfs:range xsd:string ;
-       tracker:writeback true .
+       rdfs:range xsd:string .
 
 nfo:height a rdf:Property ;
        rdfs:label "height" ;
@@ -501,9 +494,9 @@ nfo:fileName a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nfo:FileDataObject ;
        rdfs:range xsd:string ;
-       tracker:indexed true ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 7 .
+       nrl:indexed true ;
+       nrl:fulltextIndexed true ;
+       nrl:weight 7 .
 
 nfo:encoding a rdf:Property ;
        rdfs:label "encoding" ;
@@ -562,8 +555,8 @@ nfo:tableOfContents a rdf:Property ;
         nrl:maxCardinality 1 ;
         rdfs:domain nfo:Document ;
         rdfs:range xsd:string ;
-               tracker:fulltextIndexed true ;
-       tracker:weight 5 .
+               nrl:fulltextIndexed true ;
+       nrl:weight 5 .
 
 # Not in upstream Nepomuk. Pending to submit there.
 nfo:Note a rdfs:Class ;
@@ -637,8 +630,8 @@ nfo:fontFamily a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nfo:Font ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 5 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 5 .
 
 nfo:frontChannels a rdf:Property ;
        rdfs:label "frontChannels" ;
@@ -721,7 +714,7 @@ nfo:fileLastModified a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nfo:FileDataObject ;
        rdfs:range xsd:dateTime ;
-       tracker:indexed true .
+       nrl:indexed true .
 
 nfo:containsBookmark a rdf:Property ;
        rdfs:label "contains bookmark" ;
@@ -801,8 +794,8 @@ nfo:genre a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nfo:Media ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 4 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 4 .
 
 nfo:gain a rdf:Property ;
        rdfs:label "Gain" ;
@@ -852,7 +845,7 @@ nfo:domain a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nfo:WebHistory ;
        rdfs:range xsd:string ;
-       tracker:weight 3 .
+       nrl:weight 3 .
 
 # Addtion to nepomuk
 nfo:uri a rdf:Property ;
@@ -860,7 +853,7 @@ nfo:uri a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nfo:WebHistory ;
        rdfs:range xsd:string ;
-       tracker:weight 5 .
+       nrl:weight 5 .
 
 # Addition to nepomuk
 nfo:ImageCategory a rdfs:Class ;
@@ -889,7 +882,7 @@ nfo:SoftwareApplication a rdfs:Class ;
        rdfs:label "Application" ;
        rdfs:comment "An application" ;
        rdfs:subClassOf nfo:Software ;
-       tracker:notify true .
+       nrl:notify true .
 
 # Addition to nepomuk
 nfo:softwareIcon a rdf:Property ;
@@ -906,7 +899,7 @@ nfo:softwareCmdLine a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nfo:Software ;
        rdfs:range xsd:string ;
-       tracker:weight 3 .
+       nrl:weight 3 .
 
 # Addition to nepomuk
 nfo:Orientation a rdfs:Class ;
@@ -927,8 +920,7 @@ nfo:orientation-left a nfo:Orientation .
 nfo:orientation a rdf:Property ;
        rdfs:domain nfo:Image ;
        rdfs:range nfo:Orientation ;
-       nrl:maxCardinality 1 ;
-       tracker:writeback true .
+       nrl:maxCardinality 1 .
 
 # Addition to nepomuk
 nfo:mediaListEntry a rdf:Property ;
diff --git a/src/ontologies/nepomuk/38-nmm.ontology b/src/ontologies/nepomuk/38-nmm.ontology
index e00587593..54938e995 100644
--- a/src/ontologies/nepomuk/38-nmm.ontology
+++ b/src/ontologies/nepomuk/38-nmm.ontology
@@ -6,25 +6,24 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-nmm: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "nmm" ;
-       tracker:lastModified "2014-09-19T11:05:00Z" .
+nmm: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "nmm" ;
+       nrl:lastModified "2014-09-19T11:05:00Z" .
 
 nmm:MusicPiece a rdfs:Class ;
        rdfs:label "Music" ;
        rdfs:comment "Used to assign music-specific properties such as BPM to video and audio" ;
-       tracker:notify true ;
-       tracker:domainIndex nie:title ;
+       nrl:notify true ;
+       nrl:domainIndex nie:title ;
        rdfs:subClassOf nfo:Media .
 
 nmm:MusicAlbum a rdfs:Class ;
        rdfs:label "Music album" ;
        rdfs:comment "The music album as provided by the publisher. Not to be confused with media lists or 
collections" ;
-       tracker:notify true ;
-       tracker:domainIndex nie:title ;
+       nrl:notify true ;
+       nrl:domainIndex nie:title ;
        rdfs:subClassOf nfo:MediaList .
 
 # Addition to nepomuk
@@ -48,7 +47,7 @@ nmm:SynchronizedText a rdfs:Class ;
 # Addition to nepomuk
 nmm:Video a rdfs:Class ;
        rdfs:label "Video" ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nfo:Video ;
        rdfs:subClassOf nfo:Audio .
 
@@ -56,14 +55,14 @@ nmm:Video a rdfs:Class ;
 nmm:Artist a rdfs:Class ;
        rdfs:label "Artist" ;
        rdfs:comment "An artist." ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nie:InformationElement , nco:Role .
 
 # Addition to nepomuk
 nmm:Playlist a rdfs:Class ;
        rdfs:label "Media playlist" ;
        rdfs:comment "Specific class to split MediaList in Albums and playlists." ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nfo:MediaList .
 
 nmm:Movie a rdfs:Class ;
@@ -94,9 +93,9 @@ nmm:artistName a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:Artist ;
        rdfs:range xsd:string ;
-       tracker:indexed true ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 6 .
+       nrl:indexed true ;
+       nrl:fulltextIndexed true ;
+       nrl:weight 6 .
 
 nmm:musicAlbum a rdf:Property ;
        rdfs:label "album" ;
@@ -105,9 +104,8 @@ nmm:musicAlbum a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:MusicPiece ;
        rdfs:range nmm:MusicAlbum ;
-       tracker:writeback true ;
-       tracker:indexed true ;
-       tracker:weight 6 .
+       nrl:indexed true ;
+       nrl:weight 6 .
 
 # Addition to nepomuk
 nmm:musicAlbumDisc a rdf:Property ;
@@ -125,7 +123,7 @@ nmm:albumArtist a rdf:Property ;
        rdfs:comment "main artists of the album" ;
        rdfs:domain nmm:MusicAlbum ;
        rdfs:range nmm:Artist ;
-       tracker:weight 6 .
+       nrl:weight 6 .
 
 nmm:beatsPerMinute a rdf:Property ;
        rdfs:label "Beats per minute" ;
@@ -148,9 +146,8 @@ nmm:performer a rdf:Property ;
        rdfs:subPropertyOf nco:contributor ;
        rdfs:domain nmm:MusicPiece ;
        rdfs:range nmm:Artist ;
-       tracker:weight 4 ;
-       tracker:writeback true ;
-       tracker:indexed true .
+       nrl:weight 4 ;
+       nrl:indexed true .
 
 nmm:composer a rdf:Property ;
        rdfs:label "Composer" ;
@@ -159,7 +156,7 @@ nmm:composer a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:MusicPiece ;
        rdfs:range nmm:Artist ;
-       tracker:weight 4 .
+       nrl:weight 4 .
 
 nmm:lyricist a rdf:Property ;
        rdfs:label "Lyricist" ;
@@ -168,7 +165,7 @@ nmm:lyricist a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:MusicPiece ;
        rdfs:range nmm:Artist ;
-       tracker:weight 4 .
+       nrl:weight 4 .
 
 # Addition to nepomuk
 nmm:lyrics a rdf:Property ;
@@ -284,22 +281,22 @@ nmm:category a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:Video ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 4 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 4 .
 
 nmm:genre a rdf:Property ;
        rdfs:label "Genre" ;
        nrl:maxCardinality 1 ;
        rdfs:domain nfo:Media ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true ;
-       tracker:weight 4 .
+       nrl:fulltextIndexed true ;
+       nrl:weight 4 .
 
 nmm:director a rdf:Property ;
        rdfs:label "Director" ;
        rdfs:domain nmm:Video ;
        rdfs:range nmm:Artist ;
-       tracker:weight 4 .
+       nrl:weight 4 .
 
 # Addition to nepomuk, it has nmm:producer though
 nmm:producedBy a rdf:Property ;
@@ -307,14 +304,14 @@ nmm:producedBy a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:Video ;
        rdfs:range nmm:Artist ;
-       tracker:weight 3 .
+       nrl:weight 3 .
 
 # Addition to nepomuk
 nmm:leadActor a rdf:Property ;
        rdfs:label "Lead actor" ;
        rdfs:domain nmm:Video ;
        rdfs:range nmm:Artist ;
-       tracker:weight 4 .
+       nrl:weight 4 .
 
 # Addition to nepomuk
 nmm:hasSubtitle a rdf:Property ;
@@ -328,7 +325,7 @@ nmm:subtitle a rdf:Property ;
        rdfs:label "Subtitle file relevant for the video" ;
        rdfs:domain nmm:Video ;
        rdfs:range nmm:SynchronizedText ;
-       tracker:weight 5 .
+       nrl:weight 5 .
 
 # Addition to nepomuk
 nmm:isContentEncrypted a rdf:Property ;
@@ -350,14 +347,14 @@ nmm:skipCounter a rdf:Property ;
 nmm:ImageList a rdfs:Class ;
        rdfs:subClassOf nfo:MediaList ;
        rdfs:label "Image album" ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:comment "An album of images" .
 
 # Addition to nepomuk
 nmm:Photo a rdfs:Class ;
        rdfs:subClassOf nfo:Image ;
        rdfs:label "Photo" ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:comment "A photo" .
 
 # Properties
@@ -368,8 +365,7 @@ nmm:exposureTime a rdf:Property ;
        rdfs:comment "Exposure time of the photo" ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:Photo ;
-       rdfs:range xsd:double ;
-       tracker:writeback true .
+       rdfs:range xsd:double .
 
 nmm:Flash a rdfs:Class ;
        rdfs:label "Flash values" ;
@@ -384,32 +380,28 @@ nmm:flash a rdf:Property ;
        rdfs:comment "Specifies whether flash was used" ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:Photo ;
-       rdfs:range nmm:Flash ;
-       tracker:writeback true .
+       rdfs:range nmm:Flash .
 
 nmm:fnumber a rdf:Property ;
        rdfs:label "F number" ;
        rdfs:comment "The diameter of the entrance pupil in terms of the focal length of the lens" ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:Photo ;
-       rdfs:range xsd:double ;
-       tracker:writeback true .
+       rdfs:range xsd:double .
 
 nmm:focalLength a rdf:Property ;
        rdfs:label "Focal length" ;
        rdfs:comment "A measure of how strongly the lens converges light" ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:Photo ;
-       rdfs:range xsd:double ;
-       tracker:writeback true .
+       rdfs:range xsd:double .
 
 nmm:isoSpeed a rdf:Property ;
        rdfs:label "ISO speed" ;
        rdfs:comment "Measure of a photographic film's sensitivity to light as ISO value" ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:Photo ;
-       rdfs:range xsd:double ;
-       tracker:writeback true .
+       rdfs:range xsd:double .
 
 nmm:MeteringMode a rdfs:Class ;
        rdfs:label "Metering mode values" ;
@@ -428,8 +420,7 @@ nmm:meteringMode a rdf:Property ;
        rdfs:comment "Metering mode refers to the way in which a camera determines the exposure." ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:Photo ;
-       rdfs:range nmm:MeteringMode ;
-       tracker:writeback true .
+       rdfs:range nmm:MeteringMode .
 
 nmm:WhiteBalance a rdfs:Class ;
        rdfs:label "White balance" ;
@@ -442,8 +433,7 @@ nmm:white-balance-manual a nmm:WhiteBalance .
 nmm:whiteBalance a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:Photo ;
-       rdfs:range nmm:WhiteBalance ;
-       tracker:writeback true .
+       rdfs:range nmm:WhiteBalance .
 
 nmm:isCropped a rdf:Property ;
        nrl:maxCardinality 1 ;
@@ -460,7 +450,7 @@ nmm:RadioStation a rdfs:Class ;
        rdfs:label "Radio station" ;
        rdfs:comment "The Radio station in user terms: BBC3, Radio5, YLEX, ... It is linked with 1 or more 
carriers (different FM frenquencies, online sources in different qualities, etc.). Some RDS information is 
represented with nie properties, nie:identifier for PI, nie:title for PS" ;
        rdfs:subClassOf nfo:Audio ;
-       tracker:notify true .
+       nrl:notify true .
 
 nmm:radioIcon a rdf:Property ;
        rdfs:label "Radio station icon" ;
diff --git a/src/ontologies/nepomuk/41-mfo.ontology b/src/ontologies/nepomuk/41-mfo.ontology
index 9a12c273e..3b63ba3c3 100644
--- a/src/ontologies/nepomuk/41-mfo.ontology
+++ b/src/ontologies/nepomuk/41-mfo.ontology
@@ -4,12 +4,11 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix nie: <http://tracker.api.gnome.org/ontology/v3/nie#> .
 @prefix nfo: <http://tracker.api.gnome.org/ontology/v3/nfo#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix mfo: <http://tracker.api.gnome.org/ontology/v3/mfo#> .
 
-mfo: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "mfo" ;
-       tracker:lastModified "2010-02-16T11:00:00Z" .
+mfo: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "mfo" ;
+       nrl:lastModified "2010-02-16T11:00:00Z" .
 
 mfo:FeedElement a rdfs:Class;
        rdfs:label "Feed element";
@@ -17,13 +16,13 @@ mfo:FeedElement a rdfs:Class;
        rdfs:subClassOf nie:InformationElement .
 
 mfo:FeedChannel a rdfs:Class ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:label "Feed channel" ;
        rdfs:comment "Represents feed channel transfer, typically a download of RSS or ATOM." ;
        rdfs:subClassOf mfo:FeedElement .
 
 mfo:FeedMessage a rdfs:Class ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:label "Feed entry" ;
        rdfs:comment "Represents feed entry. May have enclosures attached and certain settings that allow 
deviation from feed channel's setup" ;
        rdfs:subClassOf mfo:FeedElement .
@@ -31,7 +30,7 @@ mfo:FeedMessage a rdfs:Class ;
 mfo:Enclosure a rdfs:Class ;
        rdfs:label "Message enclosure" ;
        rdfs:comment "Represents an enclosure of a feed message" ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf mfo:FeedElement .
 
 mfo:FeedSettings a rdfs:Class ;
diff --git a/src/ontologies/nepomuk/90-tracker.ontology b/src/ontologies/nepomuk/90-tracker.ontology
index 1fd59d4de..ece167bda 100644
--- a/src/ontologies/nepomuk/90-tracker.ontology
+++ b/src/ontologies/nepomuk/90-tracker.ontology
@@ -8,9 +8,9 @@
 @prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-tracker: a tracker:Ontology ;
-       tracker:prefix "tracker" ;
-       tracker:lastModified "2019-07-15T09:41:00Z" .
+tracker: a nrl:Ontology ;
+       nrl:prefix "tracker" ;
+       nrl:lastModified "2019-07-15T09:41:00Z" .
 
 tracker:isDefaultTag a rdf:Property ;
        rdfs:domain nao:Tag ;
@@ -46,8 +46,8 @@ tracker:available a rdf:Property ;
        rdfs:domain tracker:IndexedFolder ;
        rdfs:range xsd:boolean .
 
-fts: a tracker:Namespace ;
-       tracker:prefix "fts" .
+fts: a nrl:Namespace ;
+       nrl:prefix "fts" .
 
 tracker:extractor-data-source a nie:DataSource ;
        rdfs:label "Tracker extractor data source" .
diff --git a/src/ontologies/nepomuk/92-slo.ontology b/src/ontologies/nepomuk/92-slo.ontology
index 7cd859924..4380a0cd9 100644
--- a/src/ontologies/nepomuk/92-slo.ontology
+++ b/src/ontologies/nepomuk/92-slo.ontology
@@ -5,16 +5,15 @@
 @prefix nie: <http://tracker.api.gnome.org/ontology/v3/nie#> .
 @prefix nco: <http://tracker.api.gnome.org/ontology/v3/nco#> .
 @prefix slo: <http://tracker.api.gnome.org/ontology/v3/slo#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 
-slo: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "slo" ;
-       tracker:lastModified "2011-06-08T12:09:00Z" .
+slo: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "slo" ;
+       nrl:lastModified "2011-06-08T12:09:00Z" .
 
 slo:LandmarkCategory a rdfs:Class ;
        rdfs:label "Landmark category";
        rdfs:comment "Predefined set of instances for categories of landmarks";
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nie:InformationElement.
 
 slo:isRemovable a rdf:Property ;
@@ -34,7 +33,7 @@ slo:categoryIconUrl a rdf:Property ;
 slo:Landmark a rdfs:Class ;
        rdfs:label "Point with special relevance for the user" ;
        rdfs:subClassOf nie:InformationElement ;
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:comment "Use the nie title, description, ... properties" .
 
 slo:belongsToCategory a rdf:Property ;
@@ -59,7 +58,7 @@ slo:iconUrl a rdf:Property ;
 slo:GeoLocation a rdfs:Class ;
        rdfs:label "Location" ;
        rdfs:comment "A place in the space, can be defined by coordinates or text";
-       tracker:notify true ;
+       nrl:notify true ;
        rdfs:subClassOf nie:InformationElement.
 
 #Properties of GeoLocation
@@ -143,18 +142,17 @@ slo:timestamp a rdf:Property ;
 slo:postalAddress a rdf:Property ;
        rdfs:label "As postal address" ;
        rdfs:comment "Representation of the location as text address" ;
-       tracker:indexed true ;
+       nrl:indexed true ;
        rdfs:domain slo:GeoLocation ;
        nrl:maxCardinality 1 ;
        rdfs:range nco:PostalAddress .
 
 # FIXME Domain rdfs:Resource?? to link files and not only content?
 slo:location a rdf:Property ;
-       tracker:writeback true ;
        rdfs:label "Property linking something to a location" ;
        rdfs:comment "This can be subclassed to add semantics" ;
        rdfs:domain nie:InformationElement ;
-       tracker:indexed true ;
+       nrl:indexed true ;
        nrl:maxCardinality 1 ;
        rdfs:range slo:GeoLocation .
 
diff --git a/src/ontologies/nepomuk/93-libosinfo.ontology b/src/ontologies/nepomuk/93-libosinfo.ontology
index 35dbef857..cbc7ce7ac 100644
--- a/src/ontologies/nepomuk/93-libosinfo.ontology
+++ b/src/ontologies/nepomuk/93-libosinfo.ontology
@@ -4,12 +4,11 @@
 @prefix osinfo: <http://tracker.api.gnome.org/ontology/v3/osinfo#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-osinfo: a tracker:Namespace, tracker:Ontology ;
-       tracker:prefix "osinfo" ;
-       tracker:lastModified "2011-12-16T08:00:00Z" .
+osinfo: a nrl:Namespace, nrl:Ontology ;
+       nrl:prefix "osinfo" ;
+       nrl:lastModified "2011-12-16T08:00:00Z" .
 
 osinfo:Installer a rdfs:Class ;
        rdfs:label "Operating System Installer" ;
diff --git a/src/tracker/tracker-export.c b/src/tracker/tracker-export.c
index deae64bc6..a6a50e9af 100644
--- a/src/tracker/tracker-export.c
+++ b/src/tracker/tracker-export.c
@@ -265,7 +265,7 @@ export_run_default (void)
                "        ?u ?p ?v "
                "        FILTER NOT EXISTS { ?u a rdf:Property } "
                "        FILTER NOT EXISTS { ?u a rdfs:Class } "
-               "        FILTER NOT EXISTS { ?u a tracker:Namespace } "
+               "        FILTER NOT EXISTS { ?u a nrl:Namespace } "
                "    } "
                "} ORDER BY ?g ?u";
 
diff --git a/src/tracker/tracker-sparql.c b/src/tracker/tracker-sparql.c
index 60c4f41fc..8c00f9d67 100644
--- a/src/tracker/tracker-sparql.c
+++ b/src/tracker/tracker-sparql.c
@@ -218,8 +218,8 @@ tracker_sparql_get_prefixes (TrackerSparqlConnection *connection)
         */
        query = "SELECT ?ns ?prefix "
                "WHERE {"
-               "  ?ns a tracker:Namespace ;"
-               "  tracker:prefix ?prefix "
+               "  ?ns a nrl:Namespace ;"
+               "  nrl:prefix ?prefix "
                "}";
 
        cursor = tracker_sparql_connection_query (connection, query, NULL, &error);
@@ -271,8 +271,8 @@ get_class_from_prefix (TrackerSparqlConnection *connection,
 
        query = "SELECT ?prefix ?ns "
                "WHERE {"
-               "  ?ns a tracker:Namespace ;"
-               "  tracker:prefix ?prefix "
+               "  ?ns a nrl:Namespace ;"
+               "  nrl:prefix ?prefix "
                "}";
 
        /* We have namespace prefix, get full name */
@@ -1138,8 +1138,8 @@ sparql_run (void)
 
                query = "SELECT ?prefix ?ns "
                        "WHERE {"
-                       "  ?ns a tracker:Namespace ;"
-                       "  tracker:prefix ?prefix "
+                       "  ?ns a nrl:Namespace ;"
+                       "  nrl:prefix ?prefix "
                        "}";
 
                cursor = tracker_sparql_connection_query (connection, query, NULL, &error);
@@ -1232,13 +1232,13 @@ sparql_run (void)
                        query = g_strdup_printf ("SELECT ?c "
                                                 "WHERE {"
                                                 "  ?c a rdfs:Class ."
-                                                "  ?c tracker:notify true ."
+                                                "  ?c nrl:notify true ."
                                                 "}");
                } else {
                        query = g_strdup_printf ("SELECT ?c "
                                                 "WHERE {"
                                                 "  ?c a rdfs:Class ."
-                                                "  ?c tracker:notify true "
+                                                "  ?c nrl:notify true "
                                                 "  FILTER regex (?c, \"%s\", \"i\") "
                                                 "}",
                                                 list_notifies);
@@ -1267,12 +1267,12 @@ sparql_run (void)
                if (*list_indexes == '\0') {
                        query = g_strdup_printf ("SELECT ?p "
                                                 "WHERE {"
-                                                "  ?p tracker:indexed true ."
+                                                "  ?p nrl:indexed true ."
                                                 "}");
                } else {
                        query = g_strdup_printf ("SELECT ?p "
                                                 "WHERE {"
-                                                "  ?p tracker:indexed true "
+                                                "  ?p nrl:indexed true "
                                                 "  FILTER regex (?p, \"%s\", \"i\") "
                                                 "}",
                                                 list_indexes);
diff --git a/tests/functional-tests/ontology-changes.py b/tests/functional-tests/ontology-changes.py
index 8a4b5491f..22cf767ac 100644
--- a/tests/functional-tests/ontology-changes.py
+++ b/tests/functional-tests/ontology-changes.py
@@ -155,9 +155,9 @@ class OntologyChangeTestTemplate (ut.TestCase):
         def get_ontology_date(ontology):
             with open(ontology, 'r') as f:
                 for line in f:
-                    if "tracker:lastModified" in line:
+                    if "nrl:lastModified" in line:
                         getmodtime = re.compile(
-                            'tracker:lastModified\ \"' + ISO9601_REGEX + '\"')
+                            'nrl:lastModified\ \"' + ISO9601_REGEX + '\"')
                         modtime_match = getmodtime.search(line)
 
                         if (modtime_match):
@@ -172,7 +172,7 @@ class OntologyChangeTestTemplate (ut.TestCase):
         second_date = get_ontology_date(
             self.ontology_path(second).joinpath("91-test.ontology"))
         if first_date >= second_date:
-            self.fail("tracker:lastModified in '%s' is not more recent in the second ontology" % (
+            self.fail("nrl:lastModified in '%s' is not more recent in the second ontology" % (
                 "91-test.ontology"))
 
 
@@ -365,7 +365,7 @@ class PropertyMaxCardinalityNto1 (OntologyChangeTestTemplate):
 
 class ClassNotifySet (OntologyChangeTestTemplate):
     """
-    Set tracker:notify to true in a class and check there is no data loss
+    Set nrl:notify to true in a class and check there is no data loss
     """
 
     def test_property_notify_set(self):
@@ -382,7 +382,7 @@ class ClassNotifySet (OntologyChangeTestTemplate):
 
     def validate_status(self):
         result = self.tracker.query(
-            "SELECT ?notify WHERE { test:A tracker:notify ?notify}")
+            "SELECT ?notify WHERE { test:A nrl:notify ?notify}")
         self.assertEqual(str(result[0][0]), "true")
 
         result = self.tracker.query("SELECT ?u WHERE { ?u a test:A. }")
@@ -391,7 +391,7 @@ class ClassNotifySet (OntologyChangeTestTemplate):
 
 class ClassNotifyUnset (OntologyChangeTestTemplate):
     """
-    Set tracker:notify to true in a class and check there is no data loss
+    Set nrl:notify to true in a class and check there is no data loss
     """
 
     def test_property_notify_set(self):
@@ -408,7 +408,7 @@ class ClassNotifyUnset (OntologyChangeTestTemplate):
 
     def validate_status(self):
         result = self.tracker.query(
-            "SELECT ?notify WHERE { test:A tracker:notify ?notify}")
+            "SELECT ?notify WHERE { test:A nrl:notify ?notify}")
         if (len(result) == 1):
             # Usually is (none) but it was "true" before so now has value.
             self.assertEqual(result[0][0], "false")
@@ -421,7 +421,7 @@ class ClassNotifyUnset (OntologyChangeTestTemplate):
 
 class PropertyIndexedSet (OntologyChangeTestTemplate):
     """
-    Set tracker:indexed true to single and multiple valued properties.
+    Set nrl:indexed true to single and multiple valued properties.
     Check that instances and content of the property are still in the DB
     """
 
@@ -446,7 +446,7 @@ class PropertyIndexedSet (OntologyChangeTestTemplate):
     def validate_status(self):
         # Check ontology and instance for the single valued property
         result = self.tracker.query(
-            "SELECT ?indexed WHERE { test:a_string tracker:indexed ?indexed}")
+            "SELECT ?indexed WHERE { test:a_string nrl:indexed ?indexed}")
         self.assertEqual(str(result[0][0]), "true")
 
         result = self.tracker.query("SELECT ?content WHERE { <%s> a test:A; test:a_string ?content. }"
@@ -455,7 +455,7 @@ class PropertyIndexedSet (OntologyChangeTestTemplate):
 
         # Check ontology and instance for the multiple valued property
         result = self.tracker.query(
-            "SELECT ?indexed WHERE { test:a_n_cardinality tracker:indexed ?indexed}")
+            "SELECT ?indexed WHERE { test:a_n_cardinality nrl:indexed ?indexed}")
         self.assertEqual(str(result[0][0]), "true")
 
         result = self.tracker.query("SELECT ?content WHERE { <%s> a test:A; test:a_n_cardinality ?content. }"
@@ -465,7 +465,7 @@ class PropertyIndexedSet (OntologyChangeTestTemplate):
 
 class PropertyIndexedUnset (OntologyChangeTestTemplate):
     """
-    tracker:indexed property from true to false in single and multiple valued properties.
+    nrl:indexed property from true to false in single and multiple valued properties.
     Check that instances and content of the property are still in the DB.
     """
 
@@ -489,12 +489,12 @@ class PropertyIndexedUnset (OntologyChangeTestTemplate):
 
     def validate_status(self):
         #
-        # NOTE: tracker:indexed can be 'false' or None. In both cases is fine.
+        # NOTE: nrl:indexed can be 'false' or None. In both cases is fine.
         #
 
         # Check ontology and instance for the single valued property
         result = self.tracker.query(
-            "SELECT ?indexed WHERE { test:a_string tracker:indexed ?indexed}")
+            "SELECT ?indexed WHERE { test:a_string nrl:indexed ?indexed}")
         self.assertEqual(str(result[0][0]), "false")
 
         result = self.tracker.query("SELECT ?content WHERE { <%s> a test:A; test:a_string ?content. }"
@@ -503,7 +503,7 @@ class PropertyIndexedUnset (OntologyChangeTestTemplate):
 
         # Check ontology and instance for the multiple valued property
         result = self.tracker.query(
-            "SELECT ?indexed WHERE { test:a_n_cardinality tracker:indexed ?indexed}")
+            "SELECT ?indexed WHERE { test:a_n_cardinality nrl:indexed ?indexed}")
         self.assertEqual(str(result[0][0]), "false")
 
         result = self.tracker.query("SELECT ?content WHERE { <%s> a test:A; test:a_n_cardinality ?content. }"
@@ -666,7 +666,7 @@ class OntologyRemovePropertyTest (OntologyChangeTestTemplate):
 
 class DomainIndexAddTest (OntologyChangeTestTemplate):
     """
-    Add tracker:domainIndex to a class and check there is no data loss.
+    Add nrl:domainIndex to a class and check there is no data loss.
     """
     @ut.skip("Fails with: basic-future/91-test.ontology: Unsupported ontology change for test:b_property: 
can't change rdfs:domain (old=test:A, attempted new=test:B) ")
     def test_domain_index_add(self):
@@ -692,11 +692,11 @@ class DomainIndexAddTest (OntologyChangeTestTemplate):
     def validate_status(self):
         # Check the ontology
         has_domainIndex = self.tracker.ask(
-            "ASK { test:B tracker:domainIndex test:a_string }")
+            "ASK { test:B nrl:domainIndex test:a_string }")
         self.assertTrue(has_domainIndex)
 
         has_domainIndex = self.tracker.ask(
-            "ASK { test:C tracker:domainIndex test:a_n_cardinality }")
+            "ASK { test:C nrl:domainIndex test:a_n_cardinality }")
         self.assertTrue(has_domainIndex)
 
         # Check the data
@@ -711,7 +711,7 @@ class DomainIndexAddTest (OntologyChangeTestTemplate):
 
 class DomainIndexRemoveTest (OntologyChangeTestTemplate):
     """
-    Remove tracker:domainIndex to a class and check there is no data loss.
+    Remove nrl:domainIndex to a class and check there is no data loss.
     """
 
     def test_domain_index_remove(self):
@@ -737,11 +737,11 @@ class DomainIndexRemoveTest (OntologyChangeTestTemplate):
     def validate_status(self):
         # Check the ontology
         has_domainIndex = self.tracker.ask(
-            "ASK { test:B tracker:domainIndex test:a_string }")
+            "ASK { test:B nrl:domainIndex test:a_string }")
         self.assertFalse(has_domainIndex)
 
         has_domainIndex = self.tracker.ask(
-            "ASK { test:C tracker:domainIndex test:a_n_cardinality }")
+            "ASK { test:C nrl:domainIndex test:a_n_cardinality }")
         self.assertFalse(has_domainIndex)
 
         # Check the data
diff --git a/tests/functional-tests/sparql-bugs.py b/tests/functional-tests/sparql-bugs.py
index ff997d2f1..bdd128f8c 100644
--- a/tests/functional-tests/sparql-bugs.py
+++ b/tests/functional-tests/sparql-bugs.py
@@ -180,7 +180,7 @@ class TrackerStoreSparqlBugsTests (fixtures.TrackerSparqlDirectTest):
         """
         NB222645 - Inserting a resource using an non-existing class, doesn't rollback completely
         """
-        query = "SELECT tracker:modified (?u) ?u  WHERE { ?u a nco:Contact }"
+        query = "SELECT nrl:modified (?u) ?u  WHERE { ?u a nco:Contact }"
         original_data = self.tracker.query(query)
 
         wrong_insert = "INSERT { <test://nb222645-wrong-class-contact> a nco:IMContact. } "
diff --git a/tests/functional-tests/test-ontologies/add-class/91-test.ontology 
b/tests/functional-tests/test-ontologies/add-class/91-test.ontology
index a4f231340..582cce0d3 100644
--- a/tests/functional-tests/test-ontologies/add-class/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/add-class/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,9 +13,9 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2010-03-24T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2010-03-24T11:00:04Z" ;
+        nrl:prefix "test" .
 
 test:A a rdfs:Class .
 
diff --git a/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology 
b/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology
index 0d224f49a..b67d63098 100644
--- a/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,9 +13,9 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2010-03-24T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2010-03-24T11:00:04Z" ;
+        nrl:prefix "test" .
 
 test:A a rdfs:Class .
 
@@ -58,7 +57,7 @@ test:a_superprop_n a rdf:Property ;
 
 # ****** TEST CHANGE *****
 test:B a rdfs:Class ;
-    tracker:domainIndex test:a_string ;
+    nrl:domainIndex test:a_string ;
     rdfs:subClassOf test:A .
 # ************************
 
@@ -75,7 +74,7 @@ test:b_property_n a rdf:Property ;
 
 # ****** TEST CHANGE *****
 test:C a rdfs:Class ;
-    tracker:domainIndex test:a_n_cardinality ;
+    nrl:domainIndex test:a_n_cardinality ;
     rdfs:subClassOf test:A .
 # *************************
 
diff --git a/tests/functional-tests/test-ontologies/add-prop/91-test.ontology 
b/tests/functional-tests/test-ontologies/add-prop/91-test.ontology
index 72fde9361..07ee94571 100644
--- a/tests/functional-tests/test-ontologies/add-prop/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/add-prop/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,9 +13,9 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2010-03-24T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2010-03-24T11:00:04Z" ;
+        nrl:prefix "test" .
 
 test:A a rdfs:Class .
 
diff --git a/tests/functional-tests/test-ontologies/basic-future/91-test.ontology 
b/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
index 6dda3b2a1..fb15a14b5 100644
--- a/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,9 +13,9 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2011-03-24T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2011-03-24T11:00:04Z" ;
+        nrl:prefix "test" .
 
 test:A a rdfs:Class .
 
diff --git a/tests/functional-tests/test-ontologies/basic/91-test.ontology 
b/tests/functional-tests/test-ontologies/basic/91-test.ontology
index cae343eab..e5143a3b1 100644
--- a/tests/functional-tests/test-ontologies/basic/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/basic/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,9 +13,9 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2010-03-23T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2010-03-23T11:00:04Z" ;
+        nrl:prefix "test" .
 
 test:A a rdfs:Class .
 
diff --git a/tests/functional-tests/test-ontologies/cardinality/91-test.ontology 
b/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
index 08e8b8faf..b7e972e8e 100644
--- a/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,9 +13,9 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2010-03-24T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2010-03-24T11:00:04Z" ;
+        nrl:prefix "test" .
 
 test:A a rdfs:Class .
 
diff --git a/tests/functional-tests/test-ontologies/indexed/91-test.ontology 
b/tests/functional-tests/test-ontologies/indexed/91-test.ontology
index 8b1b1a65b..f3db50629 100644
--- a/tests/functional-tests/test-ontologies/indexed/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/indexed/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,9 +13,9 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2010-03-24T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2010-03-24T11:00:04Z" ;
+        nrl:prefix "test" .
 
 test:A a rdfs:Class .
 
@@ -94,7 +93,7 @@ test:c_subprop_n a rdf:Property ;
 test:a_n_cardinality a rdf:Property ;
     rdfs:comment "Property to test the cardinality changes. indexed is false in basic" ;
     rdfs:domain test:A ;
-    tracker:indexed true ;
+    nrl:indexed true ;
     rdfs:range xsd:string .
 # Max cardinality N because is not specified
 
@@ -102,7 +101,7 @@ test:a_string a rdf:Property ;
     rdfs:comment "Property to test the conversions from string" ;
     rdfs:domain test:A ;
     rdfs:range  xsd:string ;
-    tracker:indexed true ;
+    nrl:indexed true ;
     nrl:maxCardinality 1 .
 
 # *******************************
diff --git a/tests/functional-tests/test-ontologies/notify/91-test.ontology 
b/tests/functional-tests/test-ontologies/notify/91-test.ontology
index d60e3902c..307b5a51f 100644
--- a/tests/functional-tests/test-ontologies/notify/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/notify/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,15 +13,15 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2010-03-24T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2010-03-24T11:00:04Z" ;
+        nrl:prefix "test" .
 
 # ***** TEST CHANGE ******
 # test:A a rdfs:Class .
 
 test:A a rdfs:Class ;
-       tracker:notify true .
+       nrl:notify true .
 # ***************************
 
 test:a_string a rdf:Property ;
diff --git a/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology 
b/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology
index d3442e9e9..f0916736d 100644
--- a/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,9 +13,9 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2010-03-24T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2010-03-24T11:00:04Z" ;
+        nrl:prefix "test" .
 
 test:A a rdfs:Class .
 
diff --git a/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology 
b/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology
index 56fc79da2..e45ba6657 100644
--- a/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,9 +13,9 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2010-03-24T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2010-03-24T11:00:04Z" ;
+        nrl:prefix "test" .
 
 test:A a rdfs:Class .
 
diff --git a/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology 
b/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology
index faa57b6c3..6749f79d8 100644
--- a/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,9 +13,9 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2010-03-24T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2010-03-24T11:00:04Z" ;
+        nrl:prefix "test" .
 
 test:A a rdfs:Class .
 
diff --git a/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology 
b/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology
index 3796ad57c..c884b39a3 100644
--- a/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology
@@ -1,6 +1,5 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
@@ -14,9 +13,9 @@
 #      / \
 #     B   C
 #
-test: a tracker:Namespace, tracker:Ontology ;
-        tracker:lastModified "2010-03-24T11:00:04Z" ;
-        tracker:prefix "test" .
+test: a nrl:Namespace, nrl:Ontology ;
+        nrl:lastModified "2010-03-24T11:00:04Z" ;
+        nrl:prefix "test" .
 
 test:A a rdfs:Class .
 
diff --git a/tests/libtracker-data/aggregates/test.ontology b/tests/libtracker-data/aggregates/test.ontology
index 078a68c4f..cc33f80ff 100644
--- a/tests/libtracker-data/aggregates/test.ontology
+++ b/tests/libtracker-data/aggregates/test.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/algebra/test-1.ontology b/tests/libtracker-data/algebra/test-1.ontology
index 786eb21bf..215735a70 100644
--- a/tests/libtracker-data/algebra/test-1.ontology
+++ b/tests/libtracker-data/algebra/test-1.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/algebra/test-2.ontology b/tests/libtracker-data/algebra/test-2.ontology
index ffc5373f0..c95cdb416 100644
--- a/tests/libtracker-data/algebra/test-2.ontology
+++ b/tests/libtracker-data/algebra/test-2.ontology
@@ -1,7 +1,6 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 example:name a rdf:Property ;
diff --git a/tests/libtracker-data/anon/test.ontology b/tests/libtracker-data/anon/test.ontology
index 000185060..c9b1d07f4 100644
--- a/tests/libtracker-data/anon/test.ontology
+++ b/tests/libtracker-data/anon/test.ontology
@@ -1,11 +1,11 @@
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-foaf: a tracker:Namespace ;
-       tracker:prefix "foaf" .
+foaf: a nrl:Namespace ;
+       nrl:prefix "foaf" .
 
 foaf:Agent a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/ask/data.ontology b/tests/libtracker-data/ask/data.ontology
index 2cc3edf7c..eb2fa58f2 100644
--- a/tests/libtracker-data/ask/data.ontology
+++ b/tests/libtracker-data/ask/data.ontology
@@ -1,11 +1,11 @@
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix x:  <http://example/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-x: a tracker:Namespace ;
-       tracker:prefix "x" .
+x: a nrl:Namespace ;
+       nrl:prefix "x" .
 
 x:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/basic/test.ontology b/tests/libtracker-data/basic/test.ontology
index 1fd37bae2..d1c0849a8 100644
--- a/tests/libtracker-data/basic/test.ontology
+++ b/tests/libtracker-data/basic/test.ontology
@@ -1,19 +1,19 @@
 @prefix ns: <http://example.org/ns#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix x:  <http://example.org/x/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix z:  <http://example.org/x/#> .
 
-ns: a tracker:Namespace ;
-       tracker:prefix "ns" .
+ns: a nrl:Namespace ;
+       nrl:prefix "ns" .
 
-x: a tracker:Namespace ;
-       tracker:prefix "x" .
+x: a nrl:Namespace ;
+       nrl:prefix "x" .
 
-z: a tracker:Namespace ;
-       tracker:prefix "z" .
+z: a nrl:Namespace ;
+       nrl:prefix "z" .
 
 x:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/bind/data.ontology b/tests/libtracker-data/bind/data.ontology
index 099cc21eb..dacbdce0a 100644
--- a/tests/libtracker-data/bind/data.ontology
+++ b/tests/libtracker-data/bind/data.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example.org/ns#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/bnode-coreference/data.ontology 
b/tests/libtracker-data/bnode-coreference/data.ontology
index 814ee6813..cb2a0d5d3 100644
--- a/tests/libtracker-data/bnode-coreference/data.ontology
+++ b/tests/libtracker-data/bnode-coreference/data.ontology
@@ -1,11 +1,11 @@
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-foaf: a tracker:Namespace ;
-       tracker:prefix "foaf" .
+foaf: a nrl:Namespace ;
+       nrl:prefix "foaf" .
 
 foaf:Person a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/bnode/data.ontology b/tests/libtracker-data/bnode/data.ontology
index 814ee6813..cb2a0d5d3 100644
--- a/tests/libtracker-data/bnode/data.ontology
+++ b/tests/libtracker-data/bnode/data.ontology
@@ -1,11 +1,11 @@
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-foaf: a tracker:Namespace ;
-       tracker:prefix "foaf" .
+foaf: a nrl:Namespace ;
+       nrl:prefix "foaf" .
 
 foaf:Person a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/bound/data.ontology b/tests/libtracker-data/bound/data.ontology
index 32ac02d56..bd22eee3e 100644
--- a/tests/libtracker-data/bound/data.ontology
+++ b/tests/libtracker-data/bound/data.ontology
@@ -1,10 +1,10 @@
 @prefix example: <http://example.org/ns#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v1 
b/tests/libtracker-data/change/source/99-example.ontology.v1
index e6674e9d0..1f5c4a3d6 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v1
+++ b/tests/libtracker-data/change/source/99-example.ontology.v1
@@ -1,11 +1,11 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:01Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:01Z" ;
+       nrl:prefix "example" .
 
 
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v10 
b/tests/libtracker-data/change/source/99-example.ontology.v10
index 9007ab159..9acc3ea7e 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v10
+++ b/tests/libtracker-data/change/source/99-example.ontology.v10
@@ -1,20 +1,19 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:09Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:09Z" ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
 
 # We remove a domainIndex
 example:DomA a rdfs:Class ;
-       tracker:domainIndex example:single2 ;
+       nrl:domainIndex example:single2 ;
        rdfs:subClassOf example:A .
 
 example:B a rdfs:Class ;
@@ -36,13 +35,13 @@ example:single1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:single2 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:ib a rdf:Property ;
        rdfs:domain example:B ;
@@ -56,13 +55,13 @@ example:sb a rdf:Property ;
 example:fts1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true .
+       nrl:fulltextIndexed true .
 
 example:fts2 a rdf:Property ;
        rdfs:domain example:B ;
        rdfs:range xsd:string ;
        nrl:maxCardinality 1 ;
-       tracker:fulltextIndexed true .
+       nrl:fulltextIndexed true .
 
 example:nonFts a rdf:Property ;
        rdfs:domain example:A ;
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v11 
b/tests/libtracker-data/change/source/99-example.ontology.v11
index 31ab28d84..a5e6fd61a 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v11
+++ b/tests/libtracker-data/change/source/99-example.ontology.v11
@@ -1,20 +1,19 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:10Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:10Z" ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
 
 # We remove a domainIndex
 example:DomA a rdfs:Class ;
-       tracker:domainIndex example:single2 ;
+       nrl:domainIndex example:single2 ;
        rdfs:subClassOf example:A .
 
 example:B a rdfs:Class ;
@@ -36,13 +35,13 @@ example:single1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:single2 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:ib a rdf:Property ;
        rdfs:domain example:B ;
@@ -55,7 +54,7 @@ example:sb a rdf:Property ;
 example:fts1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true .
+       nrl:fulltextIndexed true .
 
 # Make a property no longer FTS indexed
 example:fts2 a rdf:Property ;
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v12 
b/tests/libtracker-data/change/source/99-example.ontology.v12
index de9d48466..1413733f4 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v12
+++ b/tests/libtracker-data/change/source/99-example.ontology.v12
@@ -1,20 +1,19 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:11Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:11Z" ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
 
 # We remove a domainIndex
 example:DomA a rdfs:Class ;
-       tracker:domainIndex example:single2 ;
+       nrl:domainIndex example:single2 ;
        rdfs:subClassOf example:A .
 
 example:B a rdfs:Class ;
@@ -36,13 +35,13 @@ example:single1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:single2 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:ib a rdf:Property ;
        rdfs:domain example:B ;
@@ -55,7 +54,7 @@ example:sb a rdf:Property ;
 example:fts1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true .
+       nrl:fulltextIndexed true .
 
 example:fts2 a rdf:Property ;
        rdfs:domain example:B ;
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v13 
b/tests/libtracker-data/change/source/99-example.ontology.v13
index b952987a4..88bd6b472 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v13
+++ b/tests/libtracker-data/change/source/99-example.ontology.v13
@@ -1,20 +1,19 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:12Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:12Z" ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
 
 # We remove a domainIndex
 example:DomA a rdfs:Class ;
-       tracker:domainIndex example:single2 ;
+       nrl:domainIndex example:single2 ;
        rdfs:subClassOf example:A .
 
 example:B a rdfs:Class ;
@@ -36,13 +35,13 @@ example:single1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:single2 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:ib a rdf:Property ;
        rdfs:domain example:B ;
@@ -55,7 +54,7 @@ example:sb a rdf:Property ;
 example:fts1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true .
+       nrl:fulltextIndexed true .
 
 example:fts2 a rdf:Property ;
        rdfs:domain example:B ;
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v2 
b/tests/libtracker-data/change/source/99-example.ontology.v2
index 17dab7f41..bce31fab8 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v2
+++ b/tests/libtracker-data/change/source/99-example.ontology.v2
@@ -1,12 +1,12 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:02Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:02Z" ;
+       nrl:prefix "example" .
 
 # Creation of a class
 example:A a rdfs:Class ;
@@ -21,5 +21,5 @@ example:B a rdfs:Class ;
 example:b a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range example:B ;
-       tracker:indexed true .
+       nrl:indexed true .
 
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v3 
b/tests/libtracker-data/change/source/99-example.ontology.v3
index 861a32112..bed8bd1d4 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v3
+++ b/tests/libtracker-data/change/source/99-example.ontology.v3
@@ -1,13 +1,12 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:03Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:03Z" ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
@@ -34,4 +33,4 @@ example:single1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed true .
+       nrl:indexed true .
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v4 
b/tests/libtracker-data/change/source/99-example.ontology.v4
index e223e6956..b925740c6 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v4
+++ b/tests/libtracker-data/change/source/99-example.ontology.v4
@@ -1,13 +1,12 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:04Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:04Z" ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
@@ -36,14 +35,14 @@ example:single1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 # Creation of a property
 example:single2 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 # Creation of a property
 example:ib a rdf:Property ;
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v5 
b/tests/libtracker-data/change/source/99-example.ontology.v5
index 0261ab276..3860fe47f 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v5
+++ b/tests/libtracker-data/change/source/99-example.ontology.v5
@@ -1,20 +1,19 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:05Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:05Z" ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
 
 # Adding two domainIndexes to a class
 example:DomA a rdfs:Class ;
-       tracker:domainIndex example:single1, example:single2 ;
+       nrl:domainIndex example:single1, example:single2 ;
        rdfs:subClassOf example:A .
 
 example:B a rdfs:Class ;
@@ -36,13 +35,13 @@ example:single1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:single2 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:ib a rdf:Property ;
        rdfs:domain example:B ;
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v6 
b/tests/libtracker-data/change/source/99-example.ontology.v6
index 869f9cb31..7e482f449 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v6
+++ b/tests/libtracker-data/change/source/99-example.ontology.v6
@@ -1,20 +1,19 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:06Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:06Z" ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
 
 # We remove a domainIndex
 example:DomA a rdfs:Class ;
-       tracker:domainIndex example:single2 ;
+       nrl:domainIndex example:single2 ;
        rdfs:subClassOf example:A .
 
 example:B a rdfs:Class ;
@@ -36,13 +35,13 @@ example:single1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:single2 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:ib a rdf:Property ;
        rdfs:domain example:B ;
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v7 
b/tests/libtracker-data/change/source/99-example.ontology.v7
index 869f9cb31..7e482f449 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v7
+++ b/tests/libtracker-data/change/source/99-example.ontology.v7
@@ -1,20 +1,19 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:06Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:06Z" ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
 
 # We remove a domainIndex
 example:DomA a rdfs:Class ;
-       tracker:domainIndex example:single2 ;
+       nrl:domainIndex example:single2 ;
        rdfs:subClassOf example:A .
 
 example:B a rdfs:Class ;
@@ -36,13 +35,13 @@ example:single1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:single2 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:ib a rdf:Property ;
        rdfs:domain example:B ;
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v8 
b/tests/libtracker-data/change/source/99-example.ontology.v8
index 84b9e7f53..322bd028d 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v8
+++ b/tests/libtracker-data/change/source/99-example.ontology.v8
@@ -1,20 +1,19 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:07Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:07Z" ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
 
 # We remove a domainIndex
 example:DomA a rdfs:Class ;
-       tracker:domainIndex example:single2 ;
+       nrl:domainIndex example:single2 ;
        rdfs:subClassOf example:A .
 
 example:B a rdfs:Class ;
@@ -36,13 +35,13 @@ example:single1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:single2 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:ib a rdf:Property ;
        rdfs:domain example:B ;
@@ -57,10 +56,10 @@ example:fts1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:string ;
        nrl:maxCardinality 1 ;
-       tracker:fulltextIndexed true .
+       nrl:fulltextIndexed true .
 
 example:fts2 a rdf:Property ;
        rdfs:domain example:B ;
        rdfs:range xsd:string ;
        nrl:maxCardinality 1 ;
-       tracker:fulltextIndexed true .
+       nrl:fulltextIndexed true .
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v9 
b/tests/libtracker-data/change/source/99-example.ontology.v9
index 64ec11939..9ec1b5894 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v9
+++ b/tests/libtracker-data/change/source/99-example.ontology.v9
@@ -1,20 +1,19 @@
 @prefix example: <http://example/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace, tracker:Ontology ;
-       tracker:lastModified "2010-03-23T11:00:08Z" ;
-       tracker:prefix "example" .
+example: a nrl:Namespace, nrl:Ontology ;
+       nrl:lastModified "2010-03-23T11:00:08Z" ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
 
 # We remove a domainIndex
 example:DomA a rdfs:Class ;
-       tracker:domainIndex example:single2 ;
+       nrl:domainIndex example:single2 ;
        rdfs:subClassOf example:A .
 
 example:B a rdfs:Class ;
@@ -36,13 +35,13 @@ example:single1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:single2 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:integer ;
        nrl:maxCardinality 1 ;
-       tracker:indexed false .
+       nrl:indexed false .
 
 example:ib a rdf:Property ;
        rdfs:domain example:B ;
@@ -56,13 +55,13 @@ example:fts1 a rdf:Property ;
        rdfs:domain example:A ;
        rdfs:range xsd:string ;
        nrl:maxCardinality 1 ;
-       tracker:fulltextIndexed true .
+       nrl:fulltextIndexed true .
 
 example:fts2 a rdf:Property ;
        rdfs:domain example:B ;
        rdfs:range xsd:string ;
        nrl:maxCardinality 1 ;
-       tracker:fulltextIndexed true .
+       nrl:fulltextIndexed true .
 
 # Add a non-FTS property on a class with FTS properties
 example:nonFts a rdf:Property ;
diff --git a/tests/libtracker-data/change/test-5.rq b/tests/libtracker-data/change/test-5.rq
index 3c04ff576..bfe8b837b 100644
--- a/tests/libtracker-data/change/test-5.rq
+++ b/tests/libtracker-data/change/test-5.rq
@@ -1 +1 @@
-select ?index { example:DomA tracker:domainIndex ?index }
+select ?index { example:DomA nrl:domainIndex ?index }
diff --git a/tests/libtracker-data/construct/test.ontology b/tests/libtracker-data/construct/test.ontology
index 695f934ce..cc3cd75ca 100644
--- a/tests/libtracker-data/construct/test.ontology
+++ b/tests/libtracker-data/construct/test.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/datetime/test.ontology b/tests/libtracker-data/datetime/test.ontology
index 43cfa9f6e..ce85fae0d 100644
--- a/tests/libtracker-data/datetime/test.ontology
+++ b/tests/libtracker-data/datetime/test.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/describe/test.ontology b/tests/libtracker-data/describe/test.ontology
index 695f934ce..cc3cd75ca 100644
--- a/tests/libtracker-data/describe/test.ontology
+++ b/tests/libtracker-data/describe/test.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/error/test.ontology b/tests/libtracker-data/error/test.ontology
index 63df24c97..191fc804e 100644
--- a/tests/libtracker-data/error/test.ontology
+++ b/tests/libtracker-data/error/test.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example.com/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/expr-ops/data.ontology b/tests/libtracker-data/expr-ops/data.ontology
index a3915d59c..3bb2136c2 100644
--- a/tests/libtracker-data/expr-ops/data.ontology
+++ b/tests/libtracker-data/expr-ops/data.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example.org/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/functions/test-1.ontology b/tests/libtracker-data/functions/test-1.ontology
index 2ea79628f..743a0e005 100644
--- a/tests/libtracker-data/functions/test-1.ontology
+++ b/tests/libtracker-data/functions/test-1.ontology
@@ -1,12 +1,12 @@
 @prefix example: <http://example/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix ns: <http://www.w3.org/2005/xpath-functions#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/functions/test-2.ontology b/tests/libtracker-data/functions/test-2.ontology
index ff872f5e2..4dd27505e 100644
--- a/tests/libtracker-data/functions/test-2.ontology
+++ b/tests/libtracker-data/functions/test-2.ontology
@@ -1,7 +1,6 @@
 @prefix       e:  <http://example/> .
 @prefix     rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix    rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker:  <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix     xsd:  <http://www.w3.org/2001/XMLSchema#> .
 @prefix      ns:  <http://www.w3.org/2005/xpath-functions#> .
 
diff --git a/tests/libtracker-data/graph/graph-4.rq b/tests/libtracker-data/graph/graph-4.rq
index aa402a9b9..a2f47b49b 100644
--- a/tests/libtracker-data/graph/graph-4.rq
+++ b/tests/libtracker-data/graph/graph-4.rq
@@ -1,6 +1,6 @@
 SELECT ?g ?p ?v WHERE {
        GRAPH ?g {
                example:resource ?p ?v .
-               FILTER (?p != tracker:added && ?p != tracker:modified)
+               FILTER (?p != nrl:added && ?p != nrl:modified)
        }
 } ORDER BY ?g ?p ?v
diff --git a/tests/libtracker-data/graph/graph-5.rq b/tests/libtracker-data/graph/graph-5.rq
index aa402a9b9..a2f47b49b 100644
--- a/tests/libtracker-data/graph/graph-5.rq
+++ b/tests/libtracker-data/graph/graph-5.rq
@@ -1,6 +1,6 @@
 SELECT ?g ?p ?v WHERE {
        GRAPH ?g {
                example:resource ?p ?v .
-               FILTER (?p != tracker:added && ?p != tracker:modified)
+               FILTER (?p != nrl:added && ?p != nrl:modified)
        }
 } ORDER BY ?g ?p ?v
diff --git a/tests/libtracker-data/graph/test.ontology b/tests/libtracker-data/graph/test.ontology
index 1b5f5af19..df1658a1a 100644
--- a/tests/libtracker-data/graph/test.ontology
+++ b/tests/libtracker-data/graph/test.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/langstring/test.ontology b/tests/libtracker-data/langstring/test.ontology
index 69da693c4..244a33d76 100644
--- a/tests/libtracker-data/langstring/test.ontology
+++ b/tests/libtracker-data/langstring/test.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/lists/test.ontology b/tests/libtracker-data/lists/test.ontology
index e1e95c651..616cdca8a 100644
--- a/tests/libtracker-data/lists/test.ontology
+++ b/tests/libtracker-data/lists/test.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/mixed-cardinality/test.ontology 
b/tests/libtracker-data/mixed-cardinality/test.ontology
index 133fd4a2c..fe4713139 100644
--- a/tests/libtracker-data/mixed-cardinality/test.ontology
+++ b/tests/libtracker-data/mixed-cardinality/test.ontology
@@ -1,12 +1,11 @@
 @prefix example: <http://example.com/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/optional/test-1.ontology b/tests/libtracker-data/optional/test-1.ontology
index 71c6a5dd6..770af9ee2 100644
--- a/tests/libtracker-data/optional/test-1.ontology
+++ b/tests/libtracker-data/optional/test-1.ontology
@@ -1,11 +1,11 @@
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-foaf: a tracker:Namespace ;
-       tracker:prefix "foaf" .
+foaf: a nrl:Namespace ;
+       nrl:prefix "foaf" .
 
 foaf:Person a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/optional/test-2.ontology b/tests/libtracker-data/optional/test-2.ontology
index d2ca9d942..4fbc3e55a 100644
--- a/tests/libtracker-data/optional/test-2.ontology
+++ b/tests/libtracker-data/optional/test-2.ontology
@@ -2,11 +2,10 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/property-paths/test.ontology 
b/tests/libtracker-data/property-paths/test.ontology
index 3d3ebdb08..0bf2b345f 100644
--- a/tests/libtracker-data/property-paths/test.ontology
+++ b/tests/libtracker-data/property-paths/test.ontology
@@ -1,12 +1,12 @@
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix ex: <http://example.com/#> .
 
-foaf: a tracker:Namespace ;
-       tracker:prefix "foaf" .
+foaf: a nrl:Namespace ;
+       nrl:prefix "foaf" .
 
 foaf:Agent a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
@@ -33,8 +33,8 @@ foaf:member a rdf:Property ;
        rdfs:domain foaf:Person ;
        rdfs:range foaf:Group .
 
-ex: a tracker:Namespace ;
-    tracker:prefix "ex" .
+ex: a nrl:Namespace ;
+    nrl:prefix "ex" .
 
 ex:DataObject a rdfs:Class ;
     rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/regex/test.ontology b/tests/libtracker-data/regex/test.ontology
index 63df24c97..191fc804e 100644
--- a/tests/libtracker-data/regex/test.ontology
+++ b/tests/libtracker-data/regex/test.ontology
@@ -1,11 +1,11 @@
 @prefix example: <http://example.com/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/service/service-after-triples-1.rq 
b/tests/libtracker-data/service/service-after-triples-1.rq
index 649680e0a..c458ef306 100644
--- a/tests/libtracker-data/service/service-after-triples-1.rq
+++ b/tests/libtracker-data/service/service-after-triples-1.rq
@@ -1,6 +1,6 @@
 SELECT ?u {
   ?u a rdfs:Resource .
   SERVICE <dbus:%s> {
-    ?u tracker:indexed true
+    ?u nrl:indexed true
   }
 }
diff --git a/tests/libtracker-data/service/service-before-triples-1.rq 
b/tests/libtracker-data/service/service-before-triples-1.rq
index d8a64d179..f41171537 100644
--- a/tests/libtracker-data/service/service-before-triples-1.rq
+++ b/tests/libtracker-data/service/service-before-triples-1.rq
@@ -2,5 +2,5 @@ SELECT ?u {
   SERVICE <dbus:%s> {
     ?u a rdfs:Resource
   }
-  ?u tracker:indexed true
+  ?u nrl:indexed true
 }
diff --git a/tests/libtracker-data/service/service-local-filter-1.rq 
b/tests/libtracker-data/service/service-local-filter-1.rq
index d4a13ae23..d8db5c57e 100644
--- a/tests/libtracker-data/service/service-local-filter-1.rq
+++ b/tests/libtracker-data/service/service-local-filter-1.rq
@@ -1,6 +1,6 @@
 SELECT ?u {
   SERVICE <dbus:%s> {
-    ?u tracker:indexed true;
+    ?u nrl:indexed true;
        rdfs:label ?l
   }
   FILTER (STRSTARTS(?l, "Alb"))
diff --git a/tests/libtracker-data/service/service-query-1.rq 
b/tests/libtracker-data/service/service-query-1.rq
index b2af4511b..310a72d25 100644
--- a/tests/libtracker-data/service/service-query-1.rq
+++ b/tests/libtracker-data/service/service-query-1.rq
@@ -1,5 +1,5 @@
 SELECT ?u {
   SERVICE <dbus:%s> {
-    ?u tracker:indexed true
+    ?u nrl:indexed true
   }
 }
diff --git a/tests/libtracker-data/service/service-union-with-local-1.rq 
b/tests/libtracker-data/service/service-union-with-local-1.rq
index 11616cd24..83a4eb5d7 100644
--- a/tests/libtracker-data/service/service-union-with-local-1.rq
+++ b/tests/libtracker-data/service/service-union-with-local-1.rq
@@ -1,9 +1,9 @@
 SELECT ?u {
   {
-    ?u tracker:indexed true;
+    ?u nrl:indexed true;
   } UNION {
     SERVICE <dbus:%s> {
-      ?u tracker:indexed true;
+      ?u nrl:indexed true;
     }
   }
 }
diff --git a/tests/libtracker-data/sort/test.ontology b/tests/libtracker-data/sort/test.ontology
index 2e61db26d..1617b4bd9 100644
--- a/tests/libtracker-data/sort/test.ontology
+++ b/tests/libtracker-data/sort/test.ontology
@@ -2,19 +2,18 @@
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix example: <http://example.org/things#> .
 
-foaf: a tracker:Namespace ;
-       tracker:prefix "foaf" .
+foaf: a nrl:Namespace ;
+       nrl:prefix "foaf" .
 
-owl: a tracker:Namespace ;
-       tracker:prefix "owl" .
+owl: a nrl:Namespace ;
+       nrl:prefix "owl" .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 owl:Thing a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-5.out 
b/tests/libtracker-data/subqueries/subqueries-minus-5.out
index e0909de15..4eca2a7c0 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-5.out
+++ b/tests/libtracker-data/subqueries/subqueries-minus-5.out
@@ -24,22 +24,21 @@
 "http://purl.org/dc/elements/1.1/type";
 "http://tracker.api.gnome.org/ontology/v3/nrl#";
 "http://tracker.api.gnome.org/ontology/v3/nrl#InverseFunctionalProperty";
+"http://tracker.api.gnome.org/ontology/v3/nrl#Namespace";
+"http://tracker.api.gnome.org/ontology/v3/nrl#Ontology";
+"http://tracker.api.gnome.org/ontology/v3/nrl#classSpecification";
+"http://tracker.api.gnome.org/ontology/v3/nrl#deprecated";
+"http://tracker.api.gnome.org/ontology/v3/nrl#domainIndex";
+"http://tracker.api.gnome.org/ontology/v3/nrl#fulltextIndexed";
+"http://tracker.api.gnome.org/ontology/v3/nrl#indexed";
+"http://tracker.api.gnome.org/ontology/v3/nrl#lastModified";
 "http://tracker.api.gnome.org/ontology/v3/nrl#maxCardinality";
+"http://tracker.api.gnome.org/ontology/v3/nrl#notify";
+"http://tracker.api.gnome.org/ontology/v3/nrl#prefix";
+"http://tracker.api.gnome.org/ontology/v3/nrl#propertySpecification";
+"http://tracker.api.gnome.org/ontology/v3/nrl#secondaryIndex";
+"http://tracker.api.gnome.org/ontology/v3/nrl#weight";
 "http://tracker.api.gnome.org/ontology/v3/tracker#";
-"http://tracker.api.gnome.org/ontology/v3/tracker#Namespace";
-"http://tracker.api.gnome.org/ontology/v3/tracker#Ontology";
-"http://tracker.api.gnome.org/ontology/v3/tracker#classSpecification";
-"http://tracker.api.gnome.org/ontology/v3/tracker#deprecated";
-"http://tracker.api.gnome.org/ontology/v3/tracker#domainIndex";
-"http://tracker.api.gnome.org/ontology/v3/tracker#fulltextIndexed";
-"http://tracker.api.gnome.org/ontology/v3/tracker#indexed";
-"http://tracker.api.gnome.org/ontology/v3/tracker#lastModified";
-"http://tracker.api.gnome.org/ontology/v3/tracker#notify";
-"http://tracker.api.gnome.org/ontology/v3/tracker#prefix";
-"http://tracker.api.gnome.org/ontology/v3/tracker#propertySpecification";
-"http://tracker.api.gnome.org/ontology/v3/tracker#secondaryIndex";
-"http://tracker.api.gnome.org/ontology/v3/tracker#weight";
-"http://tracker.api.gnome.org/ontology/v3/tracker#writeback";
 "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
 "http://www.w3.org/1999/02/22-rdf-syntax-ns#List";
 "http://www.w3.org/1999/02/22-rdf-syntax-ns#Property";
diff --git a/tests/libtracker-data/subqueries/test.ontology b/tests/libtracker-data/subqueries/test.ontology
index b5faa8e7c..c9f95d740 100644
--- a/tests/libtracker-data/subqueries/test.ontology
+++ b/tests/libtracker-data/subqueries/test.ontology
@@ -2,11 +2,10 @@
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:Message a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-data/tracker-service-test.c b/tests/libtracker-data/tracker-service-test.c
index 978e1bc90..f310adfb3 100644
--- a/tests/libtracker-data/tracker-service-test.c
+++ b/tests/libtracker-data/tracker-service-test.c
@@ -91,8 +91,8 @@ check_result (TrackerSparqlCursor *cursor,
                                 * test reproduceability in DESCRIBE and other unrestricted
                                 * queries.
                                 */
-                               if (g_strcmp0 (str, TRACKER_PREFIX_TRACKER "modified") == 0 ||
-                                   g_strcmp0 (str, TRACKER_PREFIX_TRACKER "added") == 0) {
+                               if (g_strcmp0 (str, TRACKER_PREFIX_NRL "modified") == 0 ||
+                                   g_strcmp0 (str, TRACKER_PREFIX_NRL "added") == 0) {
                                        g_string_free (row_str, TRUE);
                                        row_str = NULL;
                                        break;
diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/libtracker-data/tracker-sparql-test.c
index 9453ac982..53d4cf2b1 100644
--- a/tests/libtracker-data/tracker-sparql-test.c
+++ b/tests/libtracker-data/tracker-sparql-test.c
@@ -308,8 +308,8 @@ check_result (TrackerDBCursor *cursor,
                                 * test reproduceability in DESCRIBE and other unrestricted
                                 * queries.
                                 */
-                               if (g_strcmp0 (str, TRACKER_PREFIX_TRACKER "modified") == 0 ||
-                                   g_strcmp0 (str, TRACKER_PREFIX_TRACKER "added") == 0) {
+                               if (g_strcmp0 (str, TRACKER_PREFIX_NRL "modified") == 0 ||
+                                   g_strcmp0 (str, TRACKER_PREFIX_NRL "added") == 0) {
                                        g_string_free (row_str, TRUE);
                                        row_str = NULL;
                                        break;
diff --git a/tests/libtracker-data/turtle/test.ontology b/tests/libtracker-data/turtle/test.ontology
index 321064845..648342cf4 100644
--- a/tests/libtracker-data/turtle/test.ontology
+++ b/tests/libtracker-data/turtle/test.ontology
@@ -1,3 +1,4 @@
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@@ -6,30 +7,29 @@
 @prefix f: <http://example.org/ns3#> .
 @prefix b: <http://example.org/b2#> .
 @prefix bz: <http://example.org/b2> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix bar: <bar#> .
 
-foo: a tracker:Namespace ;
-       tracker:prefix "foo" .
+foo: a nrl:Namespace ;
+       nrl:prefix "foo" .
 
-: a tracker:Namespace ;
-       tracker:prefix "" .
+: a nrl:Namespace ;
+       nrl:prefix "" .
 
 foo: a rdf:Property ;
        rdfs:domain rdfs:Resource ;
        rdfs:range rdfs:Resource .
 
-b: a tracker:Namespace ;
-       tracker:prefix "b" .
+b: a nrl:Namespace ;
+       nrl:prefix "b" .
 
-bar: a tracker:Namespace ;
-       tracker:prefix "bar" .
+bar: a nrl:Namespace ;
+       nrl:prefix "bar" .
 
-bz: a tracker:Namespace ;
-       tracker:prefix "bz" .
+bz: a nrl:Namespace ;
+       nrl:prefix "bz" .
 
-f: a tracker:Namespace ;
-       tracker:prefix "a" .
+f: a nrl:Namespace ;
+       nrl:prefix "a" .
 
 <http://other.example.org/ns#>  a rdf:Property ;
        rdfs:domain rdfs:Resource ;
diff --git a/tests/libtracker-data/update/test.ontology b/tests/libtracker-data/update/test.ontology
index 1de08e1df..cadbf7bb4 100644
--- a/tests/libtracker-data/update/test.ontology
+++ b/tests/libtracker-data/update/test.ontology
@@ -1,12 +1,12 @@
 @prefix example: <http://example/> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
-example: a tracker:Namespace ;
-       tracker:prefix "example" .
+example: a nrl:Namespace ;
+       nrl:prefix "example" .
 
 example:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
diff --git a/tests/libtracker-fts/data.ontology b/tests/libtracker-fts/data.ontology
index 7799a9ab8..8ce8b6627 100644
--- a/tests/libtracker-fts/data.ontology
+++ b/tests/libtracker-fts/data.ontology
@@ -3,17 +3,16 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix test: <http://www.example.org/test#> .
-@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-test: a tracker:Ontology ;
-       tracker:lastModified "2018-09-30T13:00:00Z" .
+test: a nrl:Ontology ;
+       nrl:lastModified "2018-09-30T13:00:00Z" .
 
-fts: a tracker:Namespace ;
-       tracker:prefix "fts" .
+fts: a nrl:Namespace ;
+       nrl:prefix "fts" .
 
-test: a tracker:Namespace ;
-       tracker:prefix "test" .
+test: a nrl:Namespace ;
+       nrl:prefix "test" .
 
 test:A a rdfs:Class ;
        rdfs:subClassOf rdfs:Resource .
@@ -22,10 +21,10 @@ test:p a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain test:A ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true .
+       nrl:fulltextIndexed true .
 
 test:o a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain test:A ;
        rdfs:range xsd:string ;
-       tracker:fulltextIndexed true .
+       nrl:fulltextIndexed true .
diff --git a/tests/libtracker-sparql/statement/limit.rq b/tests/libtracker-sparql/statement/limit.rq
index cb1817a6a..3e83869a5 100644
--- a/tests/libtracker-sparql/statement/limit.rq
+++ b/tests/libtracker-sparql/statement/limit.rq
@@ -1,5 +1,5 @@
 SELECT ?s {
-  ?s tracker:indexed true
+  ?s nrl:indexed true
 }
 ORDER BY ?s
 LIMIT ~arg1
diff --git a/tests/libtracker-sparql/statement/offset.rq b/tests/libtracker-sparql/statement/offset.rq
index 8ff558500..c52b3eb74 100644
--- a/tests/libtracker-sparql/statement/offset.rq
+++ b/tests/libtracker-sparql/statement/offset.rq
@@ -1,5 +1,5 @@
 SELECT ?s {
-  ?s tracker:indexed true
+  ?s nrl:indexed true
 }
 ORDER BY ?s
 LIMIT 1
diff --git a/tests/libtracker-sparql/tracker-sparql-test.c b/tests/libtracker-sparql/tracker-sparql-test.c
index 12a3eaf16..0079cd18a 100644
--- a/tests/libtracker-sparql/tracker-sparql-test.c
+++ b/tests/libtracker-sparql/tracker-sparql-test.c
@@ -49,11 +49,11 @@ static GCancellable *cancellables[N_QUERIES] = { NULL, };
  */
 static const gchar *queries[N_QUERIES] = {
        /* #1 */
-       "SELECT ?p WHERE { ?p tracker:indexed true }",
+       "SELECT ?p WHERE { ?p nrl:indexed true }",
        /* #2 */
-       "SELECT ?prefix ?ns WHERE { ?ns a tracker:Namespace ; tracker:prefix ?prefix }",
+       "SELECT ?prefix ?ns WHERE { ?ns a nrl:Namespace ; nrl:prefix ?prefix }",
        /* #3 */
-       "SELECT ?p WHERE { ?p tracker:fulltextIndexed true }",
+       "SELECT ?p WHERE { ?p nrl:fulltextIndexed true }",
 };
 
 TrackerSparqlConnection *
diff --git a/tests/libtracker-sparql/tracker-statement-test.c 
b/tests/libtracker-sparql/tracker-statement-test.c
index 4dff756f0..b6337ea86 100644
--- a/tests/libtracker-sparql/tracker-statement-test.c
+++ b/tests/libtracker-sparql/tracker-statement-test.c
@@ -93,8 +93,8 @@ check_result (TrackerSparqlCursor *cursor,
                         * test reproduceability in DESCRIBE and other unrestricted
                         * queries.
                         */
-                       if (g_strcmp0 (str, TRACKER_PREFIX_TRACKER "modified") == 0 ||
-                           g_strcmp0 (str, TRACKER_PREFIX_TRACKER "added") == 0) {
+                       if (g_strcmp0 (str, TRACKER_PREFIX_NRL "modified") == 0 ||
+                           g_strcmp0 (str, TRACKER_PREFIX_NRL "added") == 0) {
                                g_string_free (row_str, TRUE);
                                row_str = NULL;
                                break;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]