http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseOfVisitor.java
----------------------------------------------------------------------
diff --git 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseOfVisitor.java
 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseOfVisitor.java
index e3a74d5..534d9e5 100644
--- 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseOfVisitor.java
+++ 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseOfVisitor.java
@@ -63,13 +63,13 @@ public class InverseOfVisitor extends AbstractInferVisitor {
              "      { ?b ?pred ?a }
              */
 
-            IRI predUri = (IRI) predVar.getValue();
-            IRI invPropUri = inferenceEngine.findInverseOf(predUri);
-            if (invPropUri != null) {
+            IRI predIri = (IRI) predVar.getValue();
+            IRI invPropIri = inferenceEngine.findInverseOf(predIri);
+            if (invPropIri != null) {
                 Var subjVar = sp.getSubjectVar();
                 Union union = new InferUnion();
                 union.setLeftArg(sp);
-                union.setRightArg(new StatementPattern(objVar, new 
Var(predVar.getName(), invPropUri), subjVar, cntxtVar));
+                union.setRightArg(new StatementPattern(objVar, new 
Var(predVar.getName(), invPropIri), subjVar, cntxtVar));
                 node.replaceWith(union);
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseURI.java
----------------------------------------------------------------------
diff --git 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseURI.java 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseURI.java
deleted file mode 100644
index b038604..0000000
--- a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/InverseURI.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.rya.rdftriplestore.inference;
-
-import org.eclipse.rdf4j.model.IRI;
-
-public class InverseURI implements IRI {
-    private static final long serialVersionUID = 1L;
-
-    private final IRI impl;
-
-    public InverseURI(final IRI iri) {
-        this.impl = iri;
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((impl == null) ? 0 : impl.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        if (obj instanceof InverseURI){
-            return impl.equals(((InverseURI) obj).impl);
-        }
-        return false;
-    }
-
-    @Override
-    public String stringValue() {
-        return impl.stringValue();
-    }
-
-    @Override
-    public String getNamespace() {
-        return impl.getNamespace();
-    }
-
-    @Override
-    public String getLocalName() {
-        return impl.getLocalName();
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/inference/PropertyChainVisitor.java
----------------------------------------------------------------------
diff --git 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/PropertyChainVisitor.java
 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/PropertyChainVisitor.java
index 2df3461..3a5a76c 100644
--- 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/PropertyChainVisitor.java
+++ 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/PropertyChainVisitor.java
@@ -62,8 +62,8 @@ public class PropertyChainVisitor extends 
AbstractInferVisitor {
                 !RDFS.NAMESPACE.equals(predNamespace)
                 && !EXPANDED.equals(cntxtVar)) {
 
-            final IRI chainPropURI = (IRI) predVar.getValue();
-            final List<IRI> chain = 
inferenceEngine.getPropertyChain(chainPropURI);
+            final IRI chainPropIRI = (IRI) predVar.getValue();
+            final List<IRI> chain = 
inferenceEngine.getPropertyChain(chainPropIRI);
             final List<StatementPattern> expandedPatterns = new 
ArrayList<StatementPattern>();
             if (chain.size() > 0) {
                 final Var originalSubj = sp.getSubjectVar();
@@ -75,7 +75,7 @@ public class PropertyChainVisitor extends 
AbstractInferVisitor {
                     final String s = UUID.randomUUID().toString();
                     final Var currentObj = new Var("c-" + s);
                     StatementPattern statementPattern = new 
StatementPattern(nextSubj, new Var(chainElement.stringValue()), currentObj, 
sp.getContextVar());
-                    if (chainElement instanceof InverseURI){
+                    if (chainElement instanceof InverseIRI){
                         statementPattern = new StatementPattern(currentObj, 
new Var(chainElement.stringValue()), nextSubj, sp.getContextVar());
                     }
                     expandedPatterns.add(statementPattern);

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubClassOfVisitor.java
----------------------------------------------------------------------
diff --git 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubClassOfVisitor.java
 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubClassOfVisitor.java
index 0d11918..31b7792 100644
--- 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubClassOfVisitor.java
+++ 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubClassOfVisitor.java
@@ -61,15 +61,15 @@ public class SubClassOfVisitor extends AbstractInferVisitor 
{
 //            join.getProperties().put(InferConstants.INFERRED, 
InferConstants.TRUE);
 //            node.replaceWith(join);
 
-            final IRI subclassof_uri = (IRI) objVar.getValue();
-            final Collection<IRI> parents = 
InferenceEngine.findParents(inferenceEngine.getSubClassOfGraph(), 
subclassof_uri);
+            final IRI subclassof_iri = (IRI) objVar.getValue();
+            final Collection<IRI> parents = 
InferenceEngine.findParents(inferenceEngine.getSubClassOfGraph(), 
subclassof_iri);
             if (parents != null && parents.size() > 0) {
                 final String s = UUID.randomUUID().toString();
                 final Var typeVar = new Var(s);
                 final FixedStatementPattern fsp = new 
FixedStatementPattern(typeVar, new Var("c-" + s, RDFS.SUBCLASSOF), objVar, 
conVar);
-                parents.add(subclassof_uri);
-                for (final IRI u : parents) {
-                    fsp.statements.add(new NullableStatementImpl(u, 
RDFS.SUBCLASSOF, subclassof_uri));
+                parents.add(subclassof_iri);
+                for (final IRI iri : parents) {
+                    fsp.statements.add(new NullableStatementImpl(iri, 
RDFS.SUBCLASSOF, subclassof_iri));
                 }
 
                 final StatementPattern rdfType = new 
DoNotExpandSP(sp.getSubjectVar(), sp.getPredicateVar(), typeVar, conVar);
@@ -82,8 +82,8 @@ public class SubClassOfVisitor extends AbstractInferVisitor {
 //                StatementPatterns statementPatterns = new 
StatementPatterns();
 //                statementPatterns.patterns.add(node);
 //                Var subjVar = node.getSubjectVar();
-//                for (URI u : parents) {
-//                    statementPatterns.patterns.add(new 
StatementPattern(subjVar, predVar, new Var(objVar.getName(), u)));
+//                for (IRI iri : parents) {
+//                    statementPatterns.patterns.add(new 
StatementPattern(subjVar, predVar, new Var(objVar.getName(), iri)));
 //                }
 //                node.replaceWith(statementPatterns);
 //            }
@@ -92,8 +92,8 @@ public class SubClassOfVisitor extends AbstractInferVisitor {
 //                VarCollection vc = new VarCollection();
 //                vc.setName(objVar.getName());
 //                vc.values.add(objVar);
-//                for (URI u : parents) {
-//                    vc.values.add(new Var(objVar.getName(), u));
+//                for (IRI iri : parents) {
+//                    vc.values.add(new Var(objVar.getName(), iri));
 //                }
 //                Var subjVar = node.getSubjectVar();
 //                node.replaceWith(new StatementPattern(subjVar, predVar, vc, 
node.getContextVar()));

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubPropertyOfVisitor.java
----------------------------------------------------------------------
diff --git 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubPropertyOfVisitor.java
 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubPropertyOfVisitor.java
index 102c0b2..e49e605 100644
--- 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubPropertyOfVisitor.java
+++ 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SubPropertyOfVisitor.java
@@ -78,8 +78,8 @@ public class SubPropertyOfVisitor extends 
AbstractInferVisitor {
 //                StatementPatterns statementPatterns = new 
StatementPatterns();
 //                statementPatterns.patterns.add(node);
 //                Var subjVar = node.getSubjectVar();
-//                for (URI u : parents) {
-//                    statementPatterns.patterns.add(new 
StatementPattern(subjVar, new Var(predVar.getName(), u), objVar));
+//                for (IRI iri : parents) {
+//                    statementPatterns.patterns.add(new 
StatementPattern(subjVar, new Var(predVar.getName(), iri), objVar));
 //                }
 //                node.replaceWith(statementPatterns);
 //            }
@@ -87,24 +87,24 @@ public class SubPropertyOfVisitor extends 
AbstractInferVisitor {
 //                VarCollection vc = new VarCollection();
 //                vc.setName(predVar.getName());
 //                vc.values.add(predVar);
-//                for (URI u : parents) {
-//                    vc.values.add(new Var(predVar.getName(), u));
+//                for (IRI iri : parents) {
+//                    vc.values.add(new Var(predVar.getName(), iri));
 //                }
 //                Var subjVar = node.getSubjectVar();
 //                node.replaceWith(new StatementPattern(subjVar, vc, objVar, 
node.getContextVar()));
 //            }
 
-            final IRI subprop_uri = (IRI) predVar.getValue();
-            final Set<IRI> parents = 
InferenceEngine.findParents(inferenceEngine.getSubPropertyOfGraph(), 
subprop_uri);
+            final IRI subprop_iri = (IRI) predVar.getValue();
+            final Set<IRI> parents = 
InferenceEngine.findParents(inferenceEngine.getSubPropertyOfGraph(), 
subprop_iri);
             if (parents != null && parents.size() > 0) {
                 final String s = UUID.randomUUID().toString();
                 final Var typeVar = new Var(s);
                 final FixedStatementPattern fsp = new 
FixedStatementPattern(typeVar, new Var("c-" + s, RDFS.SUBPROPERTYOF), predVar, 
cntxtVar);
 //                fsp.statements.add(new NullableStatementImpl(subprop_uri, 
RDFS.SUBPROPERTYOF, subprop_uri));
                 //add self
-                parents.add(subprop_uri);
+                parents.add(subprop_iri);
                 for (final IRI u : parents) {
-                    fsp.statements.add(new NullableStatementImpl(u, 
RDFS.SUBPROPERTYOF, subprop_uri));
+                    fsp.statements.add(new NullableStatementImpl(u, 
RDFS.SUBPROPERTYOF, subprop_iri));
                 }
 
                 final StatementPattern rdfType = new 
DoNotExpandSP(sp.getSubjectVar(), typeVar, sp.getObjectVar(), cntxtVar);

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SymmetricPropertyVisitor.java
----------------------------------------------------------------------
diff --git 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SymmetricPropertyVisitor.java
 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SymmetricPropertyVisitor.java
index c8e1a7d..72a3dae 100644
--- 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SymmetricPropertyVisitor.java
+++ 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/SymmetricPropertyVisitor.java
@@ -63,8 +63,8 @@ public class SymmetricPropertyVisitor extends 
AbstractInferVisitor {
              "      { ?b ?pred ?a }
              */
 
-            IRI symmPropUri = (IRI) predVar.getValue();
-            if(inferenceEngine.isSymmetricProperty(symmPropUri)) {
+            IRI symmPropIri = (IRI) predVar.getValue();
+            if(inferenceEngine.isSymmetricProperty(symmPropIri)) {
                 Var subjVar = sp.getSubjectVar();
                 Union union = new InferUnion();
                 union.setLeftArg(sp);

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java
----------------------------------------------------------------------
diff --git 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java
 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java
index 666bbd8..bae1bd1 100644
--- 
a/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java
+++ 
b/sail/src/main/java/org/apache/rya/rdftriplestore/inference/TransitivePropertyVisitor.java
@@ -56,8 +56,8 @@ public class TransitivePropertyVisitor extends 
AbstractInferVisitor {
                 !RDFS.NAMESPACE.equals(predNamespace)
                 && !EXPANDED.equals(cntxtVar)) {
 
-            final IRI transPropUri = (IRI) predVar.getValue();
-            if (inferenceEngine.isTransitiveProperty(transPropUri)) {
+            final IRI transPropIri = (IRI) predVar.getValue();
+            if (inferenceEngine.isTransitiveProperty(transPropIri)) {
                 node.replaceWith(new TransitivePropertySP(sp.getSubjectVar(), 
sp.getPredicateVar(), sp.getObjectVar(), sp.getContextVar()));
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/test/java/org/apache/rya/HashJoinTest.java
----------------------------------------------------------------------
diff --git a/sail/src/test/java/org/apache/rya/HashJoinTest.java 
b/sail/src/test/java/org/apache/rya/HashJoinTest.java
index e0463c9..8fc2590 100644
--- a/sail/src/test/java/org/apache/rya/HashJoinTest.java
+++ b/sail/src/test/java/org/apache/rya/HashJoinTest.java
@@ -33,7 +33,7 @@ import org.apache.rya.accumulo.AccumuloRyaDAO;
 import org.apache.rya.api.RdfCloudTripleStoreUtils;
 import org.apache.rya.api.domain.RyaStatement;
 import org.apache.rya.api.domain.RyaType;
-import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaIRI;
 import org.apache.rya.api.persist.RyaDAOException;
 import org.apache.rya.api.persist.query.join.HashJoin;
 import org.eclipse.rdf4j.common.iteration.CloseableIteration;
@@ -68,13 +68,13 @@ public class HashJoinTest {
     @Test
     public void testSimpleJoin() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, two));
@@ -88,11 +88,11 @@ public class HashJoinTest {
 
         //1 join
         HashJoin hjoin = new HashJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = hjoin.join(null,
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, one),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, two));
+        CloseableIteration<RyaIRI, RyaDAOException> join = hjoin.join(null,
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, one),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, two));
 
-        Set<RyaURI> uris = new HashSet<RyaURI>();
+        Set<RyaIRI> uris = new HashSet<RyaIRI>();
         while (join.hasNext()) {
             uris.add(join.next());
         }
@@ -106,15 +106,15 @@ public class HashJoinTest {
     @Test
     public void testSimpleJoinMultiWay() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, two));
@@ -136,14 +136,14 @@ public class HashJoinTest {
 
         //1 join
         HashJoin hjoin = new HashJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = hjoin.join(null,
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, one),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, two),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, three),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = hjoin.join(null,
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, one),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, two),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, three),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, four)
         );
 
-        Set<RyaURI> uris = new HashSet<RyaURI>();
+        Set<RyaIRI> uris = new HashSet<RyaIRI>();
         while (join.hasNext()) {
             uris.add(join.next());
         }
@@ -157,16 +157,16 @@ public class HashJoinTest {
     @Test
     public void testMergeJoinMultiWay() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType zero = new RyaType("0");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, two));
@@ -188,14 +188,14 @@ public class HashJoinTest {
 
         //1 join
         HashJoin hjoin = new HashJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = hjoin.join(null,
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, one),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, two),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, three),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = hjoin.join(null,
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, one),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, two),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, three),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, four)
         );
 
