diff --git a/NEWS b/NEWS
index 18c483d0..ef00e9a5 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ dracut-008
 ==========
 - removed --ignore-kernel-modules option (no longer necessary)
 - renamed kernel command line arguments to follow the rd. naming scheme
-- merged check, install, installkernel to module-info.sh
+- merged check, install, installkernel to module-setup.sh
 - support for bzip2 and xz compressed initramfs images.
 - source code beautification
 - lots of documentation
diff --git a/dracut-functions b/dracut-functions
index a183a43d..e80a6387 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -518,14 +518,14 @@ inst_opt_decompress() {
 module_check() {
     local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
     [[ -d $moddir ]] || return 1
-    if [[ ! -f $moddir/module-info.sh ]]; then
+    if [[ ! -f $moddir/module-setup.sh ]]; then
         # if we do not have a check script, we are unconditionally included
         [[ -x $moddir/check ]] || return 0
         $moddir/check $hostonly
         return $?
     else
         unset check depends install installkernel
-        . $moddir/module-info.sh
+        . $moddir/module-setup.sh
         is_func check || return 0
         check
         ret=$?
@@ -537,14 +537,14 @@ module_check() {
 module_depends() {
     local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
     [[ -d $moddir ]] || return 1
-    if [[ ! -f $moddir/module-info.sh ]]; then
+    if [[ ! -f $moddir/module-setup.sh ]]; then
         # if we do not have a check script, we have no deps
         [[ -x $moddir/check ]] || return 0
         $moddir/check -d
         return $?
     else
         unset check depends install installkernel
-        . $moddir/module-info.sh
+        . $moddir/module-setup.sh
         is_func depends || return 0
         depends
         ret=$?
@@ -556,12 +556,12 @@ module_depends() {
 module_install() {
     local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
     [[ -d $moddir ]] || return 1
-    if [[ ! -f $moddir/module-info.sh ]]; then
+    if [[ ! -f $moddir/module-setup.sh ]]; then
         [[ -x $moddir/install ]] && . "$moddir/install"
         return $?
     else
         unset check depends install installkernel
-        . $moddir/module-info.sh
+        . $moddir/module-setup.sh
         is_func install || return 0
         install
         ret=$?
@@ -573,12 +573,12 @@ module_install() {
 module_installkernel() {
     local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
     [[ -d $moddir ]] || return 1
-    if [[ ! -f $moddir/module-info.sh ]]; then
+    if [[ ! -f $moddir/module-setup.sh ]]; then
         [[ -x $moddir/installkernel ]] && . "$moddir/installkernel"
         return $?
     else
         unset check depends install installkernel
-        . $moddir/module-info.sh
+        . $moddir/module-setup.sh
         is_func installkernel || return 0
         installkernel
         ret=$?
diff --git a/dracut.xml b/dracut.xml
index 089f8eeb..9b70f0c3 100644
--- a/dracut.xml
+++ b/dracut.xml
@@ -613,7 +613,7 @@ Common used functions are in <filename>dracut-lib.sh</filename>, which can be so
     <section>
       <title>Writing a Module</title>
       <para>A simple example module is <filename>96insmodpost</filename>, which modprobes a kernel module after udev has settled and the basic device drivers have been loaded.</para>
-      <para>All module installation information is in the file module-info.sh.</para>
+      <para>All module installation information is in the file module-setup.sh.</para>
       <para>First we create a <function>check()</function> function, which just exits with <errorcode>0</errorcode> indicating that this module should be included by default.</para>
       <para><function>check()</function>:</para>
       <programlisting>return 0</programlisting>
diff --git a/modules.d/00bootchart/module-info.sh b/modules.d/00bootchart/module-setup.sh
similarity index 100%
rename from modules.d/00bootchart/module-info.sh
rename to modules.d/00bootchart/module-setup.sh
diff --git a/modules.d/00dash/module-info.sh b/modules.d/00dash/module-setup.sh
similarity index 100%
rename from modules.d/00dash/module-info.sh
rename to modules.d/00dash/module-setup.sh
diff --git a/modules.d/01fips/module-info.sh b/modules.d/01fips/module-setup.sh
similarity index 100%
rename from modules.d/01fips/module-info.sh
rename to modules.d/01fips/module-setup.sh
diff --git a/modules.d/05busybox/module-info.sh b/modules.d/05busybox/module-setup.sh
similarity index 100%
rename from modules.d/05busybox/module-info.sh
rename to modules.d/05busybox/module-setup.sh
diff --git a/modules.d/10i18n/module-info.sh b/modules.d/10i18n/module-setup.sh
similarity index 100%
rename from modules.d/10i18n/module-info.sh
rename to modules.d/10i18n/module-setup.sh
diff --git a/modules.d/10rpmversion/module-info.sh b/modules.d/10rpmversion/module-setup.sh
similarity index 100%
rename from modules.d/10rpmversion/module-info.sh
rename to modules.d/10rpmversion/module-setup.sh
diff --git a/modules.d/40network/module-info.sh b/modules.d/40network/module-setup.sh
similarity index 100%
rename from modules.d/40network/module-info.sh
rename to modules.d/40network/module-setup.sh
diff --git a/modules.d/45ifcfg/module-info.sh b/modules.d/45ifcfg/module-setup.sh
similarity index 100%
rename from modules.d/45ifcfg/module-info.sh
rename to modules.d/45ifcfg/module-setup.sh
diff --git a/modules.d/50gensplash/module-info.sh b/modules.d/50gensplash/module-setup.sh
similarity index 100%
rename from modules.d/50gensplash/module-info.sh
rename to modules.d/50gensplash/module-setup.sh
diff --git a/modules.d/50plymouth/module-info.sh b/modules.d/50plymouth/module-setup.sh
similarity index 100%
rename from modules.d/50plymouth/module-info.sh
rename to modules.d/50plymouth/module-setup.sh
diff --git a/modules.d/60xen/module-info.sh b/modules.d/60xen/module-setup.sh
similarity index 100%
rename from modules.d/60xen/module-info.sh
rename to modules.d/60xen/module-setup.sh
diff --git a/modules.d/90btrfs/module-info.sh b/modules.d/90btrfs/module-setup.sh
similarity index 100%
rename from modules.d/90btrfs/module-info.sh
rename to modules.d/90btrfs/module-setup.sh
diff --git a/modules.d/90crypt/module-info.sh b/modules.d/90crypt/module-setup.sh
similarity index 100%
rename from modules.d/90crypt/module-info.sh
rename to modules.d/90crypt/module-setup.sh
diff --git a/modules.d/90dm/module-info.sh b/modules.d/90dm/module-setup.sh
similarity index 100%
rename from modules.d/90dm/module-info.sh
rename to modules.d/90dm/module-setup.sh
diff --git a/modules.d/90dmraid/module-info.sh b/modules.d/90dmraid/module-setup.sh
similarity index 100%
rename from modules.d/90dmraid/module-info.sh
rename to modules.d/90dmraid/module-setup.sh
diff --git a/modules.d/90dmsquash-live/module-info.sh b/modules.d/90dmsquash-live/module-setup.sh
similarity index 100%
rename from modules.d/90dmsquash-live/module-info.sh
rename to modules.d/90dmsquash-live/module-setup.sh
diff --git a/modules.d/90kernel-modules/module-info.sh b/modules.d/90kernel-modules/module-setup.sh
similarity index 100%
rename from modules.d/90kernel-modules/module-info.sh
rename to modules.d/90kernel-modules/module-setup.sh
diff --git a/modules.d/90lvm/module-info.sh b/modules.d/90lvm/module-setup.sh
similarity index 100%
rename from modules.d/90lvm/module-info.sh
rename to modules.d/90lvm/module-setup.sh
diff --git a/modules.d/90mdraid/module-info.sh b/modules.d/90mdraid/module-setup.sh
similarity index 100%
rename from modules.d/90mdraid/module-info.sh
rename to modules.d/90mdraid/module-setup.sh
diff --git a/modules.d/90multipath/module-info.sh b/modules.d/90multipath/module-setup.sh
similarity index 100%
rename from modules.d/90multipath/module-info.sh
rename to modules.d/90multipath/module-setup.sh
diff --git a/modules.d/95dasd/module-info.sh b/modules.d/95dasd/module-setup.sh
similarity index 100%
rename from modules.d/95dasd/module-info.sh
rename to modules.d/95dasd/module-setup.sh
diff --git a/modules.d/95dasd_mod/module-info.sh b/modules.d/95dasd_mod/module-setup.sh
similarity index 100%
rename from modules.d/95dasd_mod/module-info.sh
rename to modules.d/95dasd_mod/module-setup.sh
diff --git a/modules.d/95debug/module-info.sh b/modules.d/95debug/module-setup.sh
similarity index 100%
rename from modules.d/95debug/module-info.sh
rename to modules.d/95debug/module-setup.sh
diff --git a/modules.d/95fcoe/module-info.sh b/modules.d/95fcoe/module-setup.sh
similarity index 100%
rename from modules.d/95fcoe/module-info.sh
rename to modules.d/95fcoe/module-setup.sh
diff --git a/modules.d/95fstab-sys/module-info.sh b/modules.d/95fstab-sys/module-setup.sh
similarity index 100%
rename from modules.d/95fstab-sys/module-info.sh
rename to modules.d/95fstab-sys/module-setup.sh
diff --git a/modules.d/95iscsi/module-info.sh b/modules.d/95iscsi/module-setup.sh
similarity index 100%
rename from modules.d/95iscsi/module-info.sh
rename to modules.d/95iscsi/module-setup.sh
diff --git a/modules.d/95nbd/module-info.sh b/modules.d/95nbd/module-setup.sh
similarity index 100%
rename from modules.d/95nbd/module-info.sh
rename to modules.d/95nbd/module-setup.sh
diff --git a/modules.d/95nfs/module-info.sh b/modules.d/95nfs/module-setup.sh
similarity index 100%
rename from modules.d/95nfs/module-info.sh
rename to modules.d/95nfs/module-setup.sh
diff --git a/modules.d/95resume/module-info.sh b/modules.d/95resume/module-setup.sh
similarity index 100%
rename from modules.d/95resume/module-info.sh
rename to modules.d/95resume/module-setup.sh
diff --git a/modules.d/95rootfs-block/module-info.sh b/modules.d/95rootfs-block/module-setup.sh
similarity index 100%
rename from modules.d/95rootfs-block/module-info.sh
rename to modules.d/95rootfs-block/module-setup.sh
diff --git a/modules.d/95terminfo/module-info.sh b/modules.d/95terminfo/module-setup.sh
similarity index 100%
rename from modules.d/95terminfo/module-info.sh
rename to modules.d/95terminfo/module-setup.sh
diff --git a/modules.d/95udev-rules/module-info.sh b/modules.d/95udev-rules/module-setup.sh
similarity index 100%
rename from modules.d/95udev-rules/module-info.sh
rename to modules.d/95udev-rules/module-setup.sh
diff --git a/modules.d/95zfcp/module-info.sh b/modules.d/95zfcp/module-setup.sh
similarity index 100%
rename from modules.d/95zfcp/module-info.sh
rename to modules.d/95zfcp/module-setup.sh
diff --git a/modules.d/95znet/module-info.sh b/modules.d/95znet/module-setup.sh
similarity index 100%
rename from modules.d/95znet/module-info.sh
rename to modules.d/95znet/module-setup.sh
diff --git a/modules.d/96insmodpost/module-info.sh b/modules.d/96insmodpost/module-setup.sh
similarity index 100%
rename from modules.d/96insmodpost/module-info.sh
rename to modules.d/96insmodpost/module-setup.sh
diff --git a/modules.d/97biosdevname/module-info.sh b/modules.d/97biosdevname/module-setup.sh
similarity index 100%
rename from modules.d/97biosdevname/module-info.sh
rename to modules.d/97biosdevname/module-setup.sh
diff --git a/modules.d/98selinux/module-info.sh b/modules.d/98selinux/module-setup.sh
similarity index 100%
rename from modules.d/98selinux/module-info.sh
rename to modules.d/98selinux/module-setup.sh
diff --git a/modules.d/98syslog/module-info.sh b/modules.d/98syslog/module-setup.sh
similarity index 100%
rename from modules.d/98syslog/module-info.sh
rename to modules.d/98syslog/module-setup.sh
diff --git a/modules.d/99base/module-info.sh b/modules.d/99base/module-setup.sh
similarity index 100%
rename from modules.d/99base/module-info.sh
rename to modules.d/99base/module-setup.sh