diff --git a/staging/opcua/v0.1/context.jsonld b/staging/opcua/v0.1/context.jsonld
index 8c47663..3609c80 100644
--- a/staging/opcua/v0.1/context.jsonld
+++ b/staging/opcua/v0.1/context.jsonld
@@ -21,8 +21,8 @@
         "@id": "http://www.w3.org/XML/1998/namespace",
         "@prefix": true
       },
-      "uaentities": {
-        "@id": "http://demo.machine/entities/",
+      "uaentity": {
+        "@id": "http://demo.machine/entity/",
         "@prefix": true
       },
       "ngsi-ld": {
diff --git a/staging/opcua/v0.1/context2.jsonld b/staging/opcua/v0.1/context2.jsonld
deleted file mode 100644
index 3609c80..0000000
--- a/staging/opcua/v0.1/context2.jsonld
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "@context": [
-    {
-      "owl": {
-        "@id": "http://www.w3.org/2002/07/owl#",
-        "@prefix": true
-      },
-      "rdf": {
-        "@id": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
-        "@prefix": true
-      },
-      "rdfs": {
-        "@id": "http://www.w3.org/2000/01/rdf-schema#",
-        "@prefix": true
-      },
-      "xsd": {
-        "@id": "http://www.w3.org/2001/XMLSchema#",
-        "@prefix": true
-      },
-      "xml": {
-        "@id": "http://www.w3.org/XML/1998/namespace",
-        "@prefix": true
-      },
-      "uaentity": {
-        "@id": "http://demo.machine/entity/",
-        "@prefix": true
-      },
-      "ngsi-ld": {
-        "@id": "https://uri.etsi.org/ngsi-ld/",
-        "@prefix": true
-      },
-      "base": {
-        "@id": "https://industryfusion.github.io/contexts/ontology/v0/base/",
-        "@prefix": true
-      },
-      "opcua": {
-        "@id": "http://opcfoundation.org/UA/",
-        "@prefix": true
-      },
-      "mixingmachine_demo": {
-        "@id": "http://capgemini.com/SimpleInstance/",
-        "@prefix": true
-      },
-      "mixingmachine": {
-        "@id": "http://capgemini.com/Machines/",
-        "@prefix": true
-      },
-      "machinery": {
-        "@id": "http://opcfoundation.org/UA/Machinery/",
-        "@prefix": true
-      },
-      "pumps": {
-        "@id": "http://opcfoundation.org/UA/Pumps/",
-        "@prefix": true
-      },
-      "pr_gt": {
-        "@id": "http://opcfoundation.org/UA/PlasticsRubber/GeneralTypes/",
-        "@prefix": true
-      },
-      "pr_extrusionv2_extruder_gt": {
-        "@id": "http://opcfoundation.org/UA/PlasticsRubber/Extrusion_v2/Extruder/",
-        "@prefix": true
-      },
-      "devices": {
-        "@id": "http://opcfoundation.org/UA/DI/",
-        "@prefix": true
-      },
-      "pr_extrusionv2_gt": {
-        "@id": "http://opcfoundation.org/UA/PlasticsRubber/Extrusion_v2/GeneralTypes/",
-        "@prefix": true
-      },
-      "shacl": {
-        "@id": "http://demo.machine/shacl/",
-        "@prefix": true
-      },
-      "sh": {
-        "@id": "http://www.w3.org/ns/shacl#",
-        "@prefix": true
-      },
-      "knowledge": {
-        "@id": "http://demo.machine/knowledge/",
-        "@prefix": true
-      }
-    },
-    "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
-  ]
-}
\ No newline at end of file