diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java
index e91bd2bd6..b71fab608 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java
@@ -10328,7 +10328,7 @@ public class VersionConvertor_10_40 {
     for (org.hl7.fhir.dstu2.model.StringType t : src.getContext()) {
       org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
       ec.setType(convertExtensionContext(src.getContextType()));
-      ec.setExpression(t.getValue());
+      ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
     }
     if (src.hasConstrainedType())
       tgt.setType(src.getConstrainedType());
@@ -10407,7 +10407,7 @@ public class VersionConvertor_10_40 {
     for (org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent  t : src.getContext()) {
       if (!tgt.hasContextType())
         tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
-      tgt.addContext(t.getExpression());
+      tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
     }
     tgt.setConstrainedType(src.getType());
     tgt.setBase(src.getBaseDefinition());
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
index 1e57b5ff3..531424689 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
@@ -10387,7 +10387,7 @@ public class VersionConvertor_10_50 {
     for (org.hl7.fhir.dstu2.model.StringType t : src.getContext()) {
       org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
       ec.setType(convertExtensionContext(src.getContextType()));
-      ec.setExpression(t.getValue());
+      ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
     }
     if (src.hasConstrainedType())
       tgt.setType(src.getConstrainedType());
@@ -10466,7 +10466,7 @@ public class VersionConvertor_10_50 {
     for (org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent  t : src.getContext()) {
       if (!tgt.hasContextType())
         tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
-      tgt.addContext(t.getExpression());
+      tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
     }
     tgt.setConstrainedType(src.getType());
     tgt.setBase(src.getBaseDefinition());
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java
index ba8ae9733..8ab5484a6 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java
@@ -5677,7 +5677,7 @@ public class VersionConvertor_14_40 {
     for (org.hl7.fhir.dstu2016may.model.StringType t : src.getContext()) {
       org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
       ec.setType(convertExtensionContext(src.getContextType()));
-      ec.setExpression(convertToR4Expression(t.getValue()));
+      ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
     }
     if (src.getDerivation() == org.hl7.fhir.dstu2016may.model.StructureDefinition.TypeDerivationRule.CONSTRAINT)
       tgt.setType(src.getBaseType());
@@ -5749,7 +5749,7 @@ public class VersionConvertor_14_40 {
     for (org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent  t : src.getContext()) {
       if (!tgt.hasContextType())
         tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
-      tgt.addContext(convertTo2016MayExpression(t.getExpression()));
+      tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
     }
     if (src.hasBaseDefinition())
       tgt.setBaseDefinition(src.getBaseDefinition());
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_50.java
index 748d74076..1eadd0336 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_50.java
@@ -5701,7 +5701,7 @@ public class VersionConvertor_14_50 {
     for (org.hl7.fhir.dstu2016may.model.StringType t : src.getContext()) {
       org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
       ec.setType(convertExtensionContext(src.getContextType()));
-      ec.setExpression(convertToR4Expression(t.getValue()));
+      ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
     }
     if (src.getDerivation() == org.hl7.fhir.dstu2016may.model.StructureDefinition.TypeDerivationRule.CONSTRAINT)
       tgt.setType(src.getBaseType());
@@ -5773,7 +5773,7 @@ public class VersionConvertor_14_50 {
     for (org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent  t : src.getContext()) {
       if (!tgt.hasContextType())
         tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
-      tgt.addContext(convertTo2016MayExpression(t.getExpression()));
+      tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
     }
     if (src.hasBaseDefinition())
       tgt.setBaseDefinition(src.getBaseDefinition());
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java
index 2eb5752c6..59016a7e3 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java
@@ -19216,7 +19216,7 @@ public class VersionConvertor_30_40 {
     for (org.hl7.fhir.dstu3.model.StringType t : src.getContext()) {
       org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
       ec.setType(convertExtensionContext(src.getContextType()));
-      ec.setExpression(t.getValue());
+      ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
     }
     for (org.hl7.fhir.dstu3.model.StringType t : src.getContextInvariant())
       tgt.addContextInvariant(t.getValue());
@@ -19288,7 +19288,7 @@ public class VersionConvertor_30_40 {
     for (org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionContextComponent  t : src.getContext()) {
       if (!tgt.hasContextType())
         tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
-      tgt.addContext(t.getExpression());
+      tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
     }
     for (org.hl7.fhir.r4.model.StringType t : src.getContextInvariant())
       tgt.addContextInvariant(t.getValue());
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java
index 2267bcaef..7eb5cf4dc 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_50.java
@@ -18587,7 +18587,7 @@ public class VersionConvertor_30_50 {
     for (org.hl7.fhir.dstu3.model.StringType t : src.getContext()) {
       org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
       ec.setType(convertExtensionContext(src.getContextType()));
-      ec.setExpression(t.getValue());
+      ec.setExpression("*".equals(t.getValue()) ? "Element" : t.getValue());
     }
     for (org.hl7.fhir.dstu3.model.StringType t : src.getContextInvariant())
       tgt.addContextInvariant(t.getValue());
@@ -18659,7 +18659,7 @@ public class VersionConvertor_30_50 {
     for (org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent  t : src.getContext()) {
       if (!tgt.hasContextType())
         tgt.setContextType(convertExtensionContext(t.getType(), t.getExpression()));
-      tgt.addContext(t.getExpression());
+      tgt.addContext("Element".equals(t.getExpression()) ? "*" : t.getExpression());
     }
     for (org.hl7.fhir.r5.model.StringType t : src.getContextInvariant())
       tgt.addContextInvariant(t.getValue());