From 1151b6feb2224b2ddba0b35b526a32aaaa45dea7 Mon Sep 17 00:00:00 2001
From: Octavian Patrascoiu <opatrascoiu@yahoo.com>
Date: Mon, 1 Jul 2024 13:19:25 +0100
Subject: [PATCH] [#684] Metadata: Fox the namespace for FEEL types

---
 .../main/java/com/gs/dmn/QualifiedName.java   | 15 +++++
 .../expected/java/dmn/DMNMetadata.json        | 18 +++---
 .../expected/java/dmn/DMNMetadata.json        | 18 +++---
 .../expected/java/dmn/DMNMetadata.json        | 18 +++---
 .../expected/java/dmn/DMNMetadata.json        | 34 +++++------
 .../expected/java/dmn/DMNMetadata.json        | 34 +++++------
 .../expected/java/dmn/DMNMetadata.json        | 20 +++----
 .../expected/java/dmn/DMNMetadata.json        | 10 ++--
 .../expected/java/dmn/DMNMetadata.json        | 10 ++--
 .../expected/java/dmn/DMNMetadata.json        |  6 +-
 .../expected/java/dmn/DMNMetadata.json        |  6 +-
 .../expected/java/dmn/DMNMetadata.json        | 12 ++--
 .../expected/java/dmn/DMNMetadata.json        |  6 +-
 .../expected/java/dmn/DMNMetadata.json        |  4 +-
 .../expected/java/dmn/DMNMetadata.json        | 50 ++++++++--------
 .../expected/java/dmn/DMNMetadata.json        | 58 +++++++++----------
 .../expected/java/dmn/DMNMetadata.json        | 22 +++----
 17 files changed, 178 insertions(+), 163 deletions(-)

diff --git a/dmn-core/src/main/java/com/gs/dmn/QualifiedName.java b/dmn-core/src/main/java/com/gs/dmn/QualifiedName.java
index f0da02595..bab1599e5 100644
--- a/dmn-core/src/main/java/com/gs/dmn/QualifiedName.java
+++ b/dmn-core/src/main/java/com/gs/dmn/QualifiedName.java
@@ -14,6 +14,8 @@
 
 import com.gs.dmn.ast.TDefinitions;
 import com.gs.dmn.ast.TImport;
+import com.gs.dmn.ast.TItemDefinition;
+import com.gs.dmn.feel.analysis.semantics.type.FEELTypes;
 import com.gs.dmn.serialization.DMNVersion;
 
 import javax.xml.namespace.QName;
@@ -34,6 +36,7 @@ public static QualifiedName toQualifiedName(TDefinitions model, String qName) {
         if (qName == null || qName.isEmpty()) {
             return null;
         }
+        // Check the FEEL prefix
         if (qName.startsWith(DMNVersion.LATEST.getFeelPrefix() + ".")) {
             String prefix = DMNVersion.LATEST.getFeelPrefix();
             String localPart = qName.substring(qName.indexOf('.') + 1);
@@ -42,6 +45,7 @@ public static QualifiedName toQualifiedName(TDefinitions model, String qName) {
         if (model == null) {
             return new QualifiedName(null, qName);
         } else {
+            // Check the imports
             for (TImport import_: model.getImport()) {
                 String importName = import_.getName();
                 if (qName.startsWith(importName + '.')) {
@@ -49,6 +53,17 @@ public static QualifiedName toQualifiedName(TDefinitions model, String qName) {
                     return new QualifiedName(importName, localPart);
                 }
             }
+            // Check the types defined in the model
+            for (TItemDefinition itemDefinition: model.getItemDefinition()) {
+                if (itemDefinition.getName().equals(qName)) {
+                    return new QualifiedName(null, qName);
+                }
+            }
+            // Check the FEEL types
+            if (FEELTypes.FEEL_TYPE_NAMES.contains(qName)) {
+                return new QualifiedName(DMNVersion.LATEST.getFeelPrefix(), qName);
+            }
+
             return new QualifiedName(null, qName);
         }
     }
diff --git a/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/DMNMetadata.json
index 2099cdb2e..bd781d811 100644
--- a/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/DMNMetadata.json
@@ -30,12 +30,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b1"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -62,12 +62,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b1"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -94,12 +94,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b2"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -128,12 +128,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "Any",
-      "namespace" : "http://www.provider.com/definitions/model-c"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -145,7 +145,7 @@
     "namespace" : "http://www.provider.com/definitions/model-a",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-a"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ]
 }
\ No newline at end of file
diff --git a/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
index 2f41a6b33..fe9916f0f 100644
--- a/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
@@ -30,12 +30,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b1"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -62,12 +62,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b1"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -94,12 +94,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b2"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -128,12 +128,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "Any",
-      "namespace" : "http://www.provider.com/definitions/model-c"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -145,7 +145,7 @@
     "namespace" : "http://www.provider.com/definitions/model-a",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-a"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ]
 }
\ No newline at end of file
diff --git a/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
index eae0d5792..083ff5c21 100644
--- a/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
@@ -30,12 +30,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b1"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -62,12 +62,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b1"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -94,12 +94,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b2"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -128,12 +128,12 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "Any",
-      "namespace" : "http://www.provider.com/definitions/model-c"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -145,7 +145,7 @@
     "namespace" : "http://www.provider.com/definitions/model-a",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-a"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ]
 }
\ No newline at end of file
diff --git a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/DMNMetadata.json
index afd775014..995f81d38 100644
--- a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/DMNMetadata.json
@@ -18,7 +18,7 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -28,7 +28,7 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {
@@ -39,7 +39,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "referenceType",
@@ -49,7 +49,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ],
   "elements" : [ {
@@ -61,7 +61,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs",
     "typeRef" : {
       "localName" : "date",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -72,7 +72,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs",
     "typeRef" : {
       "localName" : "date",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -83,7 +83,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -94,7 +94,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -130,12 +130,12 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs",
       "typeRef" : {
         "localName" : "date",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "boolean",
-      "namespace" : "http://www.provider.com/definitions/decisions"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -162,7 +162,7 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs",
       "typeRef" : {
         "localName" : "date",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -173,12 +173,12 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs",
       "typeRef" : {
         "localName" : "date",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "boolean",
-      "namespace" : "http://www.provider.com/definitions/decisions"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -208,7 +208,7 @@
     } ],
     "typeRef" : {
       "localName" : "boolean",
-      "namespace" : "http://www.provider.com/definitions/decisions"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -237,7 +237,7 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -248,7 +248,7 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -264,7 +264,7 @@
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/decisions"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ]
 }
\ No newline at end of file
diff --git a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
index 481aeed5a..33b91f489 100644
--- a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
@@ -18,7 +18,7 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs-1",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs-1"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -28,7 +28,7 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs-1",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs-1"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {
@@ -39,7 +39,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs-1",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs-1"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "referenceType",
@@ -49,7 +49,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs-1",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs-1"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ],
   "elements" : [ {
@@ -61,7 +61,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs-1",
     "typeRef" : {
       "localName" : "date",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs-1"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -72,7 +72,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs-1",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs-1"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -83,7 +83,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs-1",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs-1"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -105,7 +105,7 @@
     "namespace" : "http://www.provider.com/definitions/decision-inputs-2",
     "typeRef" : {
       "localName" : "date",
-      "namespace" : "http://www.provider.com/definitions/decision-inputs-2"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -130,12 +130,12 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs-1",
       "typeRef" : {
         "localName" : "date",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs-1"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "boolean",
-      "namespace" : "http://www.provider.com/definitions/decisions"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -162,7 +162,7 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs-1",
       "typeRef" : {
         "localName" : "date",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs-1"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -173,12 +173,12 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs-2",
       "typeRef" : {
         "localName" : "date",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs-2"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "boolean",
-      "namespace" : "http://www.provider.com/definitions/decisions"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -208,7 +208,7 @@
     } ],
     "typeRef" : {
       "localName" : "boolean",
-      "namespace" : "http://www.provider.com/definitions/decisions"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -237,7 +237,7 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs-1",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs-1"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -248,7 +248,7 @@
       "namespace" : "http://www.provider.com/definitions/decision-inputs-1",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.provider.com/definitions/decision-inputs-1"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -264,7 +264,7 @@
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/decisions"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ]
 }
\ No newline at end of file
diff --git a/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/DMNMetadata.json
index e375ac46f..65dc93ff3 100644
--- a/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/DMNMetadata.json
@@ -14,7 +14,7 @@
     "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -39,12 +39,12 @@
       "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -69,12 +69,12 @@
       "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.trisotech.com/definitions/_2a1d771a-a899-4fef-abd6-fc894332337c"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -99,12 +99,12 @@
       "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.trisotech.com/definitions/_9d46ece4-a96c-4cb0-abc0-0ca121ac3768"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -131,7 +131,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -142,12 +142,12 @@
       "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.trisotech.com/definitions/_ae5b3c17-1ac3-4e1d-b4f9-2cf861aec6d9"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "Any",
-      "namespace" : "http://www.trisotech.com/definitions/_10435dcd-8774-4575-a338-49dd554a0928"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ]
 }
\ No newline at end of file
diff --git a/dmn-test-cases/standard/composite/1.2/0007-name-conflicts-same-decision-singleton/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/composite/1.2/0007-name-conflicts-same-decision-singleton/translator/expected/java/dmn/DMNMetadata.json
index 94ca3a3b2..bf616864b 100644
--- a/dmn-test-cases/standard/composite/1.2/0007-name-conflicts-same-decision-singleton/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/composite/1.2/0007-name-conflicts-same-decision-singleton/translator/expected/java/dmn/DMNMetadata.json
@@ -15,7 +15,7 @@
     "namespace" : "http://www.provider.com/definitions/model-a",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-a"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -27,7 +27,7 @@
     "namespace" : "http://www.provider.com/definitions/model-b",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -56,7 +56,7 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -68,12 +68,12 @@
       "namespace" : "http://www.provider.com/definitions/model-b",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "Any",
-      "namespace" : "http://www.provider.com/definitions/model-c"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ]
 }
\ No newline at end of file
diff --git a/dmn-test-cases/standard/composite/1.2/0008-name-conflicts-same-decision-no-singleton/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/composite/1.2/0008-name-conflicts-same-decision-no-singleton/translator/expected/java/dmn/DMNMetadata.json
index 27daf2e64..11cef19d7 100644
--- a/dmn-test-cases/standard/composite/1.2/0008-name-conflicts-same-decision-no-singleton/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/composite/1.2/0008-name-conflicts-same-decision-no-singleton/translator/expected/java/dmn/DMNMetadata.json
@@ -15,7 +15,7 @@
     "namespace" : "http://www.provider.com/definitions/model-a",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-a"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -27,7 +27,7 @@
     "namespace" : "http://www.provider.com/definitions/model-b",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -68,7 +68,7 @@
       "namespace" : "http://www.provider.com/definitions/model-a",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-a"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -80,12 +80,12 @@
       "namespace" : "http://www.provider.com/definitions/model-b",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.provider.com/definitions/model-b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "Any",
-      "namespace" : "http://www.provider.com/definitions/model-c"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ]
 }
\ No newline at end of file
diff --git a/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
index da6a42dfa..742e54cf1 100644
--- a/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
@@ -12,7 +12,7 @@
     "namespace" : "http://www.provider.com/definitions/model-a",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.provider.com/definitions/model-a"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "referenceType",
@@ -22,7 +22,7 @@
     "namespace" : "http://www.provider.com/definitions/model-a",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-a"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "referenceType",
@@ -32,7 +32,7 @@
     "namespace" : "http://www.provider.com/definitions/model-b",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ],
   "elements" : [ {
diff --git a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
index c00395f7f..6607c3663 100644
--- a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/DMNMetadata.json
@@ -12,7 +12,7 @@
     "namespace" : "http://www.provider.com/definitions/model-a",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.provider.com/definitions/model-a"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "referenceType",
@@ -22,7 +22,7 @@
     "namespace" : "http://www.provider.com/definitions/model-a",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-a"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "referenceType",
@@ -32,7 +32,7 @@
     "namespace" : "http://www.provider.com/definitions/model-b",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.provider.com/definitions/model-b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ],
   "elements" : [ {
diff --git a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/DMNMetadata.json
index 4af969ea3..766928c26 100644
--- a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/DMNMetadata.json
@@ -18,7 +18,7 @@
       "namespace" : "https://kiegroup.org/dmn/_BD539849-95A1-4D71-BA89-8901271CEB07",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "https://kiegroup.org/dmn/_BD539849-95A1-4D71-BA89-8901271CEB07"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -28,7 +28,7 @@
       "namespace" : "https://kiegroup.org/dmn/_BD539849-95A1-4D71-BA89-8901271CEB07",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "https://kiegroup.org/dmn/_BD539849-95A1-4D71-BA89-8901271CEB07"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   } ],
@@ -41,7 +41,7 @@
     "namespace" : "https://kiegroup.org/dmn/_BD539849-95A1-4D71-BA89-8901271CEB07",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "https://kiegroup.org/dmn/_BD539849-95A1-4D71-BA89-8901271CEB07"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -82,7 +82,7 @@
     } ],
     "typeRef" : {
       "localName" : "Any",
-      "namespace" : "https://kiegroup.org/dmn/_BD539849-95A1-4D71-BA89-8901271CEB07"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -109,7 +109,7 @@
       "namespace" : "https://kiegroup.org/dmn/_BD539849-95A1-4D71-BA89-8901271CEB07",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "https://kiegroup.org/dmn/_BD539849-95A1-4D71-BA89-8901271CEB07"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -125,7 +125,7 @@
     } ],
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "https://kiegroup.org/dmn/_BD539849-95A1-4D71-BA89-8901271CEB07"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ]
 }
