diff --git a/examples/crossover_wmd/crossover_wmd.json b/examples/crossover_wmd/crossover_wmd.json
index 1de86ac7..72c38a0f 100644
--- a/examples/crossover_wmd/crossover_wmd.json
+++ b/examples/crossover_wmd/crossover_wmd.json
@@ -1024,7 +1024,7 @@
         },
         {
             "@id": "kb:primaryuser-email-3c4d0804-6ed0-4dfe-a152-3dab6b5f9111",
-            "@type": "uco-observable:ObservableRelationship",
+            "@type": "uco-core:Relationship",
             "uco-core:source": {
                 "@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
             },
@@ -1036,7 +1036,7 @@
         },
         {
             "@id": "kb:primaryuser-whatsapp-b295bc93-b65c-4670-a5d7-5c2206d78e92",
-            "@type": "uco-observable:ObservableRelationship",
+            "@type": "uco-core:Relationship",
             "uco-core:source": {
                 "@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
             },
diff --git a/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl b/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl
index 72c972ae..20af041e 100644
--- a/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl
+++ b/examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl
@@ -1,4 +1,3 @@
-@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
 @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#> .
@@ -9,7 +8,7 @@
 
 []
 	a sh:ValidationReport ;
-	sh:conforms "false"^^xsd:boolean ;
+	sh:conforms "true"^^xsd:boolean ;
 	sh:result
 		[
 			a sh:ValidationResult ;
@@ -40,32 +39,6 @@
 				sh:severity sh:Info ;
 			] ;
 			sh:value "Phone" ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/primaryuser-email-3c4d0804-6ed0-4dfe-a152-3dab6b5f9111> ;
-			sh:resultMessage "Value does not have class uco-observable:Observable" ;
-			sh:resultPath core:source ;
-			sh:resultSeverity sh:Violation ;
-			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
-			sh:sourceShape [
-				sh:class uco-observable:Observable ;
-				sh:path core:source ;
-			] ;
-			sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/primaryuser-whatsapp-b295bc93-b65c-4670-a5d7-5c2206d78e92> ;
-			sh:resultMessage "Value does not have class uco-observable:Observable" ;
-			sh:resultPath core:source ;
-			sh:resultSeverity sh:Violation ;
-			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
-			sh:sourceShape [
-				sh:class uco-observable:Observable ;
-				sh:path core:source ;
-			] ;
-			sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
 		]
 		;
 	.
diff --git a/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl b/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl
index 9d8a7f6c..20af041e 100644
--- a/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl
+++ b/examples/crossover_wmd/crossover_wmd_validation-unstable.ttl
@@ -1,4 +1,3 @@
-@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
 @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#> .
@@ -9,7 +8,7 @@
 
 []
 	a sh:ValidationReport ;
-	sh:conforms "false"^^xsd:boolean ;
+	sh:conforms "true"^^xsd:boolean ;
 	sh:result
 		[
 			a sh:ValidationResult ;
@@ -40,36 +39,6 @@
 				sh:severity sh:Info ;
 			] ;
 			sh:value "Phone" ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/primaryuser-email-3c4d0804-6ed0-4dfe-a152-3dab6b5f9111> ;
-			sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
-			sh:resultPath core:source ;
-			sh:resultSeverity sh:Warning ;
-			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
-			sh:sourceShape [
-				sh:class uco-observable:Observable ;
-				sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
-				sh:path core:source ;
-				sh:severity sh:Warning ;
-			] ;
-			sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/primaryuser-whatsapp-b295bc93-b65c-4670-a5d7-5c2206d78e92> ;
-			sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
-			sh:resultPath core:source ;
-			sh:resultSeverity sh:Warning ;
-			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
-			sh:sourceShape [
-				sh:class uco-observable:Observable ;
-				sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
-				sh:path core:source ;
-				sh:severity sh:Warning ;
-			] ;
-			sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
 		]
 		;
 	.
