diff --git a/addons/javelin/$PBOPREFIX$ b/addons/javelin/$PBOPREFIX$
index 311c0dad43..3497b9aaf6 100644
--- a/addons/javelin/$PBOPREFIX$
+++ b/addons/javelin/$PBOPREFIX$
@@ -1 +1 @@
-z\ace\addons\wep_javelin
\ No newline at end of file
+z\ace\addons\javelin
\ No newline at end of file
diff --git a/addons/javelin/README.md b/addons/javelin/README.md
index df3ad9b29d..cfa7a4cd5d 100644
--- a/addons/javelin/README.md
+++ b/addons/javelin/README.md
@@ -1,4 +1,4 @@
-ace_wep_javelin
+ace_javelin
 ===============
 
 Adds the Javelin AT launcher.
diff --git a/addons/javelin/RscInGameUI.hpp b/addons/javelin/RscInGameUI.hpp
index 457c7ac414..dd50558a5d 100644
--- a/addons/javelin/RscInGameUI.hpp
+++ b/addons/javelin/RscInGameUI.hpp
@@ -28,10 +28,10 @@ class RscInGameUI {
         
         class ACE_TargetingConstrains: RscControlsGroup {
             idc = 699100;
-            x = "SafezoneX";
-            y = "SafezoneY";
-            w = "SafezoneW-SafezoneX";
-            h = "SafezoneH-SafezoneY";
+            x = "SafezoneX-SafezoneW";
+            y = "SafezoneY-SafezoneH";
+            w = "SafezoneW";
+            h = "SafezoneH";
             enabled = 0;
             class VScrollbar {
                 autoScrollSpeed = -1;
diff --git a/addons/javelin/functions/script_component.hpp b/addons/javelin/functions/script_component.hpp
index fdc194ff7b..21c6597c86 100644
--- a/addons/javelin/functions/script_component.hpp
+++ b/addons/javelin/functions/script_component.hpp
@@ -1 +1 @@
-#include "\z\ace\addons\wep_javelin\script_component.hpp"
\ No newline at end of file
+#include "\z\ace\addons\javelin\script_component.hpp"
\ No newline at end of file
diff --git a/addons/javelin/initKeybinds.sqf b/addons/javelin/initKeybinds.sqf
index 126b1395a3..6634b1f623 100644
--- a/addons/javelin/initKeybinds.sqf
+++ b/addons/javelin/initKeybinds.sqf
@@ -1,6 +1,6 @@
 // by commy2
 
-["ACE3", QGVAR(lockTarget), localize "STR_ACE_WEP_JAVELIN_LockTarget",
+["ACE3", QGVAR(lockTarget), localize "STR_ACE_JAVELIN_LockTarget",
 {
     if (GETGVAR(isLockKeyDown,false)) exitWith {false};
     
@@ -21,7 +21,7 @@
 },
 [15, [false, false, false]], false] call cba_fnc_addKeybind;  //Tab Key
 
-["ACE3", QGVAR(cycleFireMode), localize "STR_ACE_WEP_JAVELIN_CycleFireMode",
+["ACE3", QGVAR(cycleFireMode), localize "STR_ACE_JAVELIN_CycleFireMode",
 { false },
 {    
     [ACE_player] call FUNC(cycleFireMode);
diff --git a/addons/javelin/script_component.hpp b/addons/javelin/script_component.hpp
index ca9cbaaad5..a0199e28d7 100644
--- a/addons/javelin/script_component.hpp
+++ b/addons/javelin/script_component.hpp
@@ -1,12 +1,12 @@
-#define COMPONENT wep_javelin
+#define COMPONENT javelin
 #include "\z\ace\Addons\main\script_mod.hpp"
 
-#ifdef DEBUG_ENABLED_WEP_JAVELIN
+#ifdef DEBUG_ENABLED_JAVELIN
     #define DEBUG_MODE_FULL
 #endif
 
-#ifdef DEBUG_SETTINGS_WEP_JAVELIN
-    #define DEBUG_SETTINGS DEBUG_SETTINGS_WEP_JAVELIN
+#ifdef DEBUG_SETTINGS_JAVELIN
+    #define DEBUG_SETTINGS DEBUG_SETTINGS_JAVELIN
 #endif
 
 #include "\z\ace\Addons\main\script_macros.hpp"
diff --git a/addons/javelin/stringtable.xml b/addons/javelin/stringtable.xml
index a691c750cb..503b876855 100644
--- a/addons/javelin/stringtable.xml
+++ b/addons/javelin/stringtable.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Edited with tabler - 2014-12-19 -->
 <Project name="ACE">
-    <Package name="WEP_JAVELIN">
-        <Key ID="STR_ACE_WEP_JAVELIN_LockTarget">
+    <Package name="JAVELIN">
+        <Key ID="STR_ACE_JAVELIN_LockTarget">
             <English>Lock Target (Hold)</English>
             <German>Lock Target (Hold)</German>
             <French>Lock Target (Hold)</French>
@@ -11,7 +11,7 @@
             <Spanish>Fijar objetivo (Mantener)</Spanish>
             <Russian>Lock Target (Hold)</Russian>
         </Key>
-         <Key ID="STR_ACE_WEP_JAVELIN_CycleFireMode">
+         <Key ID="STR_ACE_JAVELIN_CycleFireMode">
             <English>Cycle Fire Mode</English>
             <German>Cycle Fire Mode</German>
             <French>Cycle Fire Mode</French>