diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
index 24490efe76..7ace5b4d2c 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/i18n/I18nProviderImpl.java
@@ -153,10 +153,10 @@ public class I18nProviderImpl
 
         final SystemOfUnits newMeasurementSystem;
         switch (ms) {
-            case "SI":
+            case SIUnits.MEASUREMENT_SYSTEM_NAME:
                 newMeasurementSystem = SIUnits.getInstance();
                 break;
-            case "US":
+            case ImperialUnits.MEASUREMENT_SYSTEM_NAME:
                 newMeasurementSystem = ImperialUnits.getInstance();
                 break;
             default:
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/ImperialUnits.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/ImperialUnits.java
index 7c642052c8..8493dafa25 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/ImperialUnits.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/ImperialUnits.java
@@ -39,6 +39,8 @@ import tec.uom.se.unit.Units;
 @NonNullByDefault
 public final class ImperialUnits extends CustomUnits {
 
+    public static final String MEASUREMENT_SYSTEM_NAME = "US";
+
     private static final ImperialUnits INSTANCE = new ImperialUnits();
 
     /** Additionally defined units to be used in openHAB **/
@@ -110,4 +112,9 @@ public final class ImperialUnits extends CustomUnits {
         INSTANCE.units.add(unit);
         return unit;
     }
+
+    @Override
+    public String getName() {
+        return MEASUREMENT_SYSTEM_NAME;
+    }
 }
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SIUnits.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SIUnits.java
index c6a1db375c..a82b4cdcc3 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SIUnits.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/library/unit/SIUnits.java
@@ -36,6 +36,8 @@ import tec.uom.se.unit.Units;
 @NonNullByDefault
 public final class SIUnits extends CustomUnits {
 
+    public static final String MEASUREMENT_SYSTEM_NAME = "SI";
+
     private static final SIUnits INSTANCE = new SIUnits();
 
     public static final Unit<Temperature> CELSIUS = addUnit(Units.CELSIUS);
@@ -75,4 +77,9 @@ public final class SIUnits extends CustomUnits {
         INSTANCE.units.add(unit);
         return unit;
     }
+
+    @Override
+    public String getName() {
+        return MEASUREMENT_SYSTEM_NAME;
+    }
 }