-        Set<RyaURI> uris = new HashSet<RyaURI>();
+        Set<RyaIRI> uris = new HashSet<RyaIRI>();
         while (join.hasNext()) {
             uris.add(join.next());
         }
@@ -208,16 +208,16 @@ public class HashJoinTest {
     @Test
     public void testMergeJoinMultiWayNone() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType zero = new RyaType("0");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, three));
@@ -234,11 +234,11 @@ public class HashJoinTest {
 
         //1 join
         HashJoin hjoin = new HashJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = hjoin.join(null,
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, one),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, two),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, three),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = hjoin.join(null,
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, one),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, two),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, three),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, four)
         );
 
         assertFalse(join.hasNext());
@@ -248,16 +248,16 @@ public class HashJoinTest {
     @Test
     public void testMergeJoinMultiWayNone2() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType zero = new RyaType("0");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, four));
@@ -272,11 +272,11 @@ public class HashJoinTest {
 
         //1 join
         HashJoin hjoin = new HashJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = hjoin.join(null,
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, one),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, two),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, three),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = hjoin.join(null,
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, one),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, two),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, three),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, four)
         );
 
         assertFalse(join.hasNext());
@@ -286,13 +286,13 @@ public class HashJoinTest {
     @Test
     public void testSimpleHashJoinPredicateOnly() throws Exception {
         //add data
-        RyaURI pred1 = new RyaURI(litdupsNS, "pred1");
-        RyaURI pred2 = new RyaURI(litdupsNS, "pred2");
+        RyaIRI pred1 = new RyaIRI(litdupsNS, "pred1");
+        RyaIRI pred2 = new RyaIRI(litdupsNS, "pred2");
         RyaType one = new RyaType("1");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred1, one));
         dao.add(new RyaStatement(subj1, pred2, one));
