diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
index 57c2cae2c13e0e1b99dd963a1b7c650225fa5a10..f58605545479e2b686959a43033fcd146e20b2f0 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/PropertiesProcessor.java
@@ -108,22 +108,26 @@ public class PropertiesProcessor {
 
     private String getDefinitionIdentity(String definitionSubRef) {
         String[] components = definitionSubRef.split(":");
-        if (components.length < 4) {
-            throw new AppException(HttpStatus.SC_CONFLICT, "Wrong definition format:" + definitionSubRef,
-                    "Wrong definition format:" + definitionSubRef);
+        switch (components.length) {
+            case 1:
+                return components[0];
+            case 4:
+                return components[2];
         }
-
-        return components[2];
+        throw new AppException(HttpStatus.SC_CONFLICT, "Wrong definition format:" + definitionSubRef,
+                "Wrong definition format:" + definitionSubRef);
     }
 
     private String getDefinitionColonVersion(String definitionSubRef) {
         String[] components = definitionSubRef.split(":");
-        if (components.length < 4) {
-            throw new AppException(HttpStatus.SC_CONFLICT, "Wrong definition format:" + definitionSubRef,
-                    "Wrong definition format:" + definitionSubRef);
+        switch (components.length) {
+            case 1:
+                return ":1.0.0";
+            case 4:
+                return ":" + components[3];
         }
-
-        return ":" + components[3];
+        throw new AppException(HttpStatus.SC_CONFLICT, "Wrong definition format:" + definitionSubRef,
+                "Wrong definition format:" + definitionSubRef);
     }
 
     private Stream<Map<String, Object>> processOfItems(List<AllOfItem> allOf, List<AllOfItem> anyOf, List<AllOfItem> oneOf) {
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/readme.md b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/readme.md
index aafac004ecb70a82185b0b2f9ebd52e6071c23e5..4c39a276469a7a3b43d7c4caf2d78d940fb70a42 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/readme.md
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/readme.md
@@ -5,7 +5,7 @@ Purpose
 -------
 
 The purpose of this document is to describe schema conversion from the
-Schema Service format to the Storage Service format.
+Schema Service formats to the Storage Service format.
 
 Storage Service schema has the following JSON format
 ----------------------------------------------------
@@ -162,7 +162,7 @@ For instance
 
 ```json
 opendes:wks:AbstractAnyCrsFeatureCollection:1.0.0
-opendes:wks:anyJsonFeatureCollection
+opendes:wks:anyJsonFeatureCollection:1.0.0
 ```
 
 Ignored definition(-s) name(-s) are not included into Storage Service schema:
@@ -318,14 +318,14 @@ For instance
 ```json
 {
   "definitions": {
-    "opendes:wks:wellboreData1:1.0.0": {
+    "wellboreData1": {
       "properties": {
         "prop1": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData2:1.0.0": {
+    "wellboreData2": {
       "properties": {
         "prop2": {
           "type": "string"
@@ -339,11 +339,11 @@ For instance
         {
           "anyOf": [
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData1:1.0.0"
+              "$ref": "#/definitions/wellboreData1"
             } ],
           "oneOf": [
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData2:1.0.0"
+              "$ref": "#/definitions/wellboreData2"
             }
           ]
         }
diff --git a/indexer-core/src/test/resources/converter/tags/allOf/allOf-inside-allOf.json b/indexer-core/src/test/resources/converter/tags/allOf/allOf-inside-allOf.json
index 950a7ed62ef135be3b6518de449bf78e60eea974..8ba3af2519d300e8dfcbcc17f77f8cf12bfb3bb0 100644
--- a/indexer-core/src/test/resources/converter/tags/allOf/allOf-inside-allOf.json
+++ b/indexer-core/src/test/resources/converter/tags/allOf/allOf-inside-allOf.json
@@ -1,27 +1,27 @@
 {
   "definitions": {
-    "opendes:wks:wellboreData1:1.0.0": {
+    "wellboreData1": {
       "properties": {
         "prop1": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData2:1.0.0": {
+    "wellboreData2": {
       "properties": {
         "prop2": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData3:1.0.0": {
+    "wellboreData3": {
       "properties": {
         "prop3": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData4:1.0.0": {
+    "wellboreData4": {
       "properties": {
         "prop4": {
           "type": "string"
@@ -35,18 +35,18 @@
         {
           "allOf": [
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData1:1.0.0"
+              "$ref": "#/definitions/wellboreData1"
             },
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData2:1.0.0"
+              "$ref": "#/definitions/wellboreData2"
             }
           ]
         },
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData3:1.0.0"
+          "$ref": "#/definitions/wellboreData3"
         },
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData4:1.0.0"
+          "$ref": "#/definitions/wellboreData4"
         }
       ]
     }
diff --git a/indexer-core/src/test/resources/converter/tags/allOf/allOf-inside-property.json b/indexer-core/src/test/resources/converter/tags/allOf/allOf-inside-property.json
index ec3efcd3cefad7952c7b2a3beedcd19ef2ef1d08..66df67afc03fad6e76a526399253a2d610afb8a4 100644
--- a/indexer-core/src/test/resources/converter/tags/allOf/allOf-inside-property.json
+++ b/indexer-core/src/test/resources/converter/tags/allOf/allOf-inside-property.json
@@ -1,6 +1,6 @@
 {
   "definitions": {
-    "opendes:wks:def1:1.0.0": {
+    "def1": {
       "properties": {
         "prop1": {
           "type": "string"
@@ -14,12 +14,12 @@
         "FacilityName": {
           "allOf": [
             {
-              "$ref": "#/definitions/opendes:wks:def1:1.0.0"
+              "$ref": "#/definitions/def1"
             },
             {
               "properties": {
                 "val" : {
-                "type": "string" }
+                  "type": "string" }
               }
             }
           ]
diff --git a/indexer-core/src/test/resources/converter/tags/allOf/indefinitions.json b/indexer-core/src/test/resources/converter/tags/allOf/indefinitions.json
index db27b0b957d00516a53dbca08b5755c71c05b3fe..0064dd0ae4bc8ee01c7dff273f986a762f05ead7 100644
--- a/indexer-core/src/test/resources/converter/tags/allOf/indefinitions.json
+++ b/indexer-core/src/test/resources/converter/tags/allOf/indefinitions.json
@@ -1,16 +1,16 @@
 {
   "definitions": {
-    "opendes:wks:wellboreData1:1.0.0": {
+    "wellboreData1": {
       "properties": {
         "prop1": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData2:1.0.0": {
+    "wellboreData2": {
       "allOf": [
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData1:1.0.0"
+          "$ref": "#/definitions/wellboreData1"
         }
       ]
     }
@@ -20,7 +20,7 @@
       "type": "object",
       "properties": {
         "Field": {
-          "$ref": "#/definitions/opendes:wks:wellboreData2:1.0.0"
+          "$ref": "#/definitions/wellboreData2"
         }
       }
     }
diff --git a/indexer-core/src/test/resources/converter/tags/mixAllAnyOneOf/mix.json b/indexer-core/src/test/resources/converter/tags/mixAllAnyOneOf/mix.json
index c94d1649bf33ddf0c9a8929f9f43f8496056a628..2eb9de93a9911ad6407366a362fa0604219f7361 100644
--- a/indexer-core/src/test/resources/converter/tags/mixAllAnyOneOf/mix.json
+++ b/indexer-core/src/test/resources/converter/tags/mixAllAnyOneOf/mix.json
@@ -1,27 +1,27 @@
 {
   "definitions": {
-    "opendes:wks:wellboreData1:1.0.0": {
+    "wellboreData1": {
       "properties": {
         "prop1": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData2:1.0.0": {
+    "wellboreData2": {
       "properties": {
         "prop2": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData3:1.0.0": {
+    "wellboreData3": {
       "properties": {
         "prop3": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData4:1.0.0": {
+    "wellboreData4": {
       "properties": {
         "prop4": {
           "type": "string"
@@ -35,19 +35,19 @@
         {
           "anyOf": [
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData1:1.0.0"
+              "$ref": "#/definitions/wellboreData1"
             } ],
           "oneOf": [
             {
-              "$ref": "#/definitions/opendes:wks:wellboreData2:1.0.0"
+              "$ref": "#/definitions/wellboreData2"
             }
           ]
         },
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData3:1.0.0"
+          "$ref": "#/definitions/wellboreData3"
         },
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData4:1.0.0"
+          "$ref": "#/definitions/wellboreData4"
         }
       ]
     }
diff --git a/indexer-core/src/test/resources/converter/tags/oneOf/indefinitions.json b/indexer-core/src/test/resources/converter/tags/oneOf/indefinitions.json
index ab87712afe11ccbd52120cbc0abb89b1a26210e1..4733286c10bd2d081ae85fa44ee22d499a86908d 100644
--- a/indexer-core/src/test/resources/converter/tags/oneOf/indefinitions.json
+++ b/indexer-core/src/test/resources/converter/tags/oneOf/indefinitions.json
@@ -1,16 +1,16 @@
 {
   "definitions": {
-    "opendes:wks:wellboreData1:1.0.0": {
+    "wellboreData1": {
       "properties": {
         "prop1": {
           "type": "string"
         }
       }
     },
-    "opendes:wks:wellboreData2:1.0.0": {
+    "wellboreData2": {
       "anyOf": [
         {
-          "$ref": "#/definitions/opendes:wks:wellboreData1:1.0.0"
+          "$ref": "#/definitions/wellboreData1"
         }
       ]
     }
@@ -20,7 +20,7 @@
       "type": "object",
       "properties": {
         "Field": {
-          "$ref": "#/definitions/opendes:wks:wellboreData2:1.0.0"
+          "$ref": "#/definitions/wellboreData2"
         }
       }
     }
diff --git a/indexer-core/src/test/resources/converter/wks/slb_wke_wellbore.json b/indexer-core/src/test/resources/converter/wks/slb_wke_wellbore.json
index 32ca4d6d3bee19fcfb397abfb292d3522964fdb3..4750faf2cd40de8a375ee67350af2f6eea1fe295 100644
--- a/indexer-core/src/test/resources/converter/wks/slb_wke_wellbore.json
+++ b/indexer-core/src/test/resources/converter/wks/slb_wke_wellbore.json
@@ -3,7 +3,7 @@
   "$license": "Copyright 2017-2020, Schlumberger\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
-    "opendes:wks:core_dl_geopoint:1.0.0": {
+    "core_dl_geopoint": {
       "description": "A 2D point location in latitude and longitude referenced to WGS 84 if not specified otherwise.",
       "properties": {
         "latitude": {
@@ -28,7 +28,7 @@
       "title": "2D Map Location",
       "type": "object"
     },
-    "opendes:wks:geoJsonFeature:1.0.0": {
+    "geoJsonFeature": {
       "properties": {
         "bbox": {
           "items": {
@@ -40,27 +40,27 @@
         "geometry": {
           "oneOf": [
             {
-              "$ref": "#/definitions/opendes:wks:geoJsonPoint:1.0.0",
+              "$ref": "#/definitions/geoJsonPoint",
               "title": "GeoJSON Point"
             },
             {
-              "$ref": "#/definitions/opendes:wks:geoJsonMultiPoint:1.0.0",
+              "$ref": "#/definitions/geoJsonMultiPoint",
               "title": "GeoJSON MultiPoint"
             },
             {
-              "$ref": "#/definitions/opendes:wks:geoJsonLineString:1.0.0",
+              "$ref": "#/definitions/geoJsonLineString",
               "title": "GeoJSON LineString"
             },
             {
-              "$ref": "#/definitions/opendes:wks:geoJsonMultiLineString:1.0.0",
+              "$ref": "#/definitions/geoJsonMultiLineString",
               "title": "GeoJSON MultiLineString"
             },
             {
-              "$ref": "#/definitions/opendes:wks:polygon:1.0.0",
+              "$ref": "#/definitions/polygon",
               "title": "GeoJSON Polygon"
             },
             {
-              "$ref": "#/definitions/opendes:wks:geoJsonMultiPolygon:1.0.0",
+              "$ref": "#/definitions/geoJsonMultiPolygon",
               "title": "GeoJSON MultiPolygon"
             },
             {
@@ -76,27 +76,27 @@
                   "items": {
                     "oneOf": [
                       {
-                        "$ref": "#/definitions/opendes:wks:geoJsonPoint:1.0.0",
+                        "$ref": "#/definitions/geoJsonPoint",
                         "title": "GeoJSON Point"
                       },
                       {
-                        "$ref": "#/definitions/opendes:wks:geoJsonMultiPoint:1.0.0",
+                        "$ref": "#/definitions/geoJsonMultiPoint",
                         "title": "GeoJSON MultiPoint"
                       },
                       {
-                        "$ref": "#/definitions/opendes:wks:geoJsonLineString:1.0.0",
+                        "$ref": "#/definitions/geoJsonLineString",
                         "title": "GeoJSON LineString"
                       },
                       {
-                        "$ref": "#/definitions/opendes:wks:geoJsonMultiLineString:1.0.0",
+                        "$ref": "#/definitions/geoJsonMultiLineString",
                         "title": "GeoJSON MultiLineString"
                       },
                       {
-                        "$ref": "#/definitions/opendes:wks:polygon:1.0.0",
+                        "$ref": "#/definitions/polygon",
                         "title": "GeoJSON Polygon"
                       },
                       {
-                        "$ref": "#/definitions/opendes:wks:geoJsonMultiPolygon:1.0.0",
+                        "$ref": "#/definitions/geoJsonMultiPolygon",
                         "title": "GeoJSON MultiPolygon"
                       }
                     ]
@@ -144,7 +144,7 @@
       "title": "GeoJSON Feature",
       "type": "object"
     },
-    "opendes:wks:geoJsonFeatureCollection:1.0.0": {
+    "geoJsonFeatureCollection": {
       "properties": {
         "bbox": {
           "items": {
@@ -155,7 +155,7 @@
         },
         "features": {
           "items": {
-            "$ref": "#/definitions/opendes:wks:geoJsonFeature:1.0.0",
+            "$ref": "#/definitions/geoJsonFeature",
             "title": "GeoJSON Feature"
           },
           "type": "array"
@@ -174,7 +174,7 @@
       "title": "GeoJSON FeatureCollection",
       "type": "object"
     },
-    "opendes:wks:geoJsonLineString:1.0.0": {
+    "geoJsonLineString": {
       "description": "GeoJSON LineString as defined in http://geojson.org/schema/LineString.json.",
       "properties": {
         "bbox": {
@@ -209,7 +209,7 @@
       "title": "GeoJSON LineString",
       "type": "object"
     },
-    "opendes:wks:geoJsonMultiLineString:1.0.0": {
+    "geoJsonMultiLineString": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "properties": {
         "bbox": {
@@ -247,7 +247,7 @@
       "title": "GeoJSON MultiLineString",
       "type": "object"
     },
-    "opendes:wks:geoJsonMultiPoint:1.0.0": {
+    "geoJsonMultiPoint": {
       "properties": {
         "bbox": {
           "items": {
@@ -280,7 +280,7 @@
       "title": "GeoJSON Point",
       "type": "object"
     },
-    "opendes:wks:geoJsonMultiPolygon:1.0.0": {
+    "geoJsonMultiPolygon": {
       "description": "GeoJSON MultiPolygon derived from http://geojson.org/schema/MultiPolygon.json",
       "properties": {
         "bbox": {
@@ -323,7 +323,7 @@
       "title": "MultiPolygon",
       "type": "object"
     },
-    "opendes:wks:geoJsonPoint:1.0.0": {
+    "geoJsonPoint": {
       "properties": {
         "bbox": {
           "items": {
@@ -353,7 +353,7 @@
       "title": "GeoJSON Point",
       "type": "object"
     },
-    "opendes:wks:geographicPosition:1.0.0": {
+    "geographicPosition": {
       "description": "A position in the native geographic CRS (latitude and longitude) combined with an elevation from mean seal level (MSL)",
       "properties": {
         "crsKey": {
@@ -362,7 +362,7 @@
           "type": "string"
         },
         "elevationFromMsl": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "Elevation from Mean Seal Level, downwards negative. The unit definition is found via 'elevationFromMsl.unitKey' in 'frameOfReference.units' dictionary.",
           "title": "Elevation from MSL"
         },
@@ -386,7 +386,7 @@
       "title": "Geographic Position",
       "type": "object"
     },
-    "opendes:wks:legal:1.0.0": {
+    "legal": {
       "description": "Legal meta data like legal tags, relevant other countries, legal status.",
       "properties": {
         "legaltags": {
@@ -414,7 +414,7 @@
       "title": "Legal Meta Data",
       "type": "object"
     },
-    "opendes:wks:linkList:1.0.0": {
+    "linkList": {
       "additionalProperties": {
         "description": "An array of one or more entity references in the data lake.",
         "items": {
@@ -427,7 +427,7 @@
       "title": "Link List",
       "type": "object"
     },
-    "opendes:wks:metaItem:1.0.0": {
+    "metaItem": {
       "description": "A meta data item, which allows the association of named properties or property values to a Unit/Measurement/CRS/Azimuth/Time context.",
       "properties": {
         "kind": {
@@ -496,7 +496,7 @@
       "title": "Frame of Reference Meta Data Item",
       "type": "object"
     },
-    "opendes:wks:plssLocation:1.0.0": {
+    "plssLocation": {
       "$id": "definitions/plssLocation",
       "description": "A location described by the Public Land Survey System (United States)",
       "properties": {
@@ -542,7 +542,7 @@
       "title": "US PLSS Location",
       "type": "object"
     },
-    "opendes:wks:point3dNonGeoJson:1.0.0": {
+    "point3dNonGeoJson": {
       "description": "A 3-dimensional point with a CRS key, which is further described in 'frameOfReference.crs' and a unitKey for the z or 3rd coordinate; the unit key is further described in 'frameOfReference.units'.",
       "properties": {
         "coordinates": {
@@ -574,7 +574,7 @@
       "title": "3D Point with CRS/Unit key",
       "type": "object"
     },
-    "opendes:wks:polygon:1.0.0": {
+    "polygon": {
       "$schema": "http://json-schema.org/draft-07/schema#",
       "description": "GeoJSON Polygon derived from http://geojson.org/schema/Polygon.json",
       "properties": {
@@ -613,7 +613,7 @@
       "title": "GeoJSON Polygon",
       "type": "object"
     },
-    "opendes:wks:projectedPosition:1.0.0": {
+    "projectedPosition": {
       "description": "A position in the native CRS in Cartesian coordinates combined with an elevation from mean seal level (MSL)",
       "properties": {
         "crsKey": {
@@ -622,7 +622,7 @@
           "type": "string"
         },
         "elevationFromMsl": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "Elevation from Mean Seal Level, downwards negative. The unit definition is found via 'elevationFromMsl.unitKey' in 'frameOfReference.units' dictionary.",
           "title": "Elevation from MSL"
         },
@@ -646,23 +646,23 @@
       "title": "Projected Position",
       "type": "object"
     },
-    "opendes:wks:relationships:1.0.0": {
+    "relationships": {
       "description": "All relationships from this entity.",
       "properties": {
         "definitiveTimeDepthRelation": {
-          "$ref": "#/definitions/opendes:wks:toOneRelationship:1.0.0",
+          "$ref": "#/definitions/toOneRelationship",
           "description": "The definitive tome-depth relation providing the MD to seismic travel-time transformation.",
           "title": "Definitive Time-Depth Relation",
           "x-slb-targetEntity": "timeDepthRelation_logSet"
         },
         "definitiveTrajectory": {
-          "$ref": "#/definitions/opendes:wks:toOneRelationship:1.0.0",
+          "$ref": "#/definitions/toOneRelationship",
           "description": "The definitive trajectory providing the MD to 3D space transformation.",
           "title": "Definitive Trajectory",
           "x-slb-targetEntity": "trajectory"
         },
         "tieInWellbore": {
-          "$ref": "#/definitions/opendes:wks:toOneRelationship:1.0.0",
+          "$ref": "#/definitions/toOneRelationship",
           "description": "The tie-in wellbore if this wellbore is a side-track.",
           "title": "Tie-in Wellbore",
           "x-slb-aliasProperties": [
@@ -672,7 +672,7 @@
           "x-slb-targetEntity": "wellbore"
         },
         "well": {
-          "$ref": "#/definitions/opendes:wks:toOneRelationship:1.0.0",
+          "$ref": "#/definitions/toOneRelationship",
           "description": "The well to which this wellbore belongs.",
           "title": "Well",
           "x-slb-aliasProperties": [
@@ -685,11 +685,11 @@
       "title": "Relationships",
       "type": "object"
     },
-    "opendes:wks:simpleElevationReference:1.0.0": {
+    "simpleElevationReference": {
       "description": "The entity's elevation reference, the elevation above MSL where vertical property is 0. Examples: MD==0, Elevation_Depth==0, TVD==0.",
       "properties": {
         "elevationFromMsl": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "The elevation above mean sea level (MSL), at which the vertical origin is 0.0. The 'unitKey' is further defined in 'frameOfReference.units'.",
           "example": 123.45,
           "title": "Elevation from MSL",
@@ -713,7 +713,7 @@
       "title": "Simple Elevation Reference",
       "type": "object"
     },
-    "opendes:wks:tagDictionary:1.0.0": {
+    "tagDictionary": {
       "additionalProperties": {
         "description": "An array of one or more tag items, e.g. access control list tags, legal tags, etc.",
         "items": {
@@ -726,7 +726,7 @@
       "title": "Tag Dictionary",
       "type": "object"
     },
-    "opendes:wks:toManyRelationship:1.0.0": {
+    "toManyRelationship": {
       "description": "A relationship from this entity to many other entities either by natural key (name) or explicit id, optionally classified by confidence level.",
       "properties": {
         "confidences": {
@@ -765,7 +765,7 @@
         }
       }
     },
-    "opendes:wks:toOneRelationship:1.0.0": {
+    "toOneRelationship": {
       "description": "A relationship from this entity to one other entity either by natural key (name) or id, optionally classified by confidence level",
       "properties": {
         "confidence": {
@@ -797,7 +797,7 @@
       "title": "To One Relationship",
       "type": "object"
     },
-    "opendes:wks:valueArrayWithUnit:1.0.0": {
+    "valueArrayWithUnit": {
       "description": "Array of values associated with unit context. The 'unitKey' can be looked up in the 'frameOfReference.units'.",
       "properties": {
         "unitKey": {
@@ -826,7 +826,7 @@
       "title": "Values with unitKey",
       "type": "object"
     },
-    "opendes:wks:valueWithUnit:1.0.0": {
+    "valueWithUnit": {
       "description": "Number value associated with unit context. The 'unitKey' can be looked up in the root property meta[] array.",
       "properties": {
         "unitKey": {
@@ -849,12 +849,12 @@
       "title": "Value with unitKey",
       "type": "object"
     },
-    "opendes:wks:wellboreData:1.0.0": {
+    "wellboreData": {
       "$id": "definitions/wellboreData",
       "description": "The domain specific data container for a wellbore.",
       "properties": {
         "airGap": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "The gap between water surface and offshore drilling platform.",
           "example": [
             11,
@@ -911,7 +911,7 @@
           "type": "string"
         },
         "drillingDaysTarget": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "Target days for drilling wellbore.",
           "example": [
             12.5,
@@ -924,7 +924,7 @@
           "x-slb-measurement": "Time"
         },
         "elevationReference": {
-          "$ref": "#/definitions/opendes:wks:simpleElevationReference:1.0.0",
+          "$ref": "#/definitions/simpleElevationReference",
           "description": "The wellbore's elevation reference from mean sea level (MSL), positive above MSL. This is where MD == 0 and TVD == 0",
           "title": "Elevation Reference",
           "type": "object"
@@ -982,7 +982,7 @@
           ]
         },
         "kickOffMd": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "The kick-off point in measured depth (MD); for the main well the kickOffMd is set to 0.",
           "example": [
             6543.2,
@@ -995,7 +995,7 @@
           "x-slb-measurement": "Standard_Depth_Index"
         },
         "kickOffTvd": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "Kickoff true vertical depth of the wellbore; for the main wellbore the kickOffMd is set to 0.",
           "example": [
             6543.2,
@@ -1008,7 +1008,7 @@
           "x-slb-measurement": "Standard_Depth_Index"
         },
         "locationWGS84": {
-          "$ref": "#/definitions/opendes:wks:geoJsonFeatureCollection:1.0.0",
+          "$ref": "#/definitions/geoJsonFeatureCollection",
           "description": "A 2D GeoJSON FeatureCollection defining wellbore location or trajectory in WGS 84 CRS.",
           "title": "Wellbore Shape WGS 84",
           "type": "object"
@@ -1045,7 +1045,7 @@
           "type": "string"
         },
         "plssLocation": {
-          "$ref": "#/definitions/opendes:wks:plssLocation:1.0.0",
+          "$ref": "#/definitions/plssLocation",
           "description": "A location described by the Public Land Survey System (United States)",
           "title": "US PLSS Location",
           "type": "object"
@@ -1059,7 +1059,7 @@
           "type": "string"
         },
         "relationships": {
-          "$ref": "#/definitions/opendes:wks:relationships:1.0.0",
+          "$ref": "#/definitions/relationships",
           "description": "The related entities.",
           "title": "Relationships"
         },
@@ -1100,7 +1100,7 @@
           "type": "string"
         },
         "totalDepthMd": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "The measured depth of the borehole. If status is plugged, indicates the maximum depth reached before plugging. It is recommended that this value be updated about every 10 minutes by an assigned raw data provider at a site.",
           "example": [
             13200,
@@ -1114,7 +1114,7 @@
           "x-slb-measurement": "Standard_Depth_Index"
         },
         "totalDepthMdDriller": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "The total depth along the wellbore as reported by the drilling contractor from 'elevationReference'. The unit definition is found via the property's unitKey' in 'frameOfReference.units' dictionary..",
           "example": [
             13200.23,
@@ -1127,7 +1127,7 @@
           "x-slb-measurement": "Standard_Depth_Index"
         },
         "totalDepthMdPlanned": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "Planned measured depth for the wellbore total depth.",
           "example": [
             13200,
@@ -1140,7 +1140,7 @@
           "x-slb-measurement": "Standard_Depth_Index"
         },
         "totalDepthMdSubSeaPlanned": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "Planned measured for the wellbore total depth - with respect to seabed.",
           "example": [
             13100,
@@ -1153,7 +1153,7 @@
           "x-slb-measurement": "Standard_Depth_Index"
         },
         "totalDepthProjectedMd": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "The projected total measured depth of the borehole. This property is questionable as there is not precise documentation available.",
           "example": [
             13215,
@@ -1163,7 +1163,7 @@
           "x-slb-measurement": "Standard_Depth_Index"
         },
         "totalDepthTvd": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "The true vertical depth of the borehole. If status is plugged, indicates the maximum depth reached before plugging. It is recommended that this value be updated about every 10 minutes by an assigned raw data provider at a site.",
           "example": [
             12200.23,
@@ -1176,7 +1176,7 @@
           "x-slb-measurement": "Standard_Depth_Index"
         },
         "totalDepthTvdDriller": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "The total depth true vertical as reported by the drilling contractor from 'elevationReference', Downwards increasing. The unit definition is found via the property's unitKey' in 'frameOfReference.units' dictionary.",
           "example": [
             12200.23,
@@ -1189,7 +1189,7 @@
           "x-slb-measurement": "Standard_Depth_Index"
         },
         "totalDepthTvdPlanned": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "Planned true vertical depth for the wellbore total depth.",
           "example": [
             12200.23,
@@ -1202,7 +1202,7 @@
           "x-slb-measurement": "Standard_Depth_Index"
         },
         "totalDepthTvdSubSeaPlanned": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "Planned true vertical depth for the wellbore total depth - with respect to seabed.",
           "example": [
             12100.23,
@@ -1229,25 +1229,25 @@
           ]
         },
         "wellHeadElevation": {
-          "$ref": "#/definitions/opendes:wks:valueWithUnit:1.0.0",
+          "$ref": "#/definitions/valueWithUnit",
           "description": "The wellbore's vertical position is an elevation from mean sea level (MSL), positive above MSL.",
           "title": "Well Head Elevation",
           "x-slb-measurement": "Standard_Depth_Index"
         },
         "wellHeadGeographic": {
-          "$ref": "#/definitions/opendes:wks:geographicPosition:1.0.0",
+          "$ref": "#/definitions/geographicPosition",
           "description": "The wellbore's well head position in the native, geographic CRS; vertical position is an elevation from mean sea level (MSL), positive above MSL.",
           "title": "Well Head Position, Geographic",
           "type": "object"
         },
         "wellHeadProjected": {
-          "$ref": "#/definitions/opendes:wks:projectedPosition:1.0.0",
+          "$ref": "#/definitions/projectedPosition",
           "description": "The wellbore's well head position in the native, projected CRS; vertical position is an elevation from mean sea level (MSL), positive above MSL.",
           "title": "Well Head Position, Projected",
           "type": "object"
         },
         "wellHeadWgs84": {
-          "$ref": "#/definitions/opendes:wks:core_dl_geopoint:1.0.0",
+          "$ref": "#/definitions/core_dl_geopoint",
           "description": "The wellbore's position in WGS 84 latitude and longitude.",
           "format": "core:dl:geopoint:1.0.0",
           "title": "WGS 84 Position",
@@ -1366,17 +1366,17 @@
   "description": "The well-known wellbore schema. Used to capture the general information about a wellbore. This information is sometimes called a \"wellbore header\". A wellbore represents the path from surface to a unique bottomhole location. The wellbore object is uniquely identified within the context of one well object.",
   "properties": {
     "acl": {
-      "$ref": "#/definitions/opendes:wks:tagDictionary:1.0.0",
+      "$ref": "#/definitions/tagDictionary",
       "description": "The access control tags associated with this entity.",
       "title": "Access Control List"
     },
     "ancestry": {
-      "$ref": "#/definitions/opendes:wks:linkList:1.0.0",
+      "$ref": "#/definitions/linkList",
       "description": "The links to data, which constitute the inputs.",
       "title": "Ancestry"
     },
     "data": {
-      "$ref": "#/definitions/opendes:wks:wellboreData:1.0.0",
+      "$ref": "#/definitions/wellboreData",
       "description": "Wellbore data container",
       "title": "Wellbore Data"
     },
@@ -1392,14 +1392,14 @@
       "type": "string"
     },
     "legal": {
-      "$ref": "#/definitions/opendes:wks:legal:1.0.0",
+      "$ref": "#/definitions/legal",
       "description": "The geological interpretation's legal tags",
       "title": "Legal Tags"
     },
     "meta": {
       "description": "The meta data section linking the 'unitKey', 'crsKey' to self-contained definitions (persistableReference)",
       "items": {
-        "$ref": "#/definitions/opendes:wks:metaItem:1.0.0"
+        "$ref": "#/definitions/metaItem"
       },
       "title": "Frame of Reference Meta Data",
       "type": "array"