diff --git a/data/types/expectations/entity-type-023-01-01-expectation.json b/data/types/expectations/entity-type-023-01-01-expectation.json
index 313f19dd0b08fd902592525d3c1f03e124d33f31..e938df4f397b293567d3b36d43c93072b8404a19 100644
--- a/data/types/expectations/entity-type-023-01-01-expectation.json
+++ b/data/types/expectations/entity-type-023-01-01-expectation.json
@@ -11,9 +11,9 @@
       ]
    },
    {
-      "id":"https://uri.etsi.org/ngsi-ld/default-context/Vehicle",
+      "id":"https://ngsi-ld-test-suite/context#Vehicle",
       "type":"EntityType",
-      "typeName":"Vehicle",
+      "typeName":"https://ngsi-ld-test-suite/context#Vehicle",
       "attributeNames":[
          "https://ngsi-ld-test-suite/context#brandName",
          "isParked"
diff --git a/data/types/expectations/entity-type-023-01-02-expectation.json b/data/types/expectations/entity-type-023-01-02-expectation.json
index a268dc812fa0ec0ac67bb2f4b1cc6ed4f64b5c97..8ccb9903d8c5b953b404008aa13745151793e17e 100644
--- a/data/types/expectations/entity-type-023-01-02-expectation.json
+++ b/data/types/expectations/entity-type-023-01-02-expectation.json
@@ -11,7 +11,7 @@
       ]
    },
    {
-      "id":"https://uri.etsi.org/ngsi-ld/default-context/Vehicle",
+      "id":"https://ngsi-ld-test-suite/context#Vehicle",
       "type":"EntityType",
       "typeName":"Vehicle",
       "attributeNames":[
diff --git a/data/types/expectations/entity-type-list-022-01-01-expectation.json b/data/types/expectations/entity-type-list-022-01-01-expectation.json
index f10697082a3583e9f88e20a3e4f70cbe5d08facf..9b60d3bb06c87ed54e77880f7130721faae96d64 100644
--- a/data/types/expectations/entity-type-list-022-01-01-expectation.json
+++ b/data/types/expectations/entity-type-list-022-01-01-expectation.json
@@ -3,6 +3,6 @@
     "type": "EntityTypeList",
     "typeList": [
         "https://ngsi-ld-test-suite/context#Building",
-        "Vehicle"
+        "https://ngsi-ld-test-suite/context#Vehicle"
     ]
 }
\ No newline at end of file