diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index 16e52bdb5..3ec6d9d1b 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -607,7 +607,7 @@ public class BaseMainActivity extends LoggableActivity {
 
     boolean isKeyboard(KeyEvent evt) {
         System.out.println("Event:" +evt);
-        return AndroidLWJGLKeycode.androidToLwjglMap.containsKey(evt.getKeyCode());
+        return EfficientAndroidLWJGLKeycode.containsKey(evt.getKeyCode());
     }
 
 
@@ -625,7 +625,7 @@ public class BaseMainActivity extends LoggableActivity {
         }
 
         if(isKeyboard(event)) {
-            AndroidLWJGLKeycode.execKey(event,event.getKeyCode(),event.getAction() == KeyEvent.ACTION_DOWN);
+            EfficientAndroidLWJGLKeycode.execKey(event,event.getKeyCode(),event.getAction() == KeyEvent.ACTION_DOWN);
             return true;
         }
 
@@ -734,7 +734,7 @@ public class BaseMainActivity extends LoggableActivity {
     private void dialogSendCustomKey() {
         AlertDialog.Builder dialog = new AlertDialog.Builder(this);
         dialog.setTitle(R.string.control_customkey);
-        dialog.setItems(AndroidLWJGLKeycode.generateKeyName(), (dInterface, position) -> AndroidLWJGLKeycode.execKeyIndex(BaseMainActivity.this, position));
+        dialog.setItems(EfficientAndroidLWJGLKeycode.generateKeyName(), (dInterface, position) -> EfficientAndroidLWJGLKeycode.execKeyIndex(BaseMainActivity.this, position));
         dialog.show();
     }
 
@@ -878,8 +878,8 @@ public class BaseMainActivity extends LoggableActivity {
         if(doesObjectContainField(KeyEvent.class,"KEYCODE_" + Character.toUpperCase(keyChar))) {
             try {
                 int keyCode = KeyEvent.class.getField("KEYCODE_" + Character.toUpperCase(keyChar)).getInt(null);
-                sendKeyPress(AndroidLWJGLKeycode.androidToLwjglMap.get(keyCode), keyChar, 0, CallbackBridge.getCurrentMods(), true);
-                sendKeyPress(AndroidLWJGLKeycode.androidToLwjglMap.get(keyCode), keyChar, 0, CallbackBridge.getCurrentMods(), false);
+                sendKeyPress(EfficientAndroidLWJGLKeycode.get(keyCode), keyChar, 0, CallbackBridge.getCurrentMods(), true);
+                sendKeyPress(EfficientAndroidLWJGLKeycode.get(keyCode), keyChar, 0, CallbackBridge.getCurrentMods(), false);
             } catch (IllegalAccessException | NoSuchFieldException e) {
 
             }
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlButtonPopup.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlButtonPopup.java
index cd4fc2b8a..145c1694d 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlButtonPopup.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/EditControlButtonPopup.java
@@ -15,7 +15,7 @@ import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
 
-import net.kdt.pojavlaunch.AndroidLWJGLKeycode;
+import net.kdt.pojavlaunch.EfficientAndroidLWJGLKeycode;
 import net.kdt.pojavlaunch.R;
 import net.kdt.pojavlaunch.customcontrols.buttons.ControlButton;
 import net.kdt.pojavlaunch.customcontrols.ControlData;
@@ -163,7 +163,7 @@ public class EditControlButtonPopup {
             specialArr[i] = "SPECIAL_" + oldSpecialArr[specialArr.length - i - 1];
         }
         adapter.addAll(specialArr);
-        adapter.addAll(AndroidLWJGLKeycode.generateKeyName());
+        adapter.addAll(EfficientAndroidLWJGLKeycode.generateKeyName());
         adapter.setDropDownViewResource(android.R.layout.simple_list_item_single_choice);
 
         for (Spinner spinner : spinnersKeycode) {
@@ -175,7 +175,6 @@ public class EditControlButtonPopup {
         buttonStrokeColor.setOnClickListener(view -> ActionPopupWindow.showColorPicker(ctx, "Edit stroke color", false, ((ColorDrawable) buttonStrokeColor.getBackground()).getColor(), buttonStrokeColor));
 
 
-
         //Set dialog buttons behavior
         setupDialogButtons();
 
@@ -235,7 +234,7 @@ public class EditControlButtonPopup {
             if (properties.keycodes[i] < 0) {
                 spinnersKeycode[i].setSelection(properties.keycodes[i] + specialArr.length);
             } else {
-                spinnersKeycode[i].setSelection(AndroidLWJGLKeycode.getIndexByLWJGLKey(properties.keycodes[i]) + specialArr.length);
+                spinnersKeycode[i].setSelection(EfficientAndroidLWJGLKeycode.getIndexByLWJGLKey(properties.keycodes[i]) + specialArr.length);
             }
         }
     }
@@ -273,7 +272,7 @@ public class EditControlButtonPopup {
             if (spinnersKeycode[i].getSelectedItemPosition() < specialArr.length) {
                 properties.keycodes[i] = spinnersKeycode[i].getSelectedItemPosition() - specialArr.length;
             } else {
-                properties.keycodes[i] = AndroidLWJGLKeycode.getKeyByIndex(spinnersKeycode[i].getSelectedItemPosition() - specialArr.length);
+                properties.keycodes[i] = EfficientAndroidLWJGLKeycode.getKeyByIndex(spinnersKeycode[i].getSelectedItemPosition() - specialArr.length);
             }
         }