@@ -320,15 +320,15 @@ public class HashJoinTest {
     @Test
     public void testSimpleMergeJoinPredicateOnly2() throws Exception {
         //add data
-        RyaURI pred1 = new RyaURI(litdupsNS, "pred1");
-        RyaURI pred2 = new RyaURI(litdupsNS, "pred2");
+        RyaIRI pred1 = new RyaIRI(litdupsNS, "pred1");
+        RyaIRI pred2 = new RyaIRI(litdupsNS, "pred2");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred1, one));
         dao.add(new RyaStatement(subj1, pred1, two));

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/test/java/org/apache/rya/IterativeJoinTest.java
----------------------------------------------------------------------
diff --git a/sail/src/test/java/org/apache/rya/IterativeJoinTest.java 
b/sail/src/test/java/org/apache/rya/IterativeJoinTest.java
index 8e40e2d..6612f9e 100644
--- a/sail/src/test/java/org/apache/rya/IterativeJoinTest.java
+++ b/sail/src/test/java/org/apache/rya/IterativeJoinTest.java
@@ -33,7 +33,7 @@ import org.apache.rya.accumulo.AccumuloRyaDAO;
 import org.apache.rya.api.RdfCloudTripleStoreUtils;
 import org.apache.rya.api.domain.RyaStatement;
 import org.apache.rya.api.domain.RyaType;
