diff --git a/skel-root/coolstream/hd1/etc/mdev.conf b/skel-root/coolstream/hd1/etc/mdev.conf
index 24657dbc..9610a93c 100644
--- a/skel-root/coolstream/hd1/etc/mdev.conf
+++ b/skel-root/coolstream/hd1/etc/mdev.conf
@@ -1,13 +1,16 @@
-# Provide user, group, and mode information for devices.  If a regex matches
-# the device name provided by sysfs, use the appropriate user:group and mode
-# instead of the default 0:0 660.
-#
+# /etc/mdev.conf
+
 # Syntax:
-# [-]devicename_regex user:group mode [>|=path] [@|$|*cmd args...]
+# [-]devicename_regex user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
+# [-]$ENVVAR=regex    user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
+# [-]@maj,min[-min2]  user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
 #
+# [-]: do not stop on this match, continue reading mdev.conf
 # =: move, >: move and create a symlink
-# @|$|*: run $cmd on delete, @cmd on create, *cmd on both
+# !: do not create device node
+# @|$|*: run cmd if $ACTION=remove, @cmd if $ACTION=add, *cmd in all cases
 
+# Support module loading on hotplug
 #$MODALIAS=.*		root:root	0660	@/bin/busybox modprobe "$MODALIAS"
 
 null			root:root	0666
@@ -32,24 +35,24 @@ mice			root:root	0640	=input/
 mouse[0-9]+		root:root	0640	=input/
 
 # USB devices
-[0-3]-.*:1.0		root:root	0660	*/lib/mdev/usb/usbcontrol
+[0-3]-.*:1.0		root:root	0660	*/lib/mdev/usb/mdev-usb
 
 # Mass-storage devices
-sd[a-z][0-9]		root:root	0664	*/lib/mdev/fs/mount
+sd[a-z][0-9]		root:root	0664	*/lib/mdev/fs/mdev-mount
 # Disc devices
-sr[0-9]			root:root	0664	*/lib/mdev/fs/mount
+sr[0-9]			root:root	0664	*/lib/mdev/fs/mdev-mount
 
 # WLAN devices
-ra[0-9]*		root:root	0644	*/lib/mdev/net/wlan
-rausb[0-9]*		root:root	0644	*/lib/mdev/net/wlan
-wlan[0-9]*		root:root	0644	*/lib/mdev/net/wlan
+ra[0-9]*		root:root	0644	*/lib/mdev/net/mdev-wlan
+rausb[0-9]*		root:root	0644	*/lib/mdev/net/mdev-wlan
+wlan[0-9]*		root:root	0644	*/lib/mdev/net/mdev-wlan
 
-# block devices: group -> disk
+# Block devices: group -> disk
 mtdblock[0-9]		root:root	0600
 
-# double up flash characters devices
+# Double up flash characters devices
 mtd[0-9]+		root:root	0600
 mtd[0-9]+ro		root:root	0600
 
-# everything else
-.*			root:root	0600	*/lib/mdev/common/mdevlog
+# Log all other devices. Right now useful only for debuging.
+.*			root:root	0600	*/lib/mdev/common/mdev-log-only
diff --git a/skel-root/coolstream/hd1/lib/mdev/common/mdevlog b/skel-root/coolstream/hd1/lib/mdev/common/mdev-log-only
similarity index 100%
rename from skel-root/coolstream/hd1/lib/mdev/common/mdevlog
rename to skel-root/coolstream/hd1/lib/mdev/common/mdev-log-only
diff --git a/skel-root/coolstream/hd1/lib/mdev/common/mdevprobe b/skel-root/coolstream/hd1/lib/mdev/common/mdev-modprobe
similarity index 100%
rename from skel-root/coolstream/hd1/lib/mdev/common/mdevprobe
rename to skel-root/coolstream/hd1/lib/mdev/common/mdev-modprobe
diff --git a/skel-root/coolstream/hd1/lib/mdev/common/mdevmodule b/skel-root/coolstream/hd1/lib/mdev/common/mdev-module
similarity index 67%
rename from skel-root/coolstream/hd1/lib/mdev/common/mdevmodule
rename to skel-root/coolstream/hd1/lib/mdev/common/mdev-module
index 2764c456..cfc142fd 100755
--- a/skel-root/coolstream/hd1/lib/mdev/common/mdevmodule
+++ b/skel-root/coolstream/hd1/lib/mdev/common/mdev-module
@@ -3,4 +3,4 @@
 . /etc/init.d/globals
 
 LOGINFO "${ACTION:-scan} module chain $@"