diff --git a/examples/crossover_wmd/index.html b/examples/crossover_wmd/index.html
index 026382ca..503018c7 100644
--- a/examples/crossover_wmd/index.html
+++ b/examples/crossover_wmd/index.html
@@ -852,7 +852,7 @@ <h4>CASE Representation of Users and Accounts</h4>
     },
     {
         "@id": "kb:primaryuser-email-3c4d0804-6ed0-4dfe-a152-3dab6b5f9111",
-        "@type": "uco-observable:ObservableRelationship",
+        "@type": "uco-core:Relationship",
         "uco-core:source": {
             "@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
         },
@@ -864,7 +864,7 @@ <h4>CASE Representation of Users and Accounts</h4>
     },
     {
         "@id": "kb:primaryuser-whatsapp-b295bc93-b65c-4670-a5d7-5c2206d78e92",
-        "@type": "uco-observable:ObservableRelationship",
+        "@type": "uco-core:Relationship",
         "uco-core:source": {
             "@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
         },
diff --git a/examples/owl_trafficking/index.html b/examples/owl_trafficking/index.html
index 3deb514c..75318356 100644
--- a/examples/owl_trafficking/index.html
+++ b/examples/owl_trafficking/index.html
@@ -661,7 +661,7 @@ <h5>CASE Representation of Users and Accounts</h5>
     },
     {
         "@id": "kb:primaryuser-faceboook-cb34b068-324b-4162-a9e5-6c96879b061c",
-        "@type": "uco-observable:ObservableRelationship",
+        "@type": "uco-core:Relationship",
         "uco-core:source": {
             "@id": "kb:primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f"
         },
@@ -673,7 +673,7 @@ <h5>CASE Representation of Users and Accounts</h5>
     },
     {
         "@id": "kb:primaryuser-email-cb34b068-324b-4162-a9e5-6c96879b061c",
-        "@type": "uco-observable:ObservableRelationship",
+        "@type": "uco-core:Relationship",
         "uco-core:source": {
             "@id": "kb:primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f"
         },
@@ -1534,7 +1534,7 @@ <h5>CASE Representation</h5>
     },
     {
         "@id": "kb:cameralocation-relationship-c6f64e98-68c5-4d2e-9ae8-a7e110f2ac83",
-        "@type": "uco-observable:ObservableRelationship",
+        "@type": "uco-core:Relationship",
         "uco-core:source": {
             "@id": "kb:latlong-8667ec82-8c21-11e9-934e-0c4de9c21b53"
         },
diff --git a/examples/owl_trafficking/owl_trafficking.json b/examples/owl_trafficking/owl_trafficking.json
index 9d911894..ef52d721 100644
--- a/examples/owl_trafficking/owl_trafficking.json
+++ b/examples/owl_trafficking/owl_trafficking.json
@@ -379,7 +379,7 @@
         },
         {
             "@id": "kb:primaryuser-faceboook-cb34b068-324b-4162-a9e5-6c96879b061c",
-            "@type": "uco-observable:ObservableRelationship",
+            "@type": "uco-core:Relationship",
             "uco-core:source": {
                 "@id": "kb:primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f"
             },
@@ -391,7 +391,7 @@
         },
         {
             "@id": "kb:primaryuser-email-cb34b068-324b-4162-a9e5-6c96879b061c",
-            "@type": "uco-observable:ObservableRelationship",
+            "@type": "uco-core:Relationship",
             "uco-core:source": {
                 "@id": "kb:primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f"
             },
@@ -1154,7 +1154,7 @@
         },
         {
             "@id": "kb:cameralocation-relationship-c6f64e98-68c5-4d2e-9ae8-a7e110f2ac83",
-            "@type": "uco-observable:ObservableRelationship",
+            "@type": "uco-core:Relationship",
             "uco-core:source": {
                 "@id": "kb:latlong-8667ec82-8c21-11e9-934e-0c4de9c21b53"
             },
diff --git a/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl b/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl
index 1113ce43..13c0538e 100644
--- a/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl
+++ b/examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl
@@ -1,4 +1,3 @@
-@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
 @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#> .
@@ -9,62 +8,21 @@
 
 []
 	a sh:ValidationReport ;
-	sh:conforms "false"^^xsd:boolean ;
-	sh:result
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
-			sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
-			sh:resultPath uco-observable:accountType ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
-			sh:sourceShape [
-				sh:datatype vocabulary:AccountTypeVocab ;
-				sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
-				sh:path uco-observable:accountType ;
-				sh:severity sh:Info ;
-			] ;
-			sh:value "phone" ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/cameralocation-relationship-c6f64e98-68c5-4d2e-9ae8-a7e110f2ac83> ;
-			sh:resultMessage "Value does not have class uco-observable:Observable" ;
-			sh:resultPath core:source ;
-			sh:resultSeverity sh:Violation ;
-			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
-			sh:sourceShape [
-				sh:class uco-observable:Observable ;
-				sh:path core:source ;
-			] ;
-			sh:value <http://example.org/kb/latlong-8667ec82-8c21-11e9-934e-0c4de9c21b53> ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/primaryuser-email-cb34b068-324b-4162-a9e5-6c96879b061c> ;
-			sh:resultMessage "Value does not have class uco-observable:Observable" ;
-			sh:resultPath core:source ;
-			sh:resultSeverity sh:Violation ;
-			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
-			sh:sourceShape [
-				sh:class uco-observable:Observable ;
-				sh:path core:source ;
-			] ;
-			sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/primaryuser-faceboook-cb34b068-324b-4162-a9e5-6c96879b061c> ;
-			sh:resultMessage "Value does not have class uco-observable:Observable" ;
-			sh:resultPath core:source ;
-			sh:resultSeverity sh:Violation ;
-			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
-			sh:sourceShape [
-				sh:class uco-observable:Observable ;
-				sh:path core:source ;
-			] ;
-			sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
-		]
-		;
+	sh:conforms "true"^^xsd:boolean ;
+	sh:result [
+		a sh:ValidationResult ;
+		sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
+		sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
+		sh:resultPath uco-observable:accountType ;
+		sh:resultSeverity sh:Info ;
+		sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
+		sh:sourceShape [
+			sh:datatype vocabulary:AccountTypeVocab ;
+			sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
+			sh:path uco-observable:accountType ;
+			sh:severity sh:Info ;
+		] ;
+		sh:value "phone" ;
+	] ;
 	.
 