-import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaIRI;
 import org.apache.rya.api.persist.RyaDAOException;
 import org.apache.rya.api.persist.query.join.IterativeJoin;
 import org.eclipse.rdf4j.common.iteration.CloseableIteration;
@@ -68,13 +68,13 @@ public class IterativeJoinTest {
     @Test
     public void testSimpleIterativeJoin() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, two));
@@ -87,10 +87,10 @@ public class IterativeJoinTest {
 
         //1 join
         IterativeJoin iterJoin = new IterativeJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = iterJoin.join(null, 
new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, RyaType>(pred, one),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, two));
+        CloseableIteration<RyaIRI, RyaDAOException> join = iterJoin.join(null, 
new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, RyaType>(pred, one),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, two));
 
-        Set<RyaURI> uris = new HashSet<RyaURI>();
+        Set<RyaIRI> uris = new HashSet<RyaIRI>();
         while (join.hasNext()) {
             uris.add(join.next());
         }
@@ -104,15 +104,15 @@ public class IterativeJoinTest {
     @Test
     public void testSimpleIterativeJoinMultiWay() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, two));
@@ -133,14 +133,14 @@ public class IterativeJoinTest {
 
         //1 join
         IterativeJoin iterativeJoin = new IterativeJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = 
iterativeJoin.join(null,
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, one),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, two),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, three),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = 
iterativeJoin.join(null,
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, one),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, two),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, three),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, four)
         );
 
-        Set<RyaURI> uris = new HashSet<RyaURI>();
+        Set<RyaIRI> uris = new HashSet<RyaIRI>();
         while (join.hasNext()) {
             uris.add(join.next());
         }
@@ -154,16 +154,16 @@ public class IterativeJoinTest {
     @Test
     public void testIterativeJoinMultiWay() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType zero = new RyaType("0");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, two));
@@ -184,14 +184,14 @@ public class IterativeJoinTest {
 
         //1 join
         IterativeJoin iterativeJoin = new IterativeJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = 
iterativeJoin.join(null,
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, one),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, two),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, three),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = 
iterativeJoin.join(null,
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, one),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, two),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, three),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, four)
         );
 
