diff --git a/data/keyboards/ja+kana.yaml b/data/keyboards/jp+kana.yaml
similarity index 100%
rename from data/keyboards/ja+kana.yaml
rename to data/keyboards/jp+kana.yaml
diff --git a/data/langs/en-US.txt b/data/langs/en-US.txt
index 6d1ef2b1..a0826e31 100644
--- a/data/langs/en-US.txt
+++ b/data/langs/en-US.txt
@@ -4,5 +4,5 @@ el Greek
 es Spanish
 it Italian
 jp+kana Japanese (kana)
-nb Norwegian
+no Norwegian
 
diff --git a/data/langs/es-ES.txt b/data/langs/es-ES.txt
index 2b8a988e..d377de21 100644
--- a/data/langs/es-ES.txt
+++ b/data/langs/es-ES.txt
@@ -4,4 +4,4 @@ el Griego
 es Español
 it Italiano
 jp+kana Japonés (Kana)
-nb Noruego
\ No newline at end of file
+no Noruego
diff --git a/data/langs/pl-PL.txt b/data/langs/pl-PL.txt
index 0a26adf3..783ed8e8 100644
--- a/data/langs/pl-PL.txt
+++ b/data/langs/pl-PL.txt
@@ -4,5 +4,5 @@ el grecki
 es hiszpański
 it włoski
 jp+kana japoński (kana)
-nb norweski
+no norweski
 
diff --git a/src/resources.rs b/src/resources.rs
index cc968b14..cfc56b5a 100644
--- a/src/resources.rs
+++ b/src/resources.rs
@@ -17,7 +17,7 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
     ("es", include_str!("../data/keyboards/es.yaml")),
     ("fi", include_str!("../data/keyboards/fi.yaml")),
     ("it", include_str!("../data/keyboards/it.yaml")),
-    ("ja+kana", include_str!("../data/keyboards/ja+kana.yaml")),
+    ("jp+kana", include_str!("../data/keyboards/jp+kana.yaml")),
     ("no", include_str!("../data/keyboards/no.yaml")),
     ("number", include_str!("../data/keyboards/number.yaml")),
     ("se", include_str!("../data/keyboards/se.yaml")),
@@ -41,6 +41,7 @@ pub fn get_keyboard(needle: &str) -> Option<&'static str> {
 const LAYOUT_NAMES: &[(*const str, *const str)] = &[
     ("de-DE", include_str!("../data/langs/de-DE.txt")),
     ("en-US", include_str!("../data/langs/en-US.txt")),
+    ("es-ES", include_str!("../data/langs/es-ES.txt")),
     ("pl-PL", include_str!("../data/langs/pl-PL.txt")),
 ];
 
diff --git a/tests/meson.build b/tests/meson.build
index bd89b1a9..6e081c95 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -54,7 +54,7 @@ foreach layout : [
     'es',
     'fi',
     'it',
-    'ja+kana',
+    'jp+kana',
     'no',
     'number',
     'se',