diff --git a/schema/BatchOperationResult.json b/schema/BatchOperationResult.json
index 7f6fd2cb8ed633acdbb32e18fe83998c4645fb69..d2d8f94e5168828db0de9ad8bf574ba10babcbdc 100644
--- a/schema/BatchOperationResult.json
+++ b/schema/BatchOperationResult.json
@@ -1,6 +1,6 @@
 {
   "$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": {
diff --git a/schema/Entity.json b/schema/Entity.json
index ad4da554b1be1996b20b17e3a2eb8ce6512961de..f8f4c7c7f976966f10ce130a1fb5f4560bc4f804 100644
--- a/schema/Entity.json
+++ b/schema/Entity.json
@@ -157,7 +157,7 @@
         "operationSpace": {
           "$ref": "#/definitions/GeoProperty"
         },
-        "id": {
+        "$id": {
           "type": "string",
           "format": "uri"
         },
diff --git a/schema/EntityList.json b/schema/EntityList.json
index 94d1c479a0a2fee78f89f70c29922ded6ac82eac..f71f57e4d3db2933912e69f68d0bae10e36c543e 100644
--- a/schema/EntityList.json
+++ b/schema/EntityList.json
@@ -1,6 +1,6 @@
 {
   "$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": {
diff --git a/schema/Entity_keyValues.json b/schema/Entity_keyValues.json
index a1f88391dd55967e9863d69a29c7496fa939d2d9..3b5af99847b937c94de2ed51458e613096c8c301 100644
--- a/schema/Entity_keyValues.json
+++ b/schema/Entity_keyValues.json
@@ -1,11 +1,11 @@
 {
   "$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"
     },
diff --git a/schema/UpdateResult.json b/schema/UpdateResult.json
index bd9eac2c44952d6acac555f8dcfef1457719264d..cba48d95c18ca9085b6737751189ffe77d7dda86 100644
--- a/schema/UpdateResult.json
+++ b/schema/UpdateResult.json
@@ -1,6 +1,6 @@
 {
   "$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": {
diff --git a/schema/common.json b/schema/common.json
index 0d7c0782431677c444b1548367e032bd7746d86b..32a485759d87347792ffbe595c424c7abcb161ef 100644
--- a/schema/common.json
+++ b/schema/common.json
@@ -1,6 +1,6 @@
 {
   "$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"
         },
diff --git a/schema/geometry-schema.json b/schema/geometry-schema.json
index ff32991e6dee140dfba6ee8722bcab3d6f586196..328bb09be6ffec59d70c35522ccfb3436ca99eb8 100644
--- a/schema/geometry-schema.json
+++ b/schema/geometry-schema.json
@@ -1,6 +1,6 @@
 {
     "$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",
diff --git a/schema/registrations/ContextSourceNotification.json b/schema/registrations/ContextSourceNotification.json
index 5c5082cc685e9bc1587fe986104ac694c6a6b388..8cc970d34aa413cee13e36cbcf8f8a16fe45636c 100644
--- a/schema/registrations/ContextSourceNotification.json
+++ b/schema/registrations/ContextSourceNotification.json
@@ -1,11 +1,11 @@
 {
   "$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"
     },
diff --git a/schema/registrations/ContextSourceRegistration.json b/schema/registrations/ContextSourceRegistration.json
index 75ee7bf90c97334d921067d14ea7d6ffff972885..398b18656bf8e5e634efab4c66d600a2a8fe72d9 100644
--- a/schema/registrations/ContextSourceRegistration.json
+++ b/schema/registrations/ContextSourceRegistration.json
@@ -1,6 +1,6 @@
 {
   "$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"
             },
diff --git a/schema/registrations/ContextSourceRegistrationList.json b/schema/registrations/ContextSourceRegistrationList.json
index 243d391425309f18a20bf294a25ca24b1fcbadae..72400b922830da98ecb612f4523e0b4ec870a400 100644
--- a/schema/registrations/ContextSourceRegistrationList.json
+++ b/schema/registrations/ContextSourceRegistrationList.json
@@ -1,6 +1,6 @@
 {
   "$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": {
diff --git a/schema/subscriptions/Notification.json b/schema/subscriptions/Notification.json
index 6d27e502977ccc07c84cc848063f043b1f957c88..f4a4fbabd92801784d3514089328bf93b7cee934 100644
--- a/schema/subscriptions/Notification.json
+++ b/schema/subscriptions/Notification.json
@@ -1,11 +1,11 @@
 {
   "$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"
     },
diff --git a/schema/subscriptions/Subscription.json b/schema/subscriptions/Subscription.json
index 79022bf9344592a9b7da312fa95a5d6c78721856..b769668675f49936496cbc7726040256c0134156 100644
--- a/schema/subscriptions/Subscription.json
+++ b/schema/subscriptions/Subscription.json
@@ -1,6 +1,6 @@
 {
   "$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"
             },
diff --git a/schema/subscriptions/SubscriptionList.json b/schema/subscriptions/SubscriptionList.json
index 5c046bbb2a5a5ae025d162d2fcdd7723359c1a7c..a4dcad46bac869cf081747f0ba89eb7d27275202 100644
--- a/schema/subscriptions/SubscriptionList.json
+++ b/schema/subscriptions/SubscriptionList.json
@@ -1,6 +1,6 @@
 {
   "$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": {
diff --git a/schema/temporal/EntityTemporal.json b/schema/temporal/EntityTemporal.json
index 2064ee759a1eb44d0b619b5df4d1344cabdb6a58..f5c64909da45be9abb718e8f470a0f4803202026 100644
--- a/schema/temporal/EntityTemporal.json
+++ b/schema/temporal/EntityTemporal.json
@@ -1,6 +1,6 @@
 {
   "$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"
         },
diff --git a/schema/temporal/EntityTemporalList.json b/schema/temporal/EntityTemporalList.json
index f4e65a3cf9e8d8d0dfb255acd9a3bae0213edbda..540f6651c97e4d2be68023e42289605c136eab68 100644
--- a/schema/temporal/EntityTemporalList.json
+++ b/schema/temporal/EntityTemporalList.json
@@ -1,6 +1,6 @@
 {
   "$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": {
diff --git a/schema/temporal/Entity_temporalValues.json b/schema/temporal/Entity_temporalValues.json
index 103904a0c3d586c52fe5698a8b60f22b16c124cb..a06e22aa2ea66e9da44c79a5410fdc0acc43894f 100644
--- a/schema/temporal/Entity_temporalValues.json
+++ b/schema/temporal/Entity_temporalValues.json
@@ -1,6 +1,6 @@
 {
   "$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"
     },