\ No newline at end of file
diff --git a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/DMNMetadata.json
index aa7669ac0..82387420d 100644
--- a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/DMNMetadata.json
@@ -18,7 +18,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.trisotech.com/definitions/_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -28,7 +28,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.trisotech.com/definitions/_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   } ],
@@ -71,7 +71,7 @@
     } ],
     "typeRef" : {
       "localName" : "boolean",
-      "namespace" : "http://www.trisotech.com/definitions/_92a0c25f-707e-4fc8-ae2d-2ab51ebe6bb6"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ]
 }
\ No newline at end of file
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/DMNMetadata.json
index 35e948aee..1282b143d 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/DMNMetadata.json
@@ -16,7 +16,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0076-feel-external-java",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0076-feel-external-java"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -25,7 +25,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0076-feel-external-java",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0076-feel-external-java"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   } ],
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/DMNMetadata.json
index 6de2c59d4..32666888e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/DMNMetadata.json
@@ -12,7 +12,7 @@
     "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "compositeType",
@@ -26,7 +26,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -36,7 +36,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -45,7 +45,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
       "typeRef" : {
         "localName" : "boolean",
-        "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -55,7 +55,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "compositeType",
@@ -69,7 +69,7 @@
         "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
         "typeRef" : {
           "localName" : "number",
-          "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+          "namespace" : "http://www.omg.org/spec/FEEL/20140401"
         }
       }, {
         "@kind" : "referenceType",
@@ -78,7 +78,7 @@
         "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
         "typeRef" : {
           "localName" : "number",
-          "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+          "namespace" : "http://www.omg.org/spec/FEEL/20140401"
         }
       }, {
         "@kind" : "referenceType",
@@ -87,7 +87,7 @@
         "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
         "typeRef" : {
           "localName" : "number",
-          "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+          "namespace" : "http://www.omg.org/spec/FEEL/20140401"
         }
       } ]
     } ]
