diff --git a/cmakeconfig/EFLConfigVersion.cmake.in b/cmakeconfig/EflConfigVersion.cmake.in
similarity index 100%
rename from cmakeconfig/EFLConfigVersion.cmake.in
rename to cmakeconfig/EflConfigVersion.cmake.in
diff --git a/cmakeconfig/meson.build b/cmakeconfig/meson.build
index 2261a4ff12..158b2a9dc6 100644
--- a/cmakeconfig/meson.build
+++ b/cmakeconfig/meson.build
@@ -27,7 +27,7 @@ cmake_src = [
 ]
 
 cmake_version_src = [
-  'EFL',
+  'Efl',
   'Elementary',
 ]
 
diff --git a/configure.ac b/configure.ac
index 34f71f32ca..d7d26b666c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5843,52 +5843,52 @@ dbus-services/org.enlightenment.Ethumb.service
 systemd-services/ethumb.service
 $po_makefile_in
 cmakeconfig/EflConfig.cmake
-cmakeconfig/EflConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EflConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EinaConfig.cmake
-cmakeconfig/EinaConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EinaConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EioConfig.cmake
-cmakeconfig/EioConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EioConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EezeConfig.cmake
-cmakeconfig/EezeConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EezeConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EoConfig.cmake
-cmakeconfig/EoConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EoConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EolianConfig.cmake
-cmakeconfig/EolianConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EolianConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EolianHelper.cmake
 cmakeconfig/EolianCxxConfig.cmake
-cmakeconfig/EolianCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EolianCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EinaCxxConfig.cmake
-cmakeconfig/EinaCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EinaCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EoCxxConfig.cmake
-cmakeconfig/EoCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EoCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EcoreCxxConfig.cmake
-cmakeconfig/EcoreCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EcoreCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EvasCxxConfig.cmake
-cmakeconfig/EvasCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EvasCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EetCxxConfig.cmake
-cmakeconfig/EetCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EetCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EetConfig.cmake
-cmakeconfig/EetConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EetConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EvasConfig.cmake
-cmakeconfig/EvasConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EvasConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EcoreConfig.cmake
-cmakeconfig/EcoreConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EcoreConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EdjeConfig.cmake
-cmakeconfig/EdjeConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EdjeConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EldbusConfig.cmake
-cmakeconfig/EldbusConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EldbusConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EfreetConfig.cmake
-cmakeconfig/EfreetConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EfreetConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EthumbConfig.cmake
-cmakeconfig/EthumbConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EthumbConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EthumbClientConfig.cmake
-cmakeconfig/EthumbClientConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EthumbClientConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EmotionConfig.cmake
-cmakeconfig/EmotionConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EmotionConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EluaConfig.cmake
-cmakeconfig/EluaConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EluaConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/EmileConfig.cmake
-cmakeconfig/EmileConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in
+cmakeconfig/EmileConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in
 cmakeconfig/ElementaryConfigVersion.cmake
 cmakeconfig/ElementaryConfig.cmake
 ])
diff --git a/data/eo/meson.build b/data/eo/meson.build
index 8ccb578f7d..d7bac57695 100644
--- a/data/eo/meson.build
+++ b/data/eo/meson.build
@@ -9,5 +9,5 @@ configure_file(
   input: 'libeo-gdb.py.in',
   output: 'libeo.so.'+meson.project_version()+'-gdb.py',
   configuration: configuration,
-  install_dir: join_paths(dir_data, 'gdb', 'autoload', 'usr', 'lib')
+  install_dir: join_paths(dir_data, 'gdb', 'auto-load', 'usr', 'lib')
 )