diff --git a/frontend/ui/data/keyboardlayouts/ar_AA_keyboard.lua b/frontend/ui/data/keyboardlayouts/ar_keyboard.lua
similarity index 98%
rename from frontend/ui/data/keyboardlayouts/ar_AA_keyboard.lua
rename to frontend/ui/data/keyboardlayouts/ar_keyboard.lua
index b332b8a73..6603fd8aa 100644
--- a/frontend/ui/data/keyboardlayouts/ar_AA_keyboard.lua
+++ b/frontend/ui/data/keyboardlayouts/ar_keyboard.lua
@@ -1,5 +1,5 @@
 local en_popup = require("ui/data/keyboardlayouts/keypopup/en_popup")
-local ar_popup = require("ui/data/keyboardlayouts/keypopup/ar_AA_popup")
+local ar_popup = require("ui/data/keyboardlayouts/keypopup/ar_popup")
 local com = en_popup.com -- comma (,)
 local prd = en_popup.prd -- period (.)
 local _at = en_popup._at
diff --git a/frontend/ui/data/keyboardlayouts/keypopup/ar_AA_popup.lua b/frontend/ui/data/keyboardlayouts/keypopup/ar_popup.lua
similarity index 100%
rename from frontend/ui/data/keyboardlayouts/keypopup/ar_AA_popup.lua
rename to frontend/ui/data/keyboardlayouts/keypopup/ar_popup.lua
diff --git a/frontend/ui/language.lua b/frontend/ui/language.lua
index 68cfd7f46..7932309be 100644
--- a/frontend/ui/language.lua
+++ b/frontend/ui/language.lua
@@ -35,7 +35,7 @@ local Language = {
         vi = "Tiếng Việt",
         tr = "Türkçe",
         vi_VN = "Viet Nam",
-        ar_AA = "عربى",
+        ar = "عربى",
         bg_BG = "български",
         bn = "বাংলা",
         el = "Ελληνικά",
@@ -148,7 +148,7 @@ function Language:getLangMenuTable()
                 self:genLanguageSubItem("vi"),
                 self:genLanguageSubItem("tr"),
                 self:genLanguageSubItem("vi_VN"),
-                self:genLanguageSubItem("ar_AA"),
+                self:genLanguageSubItem("ar"),
                 self:genLanguageSubItem("bg_BG"),
                 --self:genLanguageSubItem("bn"),
                 self:genLanguageSubItem("el"),
diff --git a/frontend/ui/widget/virtualkeyboard.lua b/frontend/ui/widget/virtualkeyboard.lua
index 0063cdcb6..7de840000 100644
--- a/frontend/ui/widget/virtualkeyboard.lua
+++ b/frontend/ui/widget/virtualkeyboard.lua
@@ -777,7 +777,7 @@ local VirtualKeyboard = FocusManager:extend{
     key_padding = Size.padding.small,
 
     lang_to_keyboard_layout = {
-        ar_AA = "ar_AA_keyboard",
+        ar = "ar_keyboard",
         bg_BG = "bg_keyboard",
         bn = "bn_keyboard",
         de = "de_keyboard",
diff --git a/reader.lua b/reader.lua
index dc78584db..39614b841 100755
--- a/reader.lua
+++ b/reader.lua
@@ -48,7 +48,7 @@ end
 
 local lang_locale = G_reader_settings:readSetting("language")
 -- Allow quick switching to Arabic for testing RTL/UI mirroring
-if os.getenv("KO_RTL") then lang_locale = "ar_AA" end
+if os.getenv("KO_RTL") then lang_locale = "ar" end
 local _ = require("gettext")
 if lang_locale then
     _.changeLang(lang_locale)