diff --git a/fcrepo-message-consumer-core/src/main/java/org/fcrepo/indexer/IndexerGroup.java b/fcrepo-message-consumer-core/src/main/java/org/fcrepo/indexer/IndexerGroup.java
index 785b8bc..ce48798 100644
--- a/fcrepo-message-consumer-core/src/main/java/org/fcrepo/indexer/IndexerGroup.java
+++ b/fcrepo-message-consumer-core/src/main/java/org/fcrepo/indexer/IndexerGroup.java
@@ -62,7 +62,6 @@
 import static org.fcrepo.kernel.RdfLexicon.CONTAINS;
 import static org.fcrepo.kernel.RdfLexicon.HAS_PARENT;
 import static org.fcrepo.kernel.RdfLexicon.REPOSITORY_NAMESPACE;
-import static org.fcrepo.kernel.RdfLexicon.RESTAPI_NAMESPACE;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
@@ -139,7 +138,7 @@ public class IndexerGroup implements MessageListener {
     /**
      * Indicates that a resource is a datastream.
     **/
-    static final Resource DATASTREAM_TYPE = createResource(RESTAPI_NAMESPACE + "datastream");
+    static final Resource DATASTREAM_TYPE = createResource(REPOSITORY_NAMESPACE + "NonRdfSourceDescription");
 
     private static final Reader EMPTY_CONTENT = null;
 
diff --git a/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/IndexerGroupTest.java b/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/IndexerGroupTest.java
index 27f1d17..3233822 100644
--- a/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/IndexerGroupTest.java
+++ b/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/IndexerGroupTest.java
@@ -201,8 +201,8 @@ private void mockContent(final String identifier,
 
     private String getIndexableTriples(final String id, final boolean indexable, final String indexerName) {
         return "\n" +
-                "<" + repoUrl + id + "> a <http://fedora.info/definitions/v4/rest-api#resource> , " +
-                "<http://fedora.info/definitions/v4/rest-api#object> ;\n" +
+                "<" + repoUrl + id + "> a <http://fedora.info/definitions/v4/repository#Resource> , " +
+                "<http://fedora.info/definitions/v4/repository#Container> ;\n" +
                 "\t<http://fedora.info/definitions/v4/repository#primaryType> \"nt:folder\"^^<http://www.w3" +
                 ".org/2001/XMLSchema#string> ;\n" +
                 (indexerName != null ? "\t<http://fedora.info/definitions/v4/indexing#hasIndexingTransformation> \""
@@ -210,7 +210,7 @@ private String getIndexableTriples(final String id, final boolean indexable, fin
                 "\t<http://fedora.info/definitions/v4/repository#uuid> " +
                 "\"b1bfd6b8-b821-48c5-8eb9-05ef47e1b6e6\"^^<http://www.w3.org/2001/XMLSchema#string> ;\n" +
                 "\ta " + (indexable ? "<http://fedora.info/definitions/v4/indexing#indexable> , " +
-                "" : "") + "<http://fedora.info/definitions/v4/rest-api#resource> , " +
-                "<http://fedora.info/definitions/v4/rest-api#object> .\n";
+                "" : "") + "<http://fedora.info/definitions/v4/repository#Resource> , " +
+                "<http://fedora.info/definitions/v4/repository#Container> .\n";
     }
 }
diff --git a/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/integration/sparql/SparqlIndexerIT.java b/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/integration/sparql/SparqlIndexerIT.java
index 49b3dd1..b07cebc 100644
--- a/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/integration/sparql/SparqlIndexerIT.java
+++ b/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/integration/sparql/SparqlIndexerIT.java
@@ -53,12 +53,11 @@ public class SparqlIndexerIT {
     private SparqlIndexer sparqlIndexer;
 
     private static final String fooRDF =
-        "@prefix fcrepo: <http://fedora.info/definitions/v4/repository#> .\n" +
-        "@prefix fedora: <http://fedora.info/definitions/v4/repository/rest-api#> .\n" +
+        "@prefix fedora: <http://fedora.info/definitions/v4/repository#> .\n" +
         "<" + uri + ">\n" +
-        " fcrepo:hasChild <" + uri + "/barDS> ;\n" +
-        " fcrepo:hasParent <" + uri + "> ;\n" +
-        " fcrepo:uuid \"feb99ff2-455e-4e16-93a0-c0ae8d21b9ae\" .";
+        " fedora:hasChild <" + uri + "/barDS> ;\n" +
+        " fedora:hasParent <" + uri + "> ;\n" +
+        " fedora:uuid \"feb99ff2-455e-4e16-93a0-c0ae8d21b9ae\" .";
 
     @Test
     public void indexerTest() throws Exception {
@@ -73,10 +72,10 @@ public void indexerTest() throws Exception {
 
         // SPARQL search should work
         final String sparqlQuery =
-                "PREFIX  fcrepo: <http://fedora.info/definitions/v4/repository#> \n" +
+                "PREFIX  fedora: <http://fedora.info/definitions/v4/repository#> \n" +
                         "SELECT  ?p \n" +
                         "WHERE \n" +
-                        "{ ?p fcrepo:hasParent ?c }";
+                        "{ ?p fedora:hasParent ?c }";
         assertTrue("Triple should return from search!", countQueryTriples(sparqlQuery) > 0 );
 
         // remove object