35 files changed, 31 insertions, 31 deletions

diff --git a/rules/0004-base.m_k.part b/rules/0004-base.model_keycodes.part
index 81fb3e11..81fb3e11 100644
--- a/rules/0004-base.m_k.part
+++ b/rules/0004-base.model_keycodes.part
diff --git a/rules/0004-evdev.m_k.part b/rules/0004-evdev.model_keycodes.part
index 62c21ffc..62c21ffc 100644
--- a/rules/0004-evdev.m_k.part
+++ b/rules/0004-evdev.model_keycodes.part
diff --git a/rules/0005-l1_k.part b/rules/0005-layout1_keycodes.part
index 3f2146af..3f2146af 100644
--- a/rules/0005-l1_k.part
+++ b/rules/0005-layout1_keycodes.part
diff --git a/rules/0006-l_k.part b/rules/0006-layout_keycodes.part
index a0955177..a0955177 100644
--- a/rules/0006-l_k.part
+++ b/rules/0006-layout_keycodes.part
diff --git a/rules/0007-o_k.part b/rules/0007-options_keycodes.part
index 0c42cd84..0c42cd84 100644
--- a/rules/0007-o_k.part
+++ b/rules/0007-options_keycodes.part
diff --git a/rules/0008-ml_g.part b/rules/0008-modellayout_geometry.part
index 14e56d26..14e56d26 100644
--- a/rules/0008-ml_g.part
+++ b/rules/0008-modellayout_geometry.part
diff --git a/rules/0009-m_g.part b/rules/0009-model_geometry.part
index 00cb87ac..00cb87ac 100644
--- a/rules/0009-m_g.part
+++ b/rules/0009-model_geometry.part
diff --git a/rules/0011-mlv_s.part b/rules/0011-modellayoutvariant_symbols.part
index 615b8610..615b8610 100644
--- a/rules/0011-mlv_s.part
+++ b/rules/0011-modellayoutvariant_symbols.part
diff --git a/rules/0013-ml_s.part b/rules/0013-modellayout_symbols.part
index e576d101..e576d101 100644
--- a/rules/0013-ml_s.part
+++ b/rules/0013-modellayout_symbols.part
diff --git a/rules/0015-ml1_s.part b/rules/0015-modellayout1_symbols.part
index db5b62de..db5b62de 100644
--- a/rules/0015-ml1_s.part
+++ b/rules/0015-modellayout1_symbols.part
diff --git a/rules/0018-ml2_s.part b/rules/0018-modellayout2_symbols.part
index 293f8481..293f8481 100644
--- a/rules/0018-ml2_s.part
+++ b/rules/0018-modellayout2_symbols.part
diff --git a/rules/0020-ml3_s.part b/rules/0020-modellayout3_symbols.part
index 3724f77b..3724f77b 100644
--- a/rules/0020-ml3_s.part
+++ b/rules/0020-modellayout3_symbols.part
diff --git a/rules/0022-ml4_s.part b/rules/0022-modellayout4_symbols.part
index cb83ed50..cb83ed50 100644
--- a/rules/0022-ml4_s.part
+++ b/rules/0022-modellayout4_symbols.part
diff --git a/rules/0026-base.m_s.part b/rules/0026-base.model_symbols.part
index c8e481a2..c8e481a2 100644
--- a/rules/0026-base.m_s.part
+++ b/rules/0026-base.model_symbols.part
diff --git a/rules/0026-evdev.m_s.part b/rules/0026-evdev.model_symbols.part
index c40a90fb..c40a90fb 100644
--- a/rules/0026-evdev.m_s.part
+++ b/rules/0026-evdev.model_symbols.part
diff --git a/rules/0027-base.ml_s1.part b/rules/0027-base.modellayout_symbols1.part
index 55bac5fd..55bac5fd 100644
--- a/rules/0027-base.ml_s1.part
+++ b/rules/0027-base.modellayout_symbols1.part
diff --git a/rules/0027-evdev.ml_s1.part b/rules/0027-evdev.modellayout_symbols1.part
index 8ff2163a..8ff2163a 100644
--- a/rules/0027-evdev.ml_s1.part
+++ b/rules/0027-evdev.modellayout_symbols1.part
diff --git a/rules/0033-ml_c.part b/rules/0033-modellayout_compat.part
index 91fb1896..91fb1896 100644
--- a/rules/0033-ml_c.part
+++ b/rules/0033-modellayout_compat.part
diff --git a/rules/0034-ml1_c.part b/rules/0034-modellayout1_compat.part
index 874e4e34..874e4e34 100644
--- a/rules/0034-ml1_c.part
+++ b/rules/0034-modellayout1_compat.part
diff --git a/rules/0035-m_t.part b/rules/0035-model_types.part
index f1f97ec4..f1f97ec4 100644
--- a/rules/0035-m_t.part
+++ b/rules/0035-model_types.part
diff --git a/rules/0036-lo_s.part b/rules/0036-layoutoption_symbols.part
index 73aa02ab..73aa02ab 100644
--- a/rules/0036-lo_s.part
+++ b/rules/0036-layoutoption_symbols.part
diff --git a/rules/0037-l1o_s.part b/rules/0037-layout1option_symbols.part
index 376d90f0..376d90f0 100644
--- a/rules/0037-l1o_s.part
+++ b/rules/0037-layout1option_symbols.part
diff --git a/rules/0038-l2o_s.part b/rules/0038-layout2option_symbols.part
index 7eeee13a..7eeee13a 100644
--- a/rules/0038-l2o_s.part
+++ b/rules/0038-layout2option_symbols.part
diff --git a/rules/0039-l3o_s.part b/rules/0039-layout3option_symbols.part
index 17c2163f..17c2163f 100644
--- a/rules/0039-l3o_s.part
+++ b/rules/0039-layout3option_symbols.part
diff --git a/rules/0040-l4o_s.part b/rules/0040-layout4option_symbols.part
index 0bad6897..0bad6897 100644
--- a/rules/0040-l4o_s.part
+++ b/rules/0040-layout4option_symbols.part
diff --git a/rules/0042-o_s.part b/rules/0042-option_symbols.part
index d190a632..d190a632 100644
--- a/rules/0042-o_s.part
+++ b/rules/0042-option_symbols.part
diff --git a/rules/0043-o_c.part b/rules/0043-option_compat.part
index 87cf7658..87cf7658 100644
--- a/rules/0043-o_c.part
+++ b/rules/0043-option_compat.part
diff --git a/rules/0044-o_t.part b/rules/0044-option_types.part
index ce7ebe55..ce7ebe55 100644
--- a/rules/0044-o_t.part
+++ b/rules/0044-option_types.part
diff --git a/rules/compat/0028-lv_c.part b/rules/compat/0028-layoutvariant_compat.part
index faf94a52..faf94a52 100644
--- a/rules/compat/0028-lv_c.part
+++ b/rules/compat/0028-layoutvariant_compat.part
diff --git a/rules/compat/0029-l1v1_c.part b/rules/compat/0029-layout1variant1_compat.part
index c19d0bc2..c19d0bc2 100644
--- a/rules/compat/0029-l1v1_c.part
+++ b/rules/compat/0029-layout1variant1_compat.part
diff --git a/rules/compat/0030-l2v2_c.part b/rules/compat/0030-layout2variant2_compat.part
index 88589075..88589075 100644
--- a/rules/compat/0030-l2v2_c.part
+++ b/rules/compat/0030-layout2variant2_compat.part
diff --git a/rules/compat/0031-l3v3_c.part b/rules/compat/0031-layout3variant3_compat.part
index 051cd3b9..051cd3b9 100644
--- a/rules/compat/0031-l3v3_c.part
+++ b/rules/compat/0031-layout3variant3_compat.part
diff --git a/rules/compat/0032-l4v4_c.part b/rules/compat/0032-layout4variant4_compat.part
index 1fc7fbc8..1fc7fbc8 100644
--- a/rules/compat/0032-l4v4_c.part
+++ b/rules/compat/0032-layout4variant4_compat.part
diff --git a/rules/compat/0041-o_s.part b/rules/compat/0041-option_symbols.part
index 89bc6859..89bc6859 100644
--- a/rules/compat/0041-o_s.part
+++ b/rules/compat/0041-option_symbols.part
diff --git a/rules/meson.build b/rules/meson.build
index ea1c22ca..514d03d9 100644
--- a/rules/meson.build
+++ b/rules/meson.build
@@ -8,31 +8,31 @@ parts = [
     '0000-hdr.part',
     '0001-lists.part',
     '0002-@0@.lists.part',
-    '0004-@0@.m_k.part',
-    '0005-l1_k.part',
-    '0006-l_k.part',
-    '0007-o_k.part',
-    '0008-ml_g.part',
-    '0009-m_g.part',
-    '0011-mlv_s.part',
-    '0013-ml_s.part',
-    '0015-ml1_s.part',
-    '0018-ml2_s.part',
-    '0020-ml3_s.part',
-    '0022-ml4_s.part',
-    '0026-@0@.m_s.part',
-    '0027-@0@.ml_s1.part',
-    '0033-ml_c.part',
-    '0034-ml1_c.part',
-    '0035-m_t.part',
-    '0036-lo_s.part',
-    '0037-l1o_s.part',
-    '0038-l2o_s.part',
-    '0039-l3o_s.part',
-    '0040-l4o_s.part',
-    '0042-o_s.part',
-    '0043-o_c.part',
-    '0044-o_t.part',
+    '0004-@0@.model_keycodes.part',
+    '0005-layout1_keycodes.part',
+    '0006-layout_keycodes.part',
+    '0007-options_keycodes.part',
+    '0008-modellayout_geometry.part',
+    '0009-model_geometry.part',
+    '0011-modellayoutvariant_symbols.part',
+    '0013-modellayout_symbols.part',
+    '0015-modellayout1_symbols.part',
+    '0018-modellayout2_symbols.part',
+    '0020-modellayout3_symbols.part',
+    '0022-modellayout4_symbols.part',
+    '0026-@0@.model_symbols.part',
+    '0027-@0@.modellayout_symbols1.part',
+    '0033-modellayout_compat.part',
+    '0034-modellayout1_compat.part',
+    '0035-model_types.part',
+    '0036-layoutoption_symbols.part',
+    '0037-layout1option_symbols.part',
+    '0038-layout2option_symbols.part',
+    '0039-layout3option_symbols.part',
+    '0040-layout4option_symbols.part',
+    '0042-option_symbols.part',
+    '0043-option_compat.part',
+    '0044-option_types.part',
 ]
 
 # generated compat parts
@@ -41,12 +41,12 @@ rules_compat_generated = []
 if get_option('compat-rules')
   # non-generated compat parts
   parts += [
-      'compat/0028-lv_c.part',
-      'compat/0029-l1v1_c.part',
-      'compat/0030-l2v2_c.part',
-      'compat/0031-l3v3_c.part',
-      'compat/0032-l4v4_c.part',
-      'compat/0041-o_s.part',
+      'compat/0028-layoutvariant_compat.part',
+      'compat/0029-layout1variant1_compat.part',
+      'compat/0030-layout2variant2_compat.part',
+      'compat/0031-layout3variant3_compat.part',
+      'compat/0032-layout4variant4_compat.part',
+      'compat/0041-option_symbols.part',
   ]
 
   layout_mappings = files('compat/layoutsMapping.lst')