diff --git a/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl b/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl
index 28976f9a..13c0538e 100644
--- a/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl
+++ b/examples/owl_trafficking/owl_trafficking_validation-unstable.ttl
@@ -1,4 +1,3 @@
-@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
 @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#> .
@@ -9,68 +8,21 @@
 
 []
 	a sh:ValidationReport ;
-	sh:conforms "false"^^xsd:boolean ;
-	sh:result
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
-			sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
-			sh:resultPath uco-observable:accountType ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
-			sh:sourceShape [
-				sh:datatype vocabulary:AccountTypeVocab ;
-				sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
-				sh:path uco-observable:accountType ;
-				sh:severity sh:Info ;
-			] ;
-			sh:value "phone" ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/cameralocation-relationship-c6f64e98-68c5-4d2e-9ae8-a7e110f2ac83> ;
-			sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
-			sh:resultPath core:source ;
-			sh:resultSeverity sh:Warning ;
-			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
-			sh:sourceShape [
-				sh:class uco-observable:Observable ;
-				sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
-				sh:path core:source ;
-				sh:severity sh:Warning ;
-			] ;
-			sh:value <http://example.org/kb/latlong-8667ec82-8c21-11e9-934e-0c4de9c21b53> ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/primaryuser-email-cb34b068-324b-4162-a9e5-6c96879b061c> ;
-			sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
-			sh:resultPath core:source ;
-			sh:resultSeverity sh:Warning ;
-			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
-			sh:sourceShape [
-				sh:class uco-observable:Observable ;
-				sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
-				sh:path core:source ;
-				sh:severity sh:Warning ;
-			] ;
-			sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/primaryuser-faceboook-cb34b068-324b-4162-a9e5-6c96879b061c> ;
-			sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
-			sh:resultPath core:source ;
-			sh:resultSeverity sh:Warning ;
-			sh:sourceConstraintComponent sh:ClassConstraintComponent ;
-			sh:sourceShape [
-				sh:class uco-observable:Observable ;
-				sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not.  This will be an error in UCO 2.0.0."@en ;
-				sh:path core:source ;
-				sh:severity sh:Warning ;
-			] ;
-			sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
-		]
-		;
+	sh:conforms "true"^^xsd:boolean ;
+	sh:result [
+		a sh:ValidationResult ;
+		sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
+		sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
+		sh:resultPath uco-observable:accountType ;
+		sh:resultSeverity sh:Info ;
+		sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
+		sh:sourceShape [
+			sh:datatype vocabulary:AccountTypeVocab ;
+			sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
+			sh:path uco-observable:accountType ;
+			sh:severity sh:Info ;
+		] ;
+		sh:value "phone" ;
+	] ;
 	.