-/lib/mdev/common/mdevprobe "$@"
+/lib/mdev/common/mdev-modprobe "$@"
diff --git a/skel-root/coolstream/hd1/lib/mdev/fs/mount b/skel-root/coolstream/hd1/lib/mdev/fs/mdev-mount
similarity index 100%
rename from skel-root/coolstream/hd1/lib/mdev/fs/mount
rename to skel-root/coolstream/hd1/lib/mdev/fs/mdev-mount
diff --git a/skel-root/coolstream/hd1/lib/mdev/net/wlan b/skel-root/coolstream/hd1/lib/mdev/net/mdev-wlan
similarity index 100%
rename from skel-root/coolstream/hd1/lib/mdev/net/wlan
rename to skel-root/coolstream/hd1/lib/mdev/net/mdev-wlan
diff --git a/skel-root/coolstream/hd1/lib/mdev/usb/eventvars b/skel-root/coolstream/hd1/lib/mdev/usb/coldplug-setenv
similarity index 100%
rename from skel-root/coolstream/hd1/lib/mdev/usb/eventvars
rename to skel-root/coolstream/hd1/lib/mdev/usb/coldplug-setenv
diff --git a/skel-root/coolstream/hd1/lib/mdev/usb/usbcontrol b/skel-root/coolstream/hd1/lib/mdev/usb/mdev-usb
similarity index 96%
rename from skel-root/coolstream/hd1/lib/mdev/usb/usbcontrol
rename to skel-root/coolstream/hd1/lib/mdev/usb/mdev-usb
index 167c47b6..b90bfd5d 100755
--- a/skel-root/coolstream/hd1/lib/mdev/usb/usbcontrol
+++ b/skel-root/coolstream/hd1/lib/mdev/usb/mdev-usb
@@ -3,7 +3,7 @@
 . /etc/init.d/globals
 
 # setup environment for coldplug events
-[ -z "$ACTION" ] && . /lib/mdev/usb/eventvars
+[ -z "$ACTION" ] && . /lib/mdev/usb/coldplug-setenv
 
 # get proper product and manufacturer description (only works for ACTION=add)
 [ -z "$DEVPATH" ] && LOGERROR 'uevent environment variable DEVPATH is unset' && exit 1
@@ -116,4 +116,4 @@ case $TYPE in
 		;;
 esac
 
-/lib/mdev/common/mdevprobe $MODALIAS
+/lib/mdev/common/mdev-modprobe $MODALIAS
diff --git a/skel-root/coolstream/hd2/etc/mdev.conf b/skel-root/coolstream/hd2/etc/mdev.conf
index 022f9793..fcb9feec 100644
--- a/skel-root/coolstream/hd2/etc/mdev.conf
+++ b/skel-root/coolstream/hd2/etc/mdev.conf
@@ -1,13 +1,16 @@
-# Provide user, group, and mode information for devices.  If a regex matches
-# the device name provided by sysfs, use the appropriate user:group and mode
-# instead of the default 0:0 660.
-#
+# /etc/mdev.conf
+
 # Syntax:
-# [-]devicename_regex user:group mode [>|=path] [@|$|*cmd args...]
+# [-]devicename_regex user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
+# [-]$ENVVAR=regex    user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
+# [-]@maj,min[-min2]  user:group mode [=path]|[>path]|[!] [@|$|*cmd args...]
 #
+# [-]: do not stop on this match, continue reading mdev.conf
 # =: move, >: move and create a symlink
-# @|$|*: run $cmd on delete, @cmd on create, *cmd on both
+# !: do not create device node
+# @|$|*: run cmd if $ACTION=remove, @cmd if $ACTION=add, *cmd in all cases
 
+# Support module loading on hotplug
 #$MODALIAS=.*		root:root	0660	@/bin/busybox modprobe "$MODALIAS"
 
 null			root:root	0666
@@ -32,26 +35,26 @@ mice			root:root	0640	=input/
 mouse[0-9]+		root:root	0640	=input/
 
 # USB devices
-[0-3]-.*:1.0		root:root	0660	*/lib/mdev/usb/usbcontrol
+[0-3]-.*:1.0		root:root	0660	*/lib/mdev/usb/mdev-usb
 
 # Mass-storage devices
-sd[a-z][0-9]		root:root	0664	*/lib/mdev/fs/mount
+sd[a-z][0-9]		root:root	0664	*/lib/mdev/fs/mdev-mount
 # Disc devices
-sr[0-9]			root:root	0664	*/lib/mdev/fs/mount
+sr[0-9]			root:root	0664	*/lib/mdev/fs/mdev-mount
 # Memory cards
-mmcblk[0-9]p[0-9]	root:root	0664	*/lib/mdev/fs/mount
+mmcblk[0-9]p[0-9]	root:root	0664	*/lib/mdev/fs/mdev-mount
 
 # WLAN devices