-        Set<RyaURI> uris = new HashSet<RyaURI>();
+        Set<RyaIRI> uris = new HashSet<RyaIRI>();
         while (join.hasNext()) {
             uris.add(join.next());
         }
@@ -204,16 +204,16 @@ public class IterativeJoinTest {
     @Test
     public void testIterativeJoinMultiWayNone() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType zero = new RyaType("0");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, three));
@@ -229,11 +229,11 @@ public class IterativeJoinTest {
 
         //1 join
         IterativeJoin iterativeJoin = new IterativeJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = 
iterativeJoin.join(null,
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, one),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, two),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, three),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = 
iterativeJoin.join(null,
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, one),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, two),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, three),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, four)
         );
 
         assertFalse(join.hasNext());
@@ -243,16 +243,16 @@ public class IterativeJoinTest {
     @Test
     public void testIterativeJoinMultiWayNone2() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType zero = new RyaType("0");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, four));
@@ -266,10 +266,10 @@ public class IterativeJoinTest {
 
         //1 join
         IterativeJoin iterativeJoin = new IterativeJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = 
iterativeJoin.join(null, new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, one),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, two),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, three),
-                new RdfCloudTripleStoreUtils.CustomEntry<RyaURI, 
RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = 
iterativeJoin.join(null, new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, one),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, two),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, three),
+                new RdfCloudTripleStoreUtils.CustomEntry<RyaIRI, 
RyaType>(pred, four)
         );
 
         assertFalse(join.hasNext());
@@ -279,13 +279,13 @@ public class IterativeJoinTest {
     @Test
     public void testSimpleIterativeJoinPredicateOnly() throws Exception {
         //add data
-        RyaURI pred1 = new RyaURI(litdupsNS, "pred1");
-        RyaURI pred2 = new RyaURI(litdupsNS, "pred2");
+        RyaIRI pred1 = new RyaIRI(litdupsNS, "pred1");
+        RyaIRI pred2 = new RyaIRI(litdupsNS, "pred2");
         RyaType one = new RyaType("1");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred1, one));
         dao.add(new RyaStatement(subj1, pred2, one));
@@ -313,15 +313,15 @@ public class IterativeJoinTest {
     @Test
     public void testSimpleIterativeJoinPredicateOnly2() throws Exception {
         //add data
-        RyaURI pred1 = new RyaURI(litdupsNS, "pred1");
-        RyaURI pred2 = new RyaURI(litdupsNS, "pred2");
+        RyaIRI pred1 = new RyaIRI(litdupsNS, "pred1");
+        RyaIRI pred2 = new RyaIRI(litdupsNS, "pred2");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred1, one));
         dao.add(new RyaStatement(subj1, pred1, two));

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/test/java/org/apache/rya/MergeJoinTest.java
----------------------------------------------------------------------
diff --git a/sail/src/test/java/org/apache/rya/MergeJoinTest.java 
b/sail/src/test/java/org/apache/rya/MergeJoinTest.java
index efc44c3..c06b777 100644
--- a/sail/src/test/java/org/apache/rya/MergeJoinTest.java
+++ b/sail/src/test/java/org/apache/rya/MergeJoinTest.java
@@ -33,7 +33,7 @@ import org.apache.rya.accumulo.AccumuloRyaDAO;
 import org.apache.rya.api.RdfCloudTripleStoreUtils.CustomEntry;
 import org.apache.rya.api.domain.RyaStatement;
 import org.apache.rya.api.domain.RyaType;
-import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaIRI;
 import org.apache.rya.api.persist.RyaDAOException;
 import org.apache.rya.api.persist.query.join.MergeJoin;
 import org.eclipse.rdf4j.common.iteration.CloseableIteration;
@@ -71,13 +71,13 @@ public class MergeJoinTest {
     @Test
     public void testSimpleMergeJoin() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, two));
@@ -91,10 +91,10 @@ public class MergeJoinTest {
 
         //1 join
         MergeJoin mergeJoin = new MergeJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = 
mergeJoin.join(null, new CustomEntry<RyaURI, RyaType>(pred, one),
-                new CustomEntry<RyaURI, RyaType>(pred, two));
+        CloseableIteration<RyaIRI, RyaDAOException> join = 
mergeJoin.join(null, new CustomEntry<RyaIRI, RyaType>(pred, one),
+                new CustomEntry<RyaIRI, RyaType>(pred, two));
 
-        Set<RyaURI> uris = new HashSet<RyaURI>();
+        Set<RyaIRI> uris = new HashSet<RyaIRI>();
         while (join.hasNext()) {
             uris.add(join.next());
         }
@@ -108,13 +108,13 @@ public class MergeJoinTest {
     @Test
     public void testSimpleMergeJoinPredicateOnly() throws Exception {
         //add data
-        RyaURI pred1 = new RyaURI(litdupsNS, "pred1");
-        RyaURI pred2 = new RyaURI(litdupsNS, "pred2");
+        RyaIRI pred1 = new RyaIRI(litdupsNS, "pred1");
+        RyaIRI pred2 = new RyaIRI(litdupsNS, "pred2");
         RyaType one = new RyaType("1");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred1, one));
         dao.add(new RyaStatement(subj1, pred2, one));
@@ -142,15 +142,15 @@ public class MergeJoinTest {
     @Test
     public void testSimpleMergeJoinPredicateOnly2() throws Exception {
         //add data
-        RyaURI pred1 = new RyaURI(litdupsNS, "pred1");
-        RyaURI pred2 = new RyaURI(litdupsNS, "pred2");
+        RyaIRI pred1 = new RyaIRI(litdupsNS, "pred1");
+        RyaIRI pred2 = new RyaIRI(litdupsNS, "pred2");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred1, one));
         dao.add(new RyaStatement(subj1, pred1, two));
@@ -194,15 +194,15 @@ public class MergeJoinTest {
     @Test
     public void testSimpleMergeJoinMultiWay() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, two));
