diff --git a/addons/ui_units/$PBOPREFIX$ b/addons/ui_units/$PBOPREFIX$
index 2f43e869a7..b93deea9f4 100644
--- a/addons/ui_units/$PBOPREFIX$
+++ b/addons/ui_units/$PBOPREFIX$
@@ -1 +1 @@
-z\ace\addons\units
\ No newline at end of file
+z\ace\addons\ui_units
diff --git a/addons/ui_units/script_component.hpp b/addons/ui_units/script_component.hpp
index e238b9480e..ae1f4abf06 100644
--- a/addons/ui_units/script_component.hpp
+++ b/addons/ui_units/script_component.hpp
@@ -1,14 +1,14 @@
-#define COMPONENT units
+#define COMPONENT ui_units
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
 // #define DISABLE_COMPILE_CACHE
 
-#ifdef DEBUG_ENABLED_UNITS
+#ifdef DEBUG_ENABLED_UI_UNITS
     #define DEBUG_MODE_FULL
 #endif
-    #ifdef DEBUG_SETTINGS_UNITS
-    #define DEBUG_SETTINGS DEBUG_SETTINGS_UNITS
+    #ifdef DEBUG_SETTINGS_UI_UNITS
+    #define DEBUG_SETTINGS DEBUG_SETTINGS_UI_UNITS
 #endif
 
 #define SPEED_KMH 0
diff --git a/addons/ui_units/stringtable.xml b/addons/ui_units/stringtable.xml
index 956ea31e14..add4f44df5 100644
--- a/addons/ui_units/stringtable.xml
+++ b/addons/ui_units/stringtable.xml
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Units">
-        <Key ID="STR_ACE_Units_Module_DisplayName">
+        <Key ID="STR_ACE_UI_UNITS_Module_DisplayName">
             <English>Units</English>
             <German>Maßeinheiten</German>
         </Key>
 
-        <Key ID="STR_ACE_Units_Speed_DisplayName">
+        <Key ID="STR_ACE_UI_UNITS_Speed_DisplayName">
             <English>Speed</English>
             <German>Geschwindigkeit</German>
         </Key>
-        <Key ID="STR_ACE_Units_Speed_Description">
+        <Key ID="STR_ACE_UI_UNITS_Speed_Description">
             <English>Units used to display Speed.</English>
             <German>Maßeinheit, um Geschwindigkeit darzustellen.</German>
         </Key>
 
-        <Key ID="STR_ACE_Units_Alt_DisplayName">
+        <Key ID="STR_ACE_UI_UNITS_Alt_DisplayName">
             <English>Altitude</English>
             <German>Flughöhe</German>
         </Key>
-        <Key ID="STR_ACE_Units_Alt_Description">
+        <Key ID="STR_ACE_UI_UNITS_Alt_Description">
             <English>Units used to display Altitude.</English>
             <German>Maßeinheit, um Flughöhe darzustellen.</German>
         </Key>
 
-        <Key ID="STR_ACE_Units_Land_DisplayName">
+        <Key ID="STR_ACE_UI_UNITS_Land_DisplayName">
             <English>Land Vehicles</English>
             <German>Bodenfahrzeuge</German>
         </Key>
 
-        <Key ID="STR_ACE_Units_Speed_KMH">
+        <Key ID="STR_ACE_UI_UNITS_Speed_KMH">
             <English>km/h</English>
             <German>km/h</German>
         </Key>
-        <Key ID="STR_ACE_Units_Speed_MPH">
+        <Key ID="STR_ACE_UI_UNITS_Speed_MPH">
             <English>mph</English>
              <German>mph</German>
         </Key>
-        <Key ID="STR_ACE_Units_Speed_KNOT">
+        <Key ID="STR_ACE_UI_UNITS_Speed_KNOT">
             <English>kn</English>
             <German>kn</German>
         </Key>
-        <Key ID="STR_ACE_Units_Speed_MS">
+        <Key ID="STR_ACE_UI_UNITS_Speed_MS">
             <English>m/s</English>
              <German>m/s</German>
         </Key>
 
-        <Key ID="STR_ACE_Units_Alt_M">
+        <Key ID="STR_ACE_UI_UNITS_Alt_M">
             <English>Meters</English>
             <German>Meter</German>
         </Key>
-        <Key ID="STR_ACE_Units_Alt_F">
+        <Key ID="STR_ACE_UI_UNITS_Alt_F">
             <English>Feet</English>
             <German>Fuß</German>
         </Key>