JSON Schemas now have

schema/BatchOperationResult.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/BatchOperationResult.json",
+  "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/BatchOperationResult.json",
   "title": "NGSI-LD Batch Operation Result",
   "description": "NGSI-LD Batch Operation Result",
   "definitions": {

schema/Entity.json

@@ -157,7 +157,7 @@
         "operationSpace": {
           "$ref": "#/definitions/GeoProperty"
         },
-        "id": {
+        "$id": {
           "type": "string",
           "format": "uri"
         },

schema/EntityList.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://uri.etsi.org/ngsi-ld/schema/EntityList.json",
+  "$id": "https://uri.etsi.org/ngsi-ld/schema/EntityList.json",
   "title": "NGSI-LD EntityList",
   "description": "NGSI-LD EntityList",
   "definitions": {

schema/Entity_keyValues.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://uri.etsi.org/ngsi-ld/schema/Entity_keyValues.json",
+  "$id": "https://uri.etsi.org/ngsi-ld/schema/Entity_keyValues.json",
   "title": "NGSI-LD Entity Key Values",
   "description": "NGSI-LD Entity Simplified Representation",
   "type": "object",
   "properties": {
-    "id": {
+    "$id": {
       "type": "string",
       "format": "uri"
     },

schema/UpdateResult.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://uri.etsi.org/ngsi-ld/schema/UpdateResult.json",
+  "$id": "https://uri.etsi.org/ngsi-ld/schema/UpdateResult.json",
   "title": "NGSI-LD Update Result",
   "description": "NGSI-LD Update Result",
   "definitions": {

schema/common.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json",
+  "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json",
   "title": "NGSI-LD Common Definitions",
   "description": "NGSI-LD Common",
   "definitions": {
@@ -70,7 +70,7 @@
     "EntityInfo": {
       "type": "object",
       "properties": {
-        "id": {
+        "$id": {
           "type": "string",
           "format": "uri"
         },

schema/geometry-schema.json

 {
     "$schema": "http://json-schema.org/draft-04/schema#",
-    "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json",
+    "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/geometry-schema.json",
     "title": "geometry",
     "description": "One geometry as defined by GeoJSON. Licensed as per original source is https://github.com/fge/sample-json-schemas/blob/master/geojson/geometry.json",
     "type": "object",

schema/registrations/ContextSourceNotification.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://uri.etsi.org/ngsi-ld/schema/ContextSourceNotification.json",
+  "$id": "https://uri.etsi.org/ngsi-ld/schema/ContextSourceNotification.json",
   "title": "NGSI-LD Context Source Notification",
   "description": "NGSI-LD Context Source Notification",
   "type": "object",
   "properties": {
-    "id": {
+    "$id": {
       "type": "string",
       "format": "uri"
     },

schema/registrations/ContextSourceRegistration.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/registrations/ContextSourceRegistration.json",
+  "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/registrations/ContextSourceRegistration.json",
   "title": "NGSI-LD Context Source Registration",
   "description": "NGSI-LD Context Source Registration",
   "definitions": {
@@ -116,7 +116,7 @@
         {
           "type": "object",
           "properties": {
-            "id": {
+            "$id": {
               "type": "string",
               "format": "uri"
             },

schema/registrations/ContextSourceRegistrationList.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://uri.etsi.org/ngsi-ld/schema/ContextSourceRegistrationList.json",
+  "$id": "https://uri.etsi.org/ngsi-ld/schema/ContextSourceRegistrationList.json",
   "title": "NGSI-LD Registration List",
   "description": "NGSI-LD Registration List",
   "definitions": {

schema/subscriptions/Notification.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://uri.etsi.org/ngsi-ld/schema/Notification.json",
+  "$id": "https://uri.etsi.org/ngsi-ld/schema/Notification.json",
   "title": "NGSI-LD Notification",
   "description": "NGSI-LD Notification",
   "type": "object",
   "properties": {
-    "id": {
+    "$id": {
       "type": "string",
       "format": "uri"
     },

schema/subscriptions/Subscription.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/subscriptions/Subscription.json",
+  "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/subscriptions/Subscription.json",
   "title": "NGSI-LD Subscription",
   "description": "NGSI-LD Subscription",
   "definitions": {
@@ -132,7 +132,7 @@
         {
           "type": "object",
           "properties": {
-            "id": {
+            "$id": {
               "type": "string",
               "format": "uri"
             },

schema/subscriptions/SubscriptionList.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://uri.etsi.org/ngsi-ld/schema/SubscriptionList.json",
+  "$id": "https://uri.etsi.org/ngsi-ld/schema/SubscriptionList.json",
   "title": "NGSI-LD Subscription List",
   "description": "NGSI-LD Subscription List",
   "definitions": {

schema/temporal/EntityTemporal.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/temporal/EntityTemporal.json",
+  "$id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/temporal/EntityTemporal.json",
   "title": "NGSI-LD Entity",
   "description": "NGSI-LD Temporal Representation of an Entity",
   "definitions": {
@@ -31,7 +31,7 @@
           },
           "minItems": 1
         },
-        "id": {
+        "$id": {
           "type": "string",
           "format": "uri"
         },

schema/temporal/EntityTemporalList.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://uri.etsi.org/ngsi-ld/schema/temporal/EntityTemporalList.json",
+  "$id": "https://uri.etsi.org/ngsi-ld/schema/temporal/EntityTemporalList.json",
   "title": "NGSI-LD Entity",
   "description": "NGSI-LD Temporal Representation List",
   "definitions": {

schema/temporal/Entity_temporalValues.json

 {
   "$schema": "http://json-schema.org/schema#",
-  "id": "https://uri.etsi.org/ngsi-ld/schema/Entity_temporalValues.json",
+  "$id": "https://uri.etsi.org/ngsi-ld/schema/Entity_temporalValues.json",
   "title": "NGSI-LD Entity Temporal Values",
   "description": "NGSI-LD Simplified Temporal Representation of Entities",
   "definitions": {
@@ -83,7 +83,7 @@
   },
   "type": "object",
   "properties": {
-    "id": {
+    "$id": {
       "type": "string",
       "format": "uri"
     },