@@ -99,7 +99,7 @@
     "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "compositeType",
@@ -113,7 +113,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
       "typeRef" : {
         "localName" : "boolean",
-        "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -123,7 +123,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {
@@ -134,7 +134,7 @@
     "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "compositeType",
@@ -148,7 +148,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -158,7 +158,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -167,7 +167,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "referenceType",
@@ -176,7 +176,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {
@@ -187,7 +187,7 @@
     "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "referenceType",
@@ -197,7 +197,7 @@
     "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "referenceType",
@@ -207,7 +207,7 @@
     "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ],
   "elements" : [ {
@@ -252,7 +252,7 @@
     "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "bkm",
@@ -388,7 +388,7 @@
       "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
@@ -427,7 +427,7 @@
     } ],
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -570,7 +570,7 @@
     } ],
     "typeRef" : {
       "localName" : "boolean",
-      "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -668,7 +668,7 @@
     } ],
     "typeRef" : {
       "localName" : "boolean",
-      "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -738,7 +738,7 @@
     } ],
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.trisotech.com/definitions/_4e0f0b70-d31c-471c-bd52-5ca709ed362b"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DMNMetadata.json
index df4dc10a2..6d28fe238 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DMNMetadata.json
@@ -14,7 +14,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -25,7 +25,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -36,7 +36,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -47,7 +47,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -58,7 +58,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -69,7 +69,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -80,7 +80,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -150,7 +150,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {
@@ -256,7 +256,7 @@
     "transitiveRequiredInput" : [ ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -288,7 +288,7 @@
     "transitiveRequiredInput" : [ ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -337,7 +337,7 @@
     "transitiveRequiredInput" : [ ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -385,7 +385,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -396,12 +396,12 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -418,7 +418,7 @@
     "transitiveRequiredInput" : [ ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -435,7 +435,7 @@
     "transitiveRequiredInput" : [ ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -483,7 +483,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     }, {
       "@kind" : "inputData",
@@ -494,12 +494,12 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -516,7 +516,7 @@
     "transitiveRequiredInput" : [ ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -533,7 +533,7 @@
     "transitiveRequiredInput" : [ ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -564,7 +564,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {
@@ -592,12 +592,12 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -614,7 +614,7 @@
     "transitiveRequiredInput" : [ ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -645,7 +645,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {
@@ -673,12 +673,12 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "decision",
@@ -695,7 +695,7 @@
     "transitiveRequiredInput" : [ ],
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0085-decision-services"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ]
 }
\ No newline at end of file
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DMNMetadata.json b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DMNMetadata.json
index 1f0b0a35f..75180bf07 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DMNMetadata.json
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DMNMetadata.json
@@ -31,7 +31,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "referenceType",
@@ -40,7 +40,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   } ],
   "elements" : [ {
@@ -52,7 +52,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -63,7 +63,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -74,7 +74,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda",
     "typeRef" : {
       "localName" : "number",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "inputData",
@@ -85,7 +85,7 @@
     "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda",
     "typeRef" : {
       "localName" : "string",
-      "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda"
+      "namespace" : "http://www.omg.org/spec/FEEL/20140401"
     }
   }, {
     "@kind" : "bkm",
@@ -360,7 +360,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {
@@ -386,7 +386,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {
@@ -514,7 +514,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {
@@ -582,7 +582,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda",
       "typeRef" : {
         "localName" : "number",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {
@@ -612,7 +612,7 @@
       "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda",
       "typeRef" : {
         "localName" : "string",
-        "namespace" : "http://www.montera.com.au/spec/DMN/0092-feel-lambda"
+        "namespace" : "http://www.omg.org/spec/FEEL/20140401"
       }
     } ]
   }, {