@@ -224,13 +224,13 @@ public class MergeJoinTest {
 
         //1 join
         MergeJoin mergeJoin = new MergeJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = 
mergeJoin.join(null, new CustomEntry<RyaURI, RyaType>(pred, one),
-                new CustomEntry<RyaURI, RyaType>(pred, two),
-                new CustomEntry<RyaURI, RyaType>(pred, three),
-                new CustomEntry<RyaURI, RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = 
mergeJoin.join(null, new CustomEntry<RyaIRI, RyaType>(pred, one),
+                new CustomEntry<RyaIRI, RyaType>(pred, two),
+                new CustomEntry<RyaIRI, RyaType>(pred, three),
+                new CustomEntry<RyaIRI, RyaType>(pred, four)
         );
 
-        Set<RyaURI> uris = new HashSet<RyaURI>();
+        Set<RyaIRI> uris = new HashSet<RyaIRI>();
         while (join.hasNext()) {
             uris.add(join.next());
         }
@@ -244,16 +244,16 @@ public class MergeJoinTest {
     @Test
     public void testMergeJoinMultiWay() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType zero = new RyaType("0");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, two));
@@ -275,13 +275,13 @@ public class MergeJoinTest {
 
         //1 join
         MergeJoin mergeJoin = new MergeJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = 
mergeJoin.join(null, new CustomEntry<RyaURI, RyaType>(pred, one),
-                new CustomEntry<RyaURI, RyaType>(pred, two),
-                new CustomEntry<RyaURI, RyaType>(pred, three),
-                new CustomEntry<RyaURI, RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = 
mergeJoin.join(null, new CustomEntry<RyaIRI, RyaType>(pred, one),
+                new CustomEntry<RyaIRI, RyaType>(pred, two),
+                new CustomEntry<RyaIRI, RyaType>(pred, three),
+                new CustomEntry<RyaIRI, RyaType>(pred, four)
         );
 
-        Set<RyaURI> uris = new HashSet<RyaURI>();
+        Set<RyaIRI> uris = new HashSet<RyaIRI>();
         while (join.hasNext()) {
             uris.add(join.next());
         }
@@ -294,16 +294,16 @@ public class MergeJoinTest {
     @Test
     public void testMergeJoinMultiWayNone() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType zero = new RyaType("0");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, three));
@@ -320,10 +320,10 @@ public class MergeJoinTest {
 
         //1 join
         MergeJoin mergeJoin = new MergeJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = 
mergeJoin.join(null, new CustomEntry<RyaURI, RyaType>(pred, one),
-                new CustomEntry<RyaURI, RyaType>(pred, two),
-                new CustomEntry<RyaURI, RyaType>(pred, three),
-                new CustomEntry<RyaURI, RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = 
mergeJoin.join(null, new CustomEntry<RyaIRI, RyaType>(pred, one),
+                new CustomEntry<RyaIRI, RyaType>(pred, two),
+                new CustomEntry<RyaIRI, RyaType>(pred, three),
+                new CustomEntry<RyaIRI, RyaType>(pred, four)
         );
 
         assertFalse(join.hasNext());
@@ -333,16 +333,16 @@ public class MergeJoinTest {
     @Test
     public void testMergeJoinMultiWayNone2() throws Exception {
         //add data
-        RyaURI pred = new RyaURI(litdupsNS, "pred1");
+        RyaIRI pred = new RyaIRI(litdupsNS, "pred1");
         RyaType zero = new RyaType("0");
         RyaType one = new RyaType("1");
         RyaType two = new RyaType("2");
         RyaType three = new RyaType("3");
         RyaType four = new RyaType("4");
-        RyaURI subj1 = new RyaURI(litdupsNS, "subj1");
-        RyaURI subj2 = new RyaURI(litdupsNS, "subj2");
-        RyaURI subj3 = new RyaURI(litdupsNS, "subj3");
-        RyaURI subj4 = new RyaURI(litdupsNS, "subj4");
+        RyaIRI subj1 = new RyaIRI(litdupsNS, "subj1");
+        RyaIRI subj2 = new RyaIRI(litdupsNS, "subj2");
+        RyaIRI subj3 = new RyaIRI(litdupsNS, "subj3");
+        RyaIRI subj4 = new RyaIRI(litdupsNS, "subj4");
 
         dao.add(new RyaStatement(subj1, pred, one));
         dao.add(new RyaStatement(subj1, pred, four));
@@ -357,10 +357,10 @@ public class MergeJoinTest {
 
         //1 join
         MergeJoin mergeJoin = new MergeJoin(dao.getQueryEngine());
-        CloseableIteration<RyaURI, RyaDAOException> join = 
mergeJoin.join(null, new CustomEntry<RyaURI, RyaType>(pred, one),
-                new CustomEntry<RyaURI, RyaType>(pred, two),
-                new CustomEntry<RyaURI, RyaType>(pred, three),
-                new CustomEntry<RyaURI, RyaType>(pred, four)
+        CloseableIteration<RyaIRI, RyaDAOException> join = 
mergeJoin.join(null, new CustomEntry<RyaIRI, RyaType>(pred, one),
+                new CustomEntry<RyaIRI, RyaType>(pred, two),
+                new CustomEntry<RyaIRI, RyaType>(pred, three),
+                new CustomEntry<RyaIRI, RyaType>(pred, four)
         );
 
         assertFalse(join.hasNext());

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/StatementPatternEvalTest.java
----------------------------------------------------------------------
diff --git 
a/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/StatementPatternEvalTest.java
 
b/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/StatementPatternEvalTest.java
index f40b4e9..c9ed744 100644
--- 
a/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/StatementPatternEvalTest.java
+++ 
b/sail/src/test/java/org/apache/rya/rdftriplestore/evaluation/StatementPatternEvalTest.java
@@ -33,7 +33,7 @@ import org.apache.rya.accumulo.AccumuloRyaDAO;
 import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
 import org.apache.rya.api.domain.RyaStatement;
 import org.apache.rya.api.domain.RyaType;
-import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaIRI;
 import org.apache.rya.api.domain.StatementMetadata;
 import org.apache.rya.api.persist.RyaDAOException;
 import 
org.apache.rya.rdftriplestore.RdfCloudTripleStoreConnection.StoreTripleSource;
@@ -86,16 +86,16 @@ public class StatementPatternEvalTest {
         ParsedQuery pq = parser.parseQuery(query, null);
         List<StatementPattern> spList = 
StatementPatternCollector.process(pq.getTupleExpr());
         
-        RyaStatement statement1 = new RyaStatement(new RyaURI("uri:Joe"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context1"), "", new 
StatementMetadata());
+        RyaStatement statement1 = new RyaStatement(new RyaIRI("uri:Joe"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context1"), "", new 
StatementMetadata());
         dao.add(statement1);
         
-        RyaStatement statement2 = new RyaStatement(new RyaURI("uri:Doug"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context2"), "", new 
StatementMetadata());
+        RyaStatement statement2 = new RyaStatement(new RyaIRI("uri:Doug"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context2"), "", new 
StatementMetadata());
         dao.add(statement2);
         
-        RyaStatement statement3 = new RyaStatement(new RyaURI("uri:Eric"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context3"), "", new 
StatementMetadata());
+        RyaStatement statement3 = new RyaStatement(new RyaIRI("uri:Eric"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context3"), "", new 
StatementMetadata());
         dao.add(statement3);
 
         QueryBindingSet bsConstraint1 = new QueryBindingSet();
@@ -137,16 +137,16 @@ public class StatementPatternEvalTest {
         ParsedQuery pq = parser.parseQuery(query, null);
         List<StatementPattern> spList = 
StatementPatternCollector.process(pq.getTupleExpr());
         
-        RyaStatement statement1 = new RyaStatement(new RyaURI("uri:Joe"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context1"), "", new 
StatementMetadata());
+        RyaStatement statement1 = new RyaStatement(new RyaIRI("uri:Joe"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context1"), "", new 
StatementMetadata());
         dao.add(statement1);
         
-        RyaStatement statement2 = new RyaStatement(new RyaURI("uri:Doug"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context2"), "", new 
StatementMetadata());
+        RyaStatement statement2 = new RyaStatement(new RyaIRI("uri:Doug"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context2"), "", new 
StatementMetadata());
         dao.add(statement2);
         
-        RyaStatement statement3 = new RyaStatement(new RyaURI("uri:Eric"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context3"), "", new 
StatementMetadata());
+        RyaStatement statement3 = new RyaStatement(new RyaIRI("uri:Eric"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context3"), "", new 
StatementMetadata());
         dao.add(statement3);
 
         QueryBindingSet bsConstraint1 = new QueryBindingSet();
@@ -191,16 +191,16 @@ public class StatementPatternEvalTest {
         ParsedQuery pq = parser.parseQuery(query, null);
         List<StatementPattern> spList = 
StatementPatternCollector.process(pq.getTupleExpr());
         
-        RyaStatement statement1 = new RyaStatement(new RyaURI("uri:Joe"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context1"), "", new 
StatementMetadata());
+        RyaStatement statement1 = new RyaStatement(new RyaIRI("uri:Joe"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context1"), "", new 
StatementMetadata());
         dao.add(statement1);
         
-        RyaStatement statement2 = new RyaStatement(new RyaURI("uri:Doug"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context2"), "", new 
StatementMetadata());
+        RyaStatement statement2 = new RyaStatement(new RyaIRI("uri:Doug"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context2"), "", new 
StatementMetadata());
         dao.add(statement2);
         
-        RyaStatement statement3 = new RyaStatement(new RyaURI("uri:Eric"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context3"), "", new 
StatementMetadata());
+        RyaStatement statement3 = new RyaStatement(new RyaIRI("uri:Eric"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context3"), "", new 
StatementMetadata());
         dao.add(statement3);
 
         QueryBindingSet bsConstraint1 = new QueryBindingSet();
@@ -237,16 +237,16 @@ public class StatementPatternEvalTest {
         ParsedQuery pq = parser.parseQuery(query, null);
         List<StatementPattern> spList = 
StatementPatternCollector.process(pq.getTupleExpr());
         
-        RyaStatement statement1 = new RyaStatement(new RyaURI("uri:Joe"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context1"), "", new 
StatementMetadata());
+        RyaStatement statement1 = new RyaStatement(new RyaIRI("uri:Joe"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context1"), "", new 
StatementMetadata());
         dao.add(statement1);
         
-        RyaStatement statement2 = new RyaStatement(new RyaURI("uri:Doug"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context2"), "", new 
StatementMetadata());
+        RyaStatement statement2 = new RyaStatement(new RyaIRI("uri:Doug"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context2"), "", new 
StatementMetadata());
         dao.add(statement2);
         
-        RyaStatement statement3 = new RyaStatement(new RyaURI("uri:Eric"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context3"), "", new 
StatementMetadata());
+        RyaStatement statement3 = new RyaStatement(new RyaIRI("uri:Eric"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context3"), "", new 
StatementMetadata());
         dao.add(statement3);
 
         QueryBindingSet bsConstraint1 = new QueryBindingSet();
@@ -277,16 +277,16 @@ public class StatementPatternEvalTest {
         ParsedQuery pq = parser.parseQuery(query, null);
         List<StatementPattern> spList = 
StatementPatternCollector.process(pq.getTupleExpr());
         
-        RyaStatement statement1 = new RyaStatement(new RyaURI("uri:Joe"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context1"), "", new 
StatementMetadata());
+        RyaStatement statement1 = new RyaStatement(new RyaIRI("uri:Joe"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context1"), "", new 
StatementMetadata());
         dao.add(statement1);
         
-        RyaStatement statement2 = new RyaStatement(new RyaURI("uri:Doug"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context1"), "", new 
StatementMetadata());
+        RyaStatement statement2 = new RyaStatement(new RyaIRI("uri:Doug"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context1"), "", new 
StatementMetadata());
         dao.add(statement2);
         
-        RyaStatement statement3 = new RyaStatement(new RyaURI("uri:Doug"), new 
RyaURI("uri:talksTo"),
-                new RyaType("uri:Bob"), new RyaURI("uri:context2"), "", new 
StatementMetadata());
+        RyaStatement statement3 = new RyaStatement(new RyaIRI("uri:Doug"), new 
RyaIRI("uri:talksTo"),
+                new RyaType("uri:Bob"), new RyaIRI("uri:context2"), "", new 
StatementMetadata());
         dao.add(statement3);
 
         QueryBindingSet bsConstraint1 = new QueryBindingSet();

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9c2bad66/sail/src/test/java/org/apache/rya/rdftriplestore/inference/PropertyChainTest.java
----------------------------------------------------------------------
diff --git 
a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/PropertyChainTest.java
 
b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/PropertyChainTest.java
index a3fd6ce..7a6bc79 100644
--- 
a/sail/src/test/java/org/apache/rya/rdftriplestore/inference/PropertyChainTest.java
+++ 
b/sail/src/test/java/org/apache/rya/rdftriplestore/inference/PropertyChainTest.java
@@ -115,7 +115,7 @@ public class PropertyChainTest extends TestCase {
         inferenceEngine.refreshGraph();
        List<IRI> chain = 
inferenceEngine.getPropertyChain(VF.createIRI("urn:greatMother"));
        Assert.assertEquals(chain.size(), 2);
-       Assert.assertEquals(chain.get(0), new 
InverseURI(VF.createIRI("urn:isChildOf")));
+       Assert.assertEquals(chain.get(0), new 
InverseIRI(VF.createIRI("urn:isChildOf")));
        Assert.assertEquals(chain.get(1), VF.createIRI("urn:MotherOf"));
  
     }

Reply via email to