diff --git a/addons/common/scripts/nextKeys.sqf b/addons/common/scripts/nextKeys.sqf
index 21513b1571..51c41b94b9 100644
--- a/addons/common/scripts/nextKeys.sqf
+++ b/addons/common/scripts/nextKeys.sqf
@@ -7,7 +7,7 @@
 #define OFFSET_4 400
 #define OFFSET_5 500
 
-_config = configFile >> QGVAR(Default_Keys);
+_config = configFile >> "ACE_Default_Keys";
 _count = count _config;
 
 _countPages = ceil (_count / 20) + 1;
diff --git a/addons/nametags/config.cpp b/addons/nametags/config.cpp
index d979bb2bb4..c9c34195f1 100644
--- a/addons/nametags/config.cpp
+++ b/addons/nametags/config.cpp
@@ -17,7 +17,7 @@ class CfgPatches {
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
 
-class ACE_Common_Default_Keys {
+class ACE_Default_Keys {
     class showNames {
         displayName = "$STR_ACE_NameTags_ShowNames";
         condition = "true";
@@ -30,7 +30,7 @@ class ACE_Common_Default_Keys {
     };
 };
 
-class ACE_Common_Options {
+class ACE_Options {
     class showPlayerNames {
         displayName = "$STR_ACE_NameTags_ShowPlayerNames";
         default = 1;