diff --git a/src/modules/Makefile_music_control.mk b/src/modules/Makefile_music_control.mk
index 78d808f5c..ed2880ff2 100644
--- a/src/modules/Makefile_music_control.mk
+++ b/src/modules/Makefile_music_control.mk
@@ -1,11 +1,11 @@
 EXTRA_DIST += src/modules/music-control/module.desktop \
-src/modules/music-control/e-module-music-control.edj \
+src/modules/music-control/e-module-music_control.edj \
 src/modules/music-control/introspect.xml
 
 if USE_MODULE_MUSIC_CONTROL
 music_controldir = $(MDIR)/music-control
 music_control_DATA = src/modules/music-control/module.desktop \
-src/modules/music-control/e-module-music-control.edj
+src/modules/music-control/e-module-music_control.edj
 
 MUSIC_GEN = \
 src/modules/music-control/eldbus_media_player2_player.c \
diff --git a/src/modules/Makefile_pager_plain.mk b/src/modules/Makefile_pager_plain.mk
index 5784ebf5c..8c0da2083 100644
--- a/src/modules/Makefile_pager_plain.mk
+++ b/src/modules/Makefile_pager_plain.mk
@@ -1,8 +1,8 @@
 EXTRA_DIST += src/modules/pager_plain/module.desktop \
-src/modules/pager_plain/e-module-pager-plain.edj
+src/modules/pager_plain/e-module-pager_plain.edj
 if USE_MODULE_PAGER_PLAIN
 pager_plaindir = $(MDIR)/pager_plain
-pager_plain_DATA = src/modules/pager_plain/e-module-pager-plain.edj \
+pager_plain_DATA = src/modules/pager_plain/e-module-pager_plain.edj \
 	     src/modules/pager_plain/module.desktop
 
 
diff --git a/src/modules/music-control/e-module-music-control.edj b/src/modules/music-control/e-module-music_control.edj
similarity index 100%
rename from src/modules/music-control/e-module-music-control.edj
rename to src/modules/music-control/e-module-music_control.edj
diff --git a/src/modules/music-control/meson.build b/src/modules/music-control/meson.build
index aba185221..d1fc0843b 100644
--- a/src/modules/music-control/meson.build
+++ b/src/modules/music-control/meson.build
@@ -10,8 +10,7 @@ src = [
 ]
 
 icon = [
-## XXX: bad pttern with module icon name
-  'e-module-' + opt + '.edj',
+  'e-module-' + module + '.edj',
   'module.desktop'
 ]
 
diff --git a/src/modules/music-control/module.desktop b/src/modules/music-control/module.desktop
index 2e12677e3..99a2d9143 100644
--- a/src/modules/music-control/module.desktop
+++ b/src/modules/music-control/module.desktop
@@ -27,5 +27,5 @@ Comment[nl]=Beheers uw muziek op uw plank
 Comment[ru]=Модуль для управления воспроизведением музыки
 Comment[sr]=Управљајте музиком са полице
 Comment[tr]=Müziğinizi rafta kontrol edin
-Icon=e-module-music-control
+Icon=e-module-music_control
 X-Enlightenment-ModuleType=utils
diff --git a/src/modules/pager_plain/e-module-pager-plain.edj b/src/modules/pager_plain/e-module-pager_plain.edj
similarity index 100%
rename from src/modules/pager_plain/e-module-pager-plain.edj
rename to src/modules/pager_plain/e-module-pager_plain.edj
diff --git a/src/modules/pager_plain/meson.build b/src/modules/pager_plain/meson.build
index df8a7a9f1..78a14f960 100644
--- a/src/modules/pager_plain/meson.build
+++ b/src/modules/pager_plain/meson.build
@@ -9,8 +9,7 @@ src = [
 ]
 
 icon = [
-## XXX: bad pttern with module icon name
-  'e-module-' + opt + '.edj',
+  'e-module-' + module + '.edj',
   'module.desktop'
 ]
 
diff --git a/src/modules/pager_plain/module.desktop b/src/modules/pager_plain/module.desktop
index 233e12026..e877d7dea 100644
--- a/src/modules/pager_plain/module.desktop
+++ b/src/modules/pager_plain/module.desktop
@@ -32,5 +32,5 @@ Comment[pt]=Permite-lhe visualizar as áreas virtuais e as janelas que nelas exi
 Comment[ru]=Гаджет для отображения виртуальных столов и содержащихся на них окон.
 Comment[sr]=Справица која дочарава нестварне површи и прозоре које оне садрже.
 Comment[tr]=Sanal masaüstlerini ve içerisindeki pencereleri görselleştirmenizi sağlayan araç.
-Icon=e-module-pager-plain
+Icon=e-module-pager_plain
 X-Enlightenment-ModuleType=utils