diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am
index 9e0b9681e..c278639d1 100644
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@@ -4,7 +4,7 @@ MODULE = battery
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/battery/module.edj b/src/modules/battery/e-module-battery.edj
similarity index 100%
rename from src/modules/battery/module.edj
rename to src/modules/battery/e-module-battery.edj
diff --git a/src/modules/battery/module.desktop.in b/src/modules/battery/module.desktop.in
index 26b47bb04..9ecd82d0d 100644
--- a/src/modules/battery/module.desktop.in
+++ b/src/modules/battery/module.desktop.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Battery
-Exec=enlightenment
-X-Enlightenment-IconClass=battery,gadget
-Icon=./module.edj
+Icon=e-module-battery
diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am
index 1e638ae64..a39b6869e 100644
--- a/src/modules/clock/Makefile.am
+++ b/src/modules/clock/Makefile.am
@@ -4,7 +4,7 @@ MODULE = clock
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/clock/module.edj b/src/modules/clock/e-module-clock.edj
similarity index 100%
rename from src/modules/clock/module.edj
rename to src/modules/clock/e-module-clock.edj
diff --git a/src/modules/clock/module.desktop.in b/src/modules/clock/module.desktop.in
index 0aa0677c4..3307a530a 100644
--- a/src/modules/clock/module.desktop.in
+++ b/src/modules/clock/module.desktop.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Clock
-Exec=enlightenment
-X-Enlightenment-IconClass=clock,gadget
-Icon=./module.edj
+Icon=e-module-clock
diff --git a/src/modules/cpufreq/Makefile.am b/src/modules/cpufreq/Makefile.am
index 6e8ec8d70..a4671b949 100644
--- a/src/modules/cpufreq/Makefile.am
+++ b/src/modules/cpufreq/Makefile.am
@@ -4,7 +4,7 @@ MODULE = cpufreq
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/cpufreq/module.edj b/src/modules/cpufreq/e-module-cpufreq.edj
similarity index 100%
rename from src/modules/cpufreq/module.edj
rename to src/modules/cpufreq/e-module-cpufreq.edj
diff --git a/src/modules/cpufreq/module.desktop.in b/src/modules/cpufreq/module.desktop.in
index 21809eb29..5bde33619 100644
--- a/src/modules/cpufreq/module.desktop.in
+++ b/src/modules/cpufreq/module.desktop.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Cpufreq
-Exec=enlightenment
-X-Enlightenment-IconClass=cpufreq,gadget
-Icon=./module.edj
+Icon=e-module-cpufreq
diff --git a/src/modules/dropshadow/Makefile.am b/src/modules/dropshadow/Makefile.am
index d870fb948..9f8482811 100644
--- a/src/modules/dropshadow/Makefile.am
+++ b/src/modules/dropshadow/Makefile.am
@@ -4,7 +4,7 @@ MODULE = dropshadow
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/dropshadow/module.edj b/src/modules/dropshadow/e-module-dropshadow.edj
similarity index 100%
rename from src/modules/dropshadow/module.edj
rename to src/modules/dropshadow/e-module-dropshadow.edj
diff --git a/src/modules/dropshadow/module.desktop.in b/src/modules/dropshadow/module.desktop.in
index 37fa451e8..32b04101b 100644
--- a/src/modules/dropshadow/module.desktop.in
+++ b/src/modules/dropshadow/module.desktop.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Dropshadow
-Exec=enlightenment
-X-Enlightenment-IconClass=dropshadow,gadget
-Icon=./module.edj
+Icon=e-module-dropshadow
diff --git a/src/modules/ibar/Makefile.am b/src/modules/ibar/Makefile.am
index 14df89ef2..e0abf1532 100644
--- a/src/modules/ibar/Makefile.am
+++ b/src/modules/ibar/Makefile.am
@@ -4,7 +4,7 @@ MODULE = ibar
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/ibar/module.edj b/src/modules/ibar/e-module-ibar.edj
similarity index 100%
rename from src/modules/ibar/module.edj
rename to src/modules/ibar/e-module-ibar.edj
diff --git a/src/modules/ibar/module.desktop.in b/src/modules/ibar/module.desktop.in
index 18f21e79e..c403616b1 100644
--- a/src/modules/ibar/module.desktop.in
+++ b/src/modules/ibar/module.desktop.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=IBar
-Exec=enlightenment
-X-Enlightenment-IconClass=ibar,gadget
-Icon=./module.edj
+Icon=e-module-ibar
diff --git a/src/modules/ibox/Makefile.am b/src/modules/ibox/Makefile.am
index 500e510e8..7d13d14bb 100644
--- a/src/modules/ibox/Makefile.am
+++ b/src/modules/ibox/Makefile.am
@@ -4,7 +4,7 @@ MODULE = ibox
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/ibox/module.edj b/src/modules/ibox/e-module-ibox.edj
similarity index 100%
rename from src/modules/ibox/module.edj
rename to src/modules/ibox/e-module-ibox.edj
diff --git a/src/modules/ibox/module.desktop.in b/src/modules/ibox/module.desktop.in
index e7d9490e2..061b8422a 100644
--- a/src/modules/ibox/module.desktop.in
+++ b/src/modules/ibox/module.desktop.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=IBox
-Exec=enlightenment
-X-Enlightenment-IconClass=ibox,gadget
-Icon=./module.edj
+Icon=e-module-ibox
diff --git a/src/modules/pager/Makefile.am b/src/modules/pager/Makefile.am
index d78edf2e5..59ebd59e0 100644
--- a/src/modules/pager/Makefile.am
+++ b/src/modules/pager/Makefile.am
@@ -4,7 +4,7 @@ MODULE = pager
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/pager/module.edj b/src/modules/pager/e-module-pager.edj
similarity index 100%
rename from src/modules/pager/module.edj
rename to src/modules/pager/e-module-pager.edj
diff --git a/src/modules/pager/module.desktop.in b/src/modules/pager/module.desktop.in
index 31533c31d..196e8821b 100644
--- a/src/modules/pager/module.desktop.in
+++ b/src/modules/pager/module.desktop.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Pager
-Exec=enlightenment
-X-Enlightenment-IconClass=pager,gadget
-Icon=./module.edj
+Icon=e-module-pager
diff --git a/src/modules/start/Makefile.am b/src/modules/start/Makefile.am
index 7333ec105..f9afb3b38 100644
--- a/src/modules/start/Makefile.am
+++ b/src/modules/start/Makefile.am
@@ -4,7 +4,7 @@ MODULE = start
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/start/module.edj b/src/modules/start/e-module-start.edj
similarity index 100%
rename from src/modules/start/module.edj
rename to src/modules/start/e-module-start.edj
diff --git a/src/modules/start/module.desktop.in b/src/modules/start/module.desktop.in
index 246ce9121..16738c08e 100644
--- a/src/modules/start/module.desktop.in
+++ b/src/modules/start/module.desktop.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Start
-Exec=enlightenment
-X-Enlightenment-IconClass=start,gadget
-Icon=./module.edj
+Icon=e-module-start
diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am
index 69de066f8..78ffb7db3 100644
--- a/src/modules/temperature/Makefile.am
+++ b/src/modules/temperature/Makefile.am
@@ -4,7 +4,7 @@ MODULE = temperature
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop
 
 EXTRA_DIST = $(files_DATA)
 
diff --git a/src/modules/temperature/module.edj b/src/modules/temperature/e-module-temperature.edj
similarity index 100%
rename from src/modules/temperature/module.edj
rename to src/modules/temperature/e-module-temperature.edj
diff --git a/src/modules/temperature/module.desktop.in b/src/modules/temperature/module.desktop.in
index 12d90b795..6fae70d5f 100644
--- a/src/modules/temperature/module.desktop.in
+++ b/src/modules/temperature/module.desktop.in
@@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Temperature
-Exec=enlightenment
-X-Enlightenment-IconClass=temperature,gadget
-Icon=./module.edj
+Icon=e-module-temperature