-ra[0-9]*		root:root	0644	*/lib/mdev/net/wlan
-rausb[0-9]*		root:root	0644	*/lib/mdev/net/wlan
-wlan[0-9]*		root:root	0644	*/lib/mdev/net/wlan
+ra[0-9]*		root:root	0644	*/lib/mdev/net/mdev-wlan
+rausb[0-9]*		root:root	0644	*/lib/mdev/net/mdev-wlan
+wlan[0-9]*		root:root	0644	*/lib/mdev/net/mdev-wlan
 
-# block devices: group -> disk
+# Block devices: group -> disk
 mtdblock[0-9]		root:root	0600
 
-# double up flash characters devices
+# Double up flash characters devices
 mtd[0-9]+		root:root	0600
 mtd[0-9]+ro		root:root	0600
 
-# everything else
-.*			root:root	0600	*/lib/mdev/common/mdevlog
+# Log all other devices. Right now useful only for debuging.
+.*			root:root	0600	*/lib/mdev/common/mdev-log-only
diff --git a/skel-root/coolstream/hd2/lib/mdev/common/mdevlog b/skel-root/coolstream/hd2/lib/mdev/common/mdev-log-only
similarity index 100%
rename from skel-root/coolstream/hd2/lib/mdev/common/mdevlog
rename to skel-root/coolstream/hd2/lib/mdev/common/mdev-log-only
diff --git a/skel-root/coolstream/hd2/lib/mdev/common/mdevprobe b/skel-root/coolstream/hd2/lib/mdev/common/mdev-modprobe
similarity index 100%
rename from skel-root/coolstream/hd2/lib/mdev/common/mdevprobe
rename to skel-root/coolstream/hd2/lib/mdev/common/mdev-modprobe
diff --git a/skel-root/coolstream/hd2/lib/mdev/common/mdevmodule b/skel-root/coolstream/hd2/lib/mdev/common/mdev-module
similarity index 67%
rename from skel-root/coolstream/hd2/lib/mdev/common/mdevmodule
rename to skel-root/coolstream/hd2/lib/mdev/common/mdev-module
index 2764c456..cfc142fd 100755
--- a/skel-root/coolstream/hd2/lib/mdev/common/mdevmodule
+++ b/skel-root/coolstream/hd2/lib/mdev/common/mdev-module
@@ -3,4 +3,4 @@
 . /etc/init.d/globals
 
 LOGINFO "${ACTION:-scan} module chain $@"
-/lib/mdev/common/mdevprobe "$@"
+/lib/mdev/common/mdev-modprobe "$@"
diff --git a/skel-root/coolstream/hd2/lib/mdev/fs/mount b/skel-root/coolstream/hd2/lib/mdev/fs/mdev-mount
similarity index 100%
rename from skel-root/coolstream/hd2/lib/mdev/fs/mount
rename to skel-root/coolstream/hd2/lib/mdev/fs/mdev-mount
diff --git a/skel-root/coolstream/hd2/lib/mdev/net/wlan b/skel-root/coolstream/hd2/lib/mdev/net/mdev-wlan
similarity index 100%
rename from skel-root/coolstream/hd2/lib/mdev/net/wlan
rename to skel-root/coolstream/hd2/lib/mdev/net/mdev-wlan
diff --git a/skel-root/coolstream/hd2/lib/mdev/usb/eventvars b/skel-root/coolstream/hd2/lib/mdev/usb/coldplug-setenv
old mode 100755
new mode 100644
similarity index 100%
rename from skel-root/coolstream/hd2/lib/mdev/usb/eventvars
rename to skel-root/coolstream/hd2/lib/mdev/usb/coldplug-setenv
diff --git a/skel-root/coolstream/hd2/lib/mdev/usb/usbcontrol b/skel-root/coolstream/hd2/lib/mdev/usb/mdev-usb
similarity index 96%
rename from skel-root/coolstream/hd2/lib/mdev/usb/usbcontrol
rename to skel-root/coolstream/hd2/lib/mdev/usb/mdev-usb
index 167c47b6..b90bfd5d 100755
--- a/skel-root/coolstream/hd2/lib/mdev/usb/usbcontrol
+++ b/skel-root/coolstream/hd2/lib/mdev/usb/mdev-usb
@@ -3,7 +3,7 @@
 . /etc/init.d/globals
 
 # setup environment for coldplug events
-[ -z "$ACTION" ] && . /lib/mdev/usb/eventvars
+[ -z "$ACTION" ] && . /lib/mdev/usb/coldplug-setenv
 
 # get proper product and manufacturer description (only works for ACTION=add)
 [ -z "$DEVPATH" ] && LOGERROR 'uevent environment variable DEVPATH is unset' && exit 1
@@ -116,4 +116,4 @@ case $TYPE in
 		;;
 esac
 
-/lib/mdev/common/mdevprobe $MODALIAS
+/lib/mdev/common/mdev-modprobe $MODALIAS