diff --git a/makeanything.sh b/makeanything.sh
index cf90a91..bd777ae 100755
--- a/makeanything.sh
+++ b/makeanything.sh
@@ -119,8 +119,8 @@ find build/chroot/usr/share/icons/ -type d | sed 's/build\/chroot//g' > build/tm
 sed -i -e 's/^/\ \ \ \ <IconPath>/g' -e 's/$/<\/IconPath>/g' build/tmp/jwm.iconlist
 sudo cp build/tmp/jwm.iconlist build/chroot/tmp/ || error
 
-message "putting generated icon path list to /etc/jwm/system.jwmrc"
-$CHROOTCMD sed -i '/<\!-- GENERATED ICONLIST -->/r /tmp/jwm.iconlist' /etc/jwm/system.jwmrc || error
+message "putting generated icon path list to /etc/jwm/system.nanodesk.jwmrc"
+$CHROOTCMD sed -i '/<\!-- GENERATED ICONLIST -->/r /tmp/jwm.iconlist' /etc/jwm/system.nanodesk.jwmrc || error
 
 message "correct file permissions"
 #$CHROOTCMD /usr/bin/chmod 440 /etc/sudoers || error
diff --git a/nanodesk-files/usr/share/xsessions/jwm-nanodesk.desktop b/nanodesk-files/usr/share/xsessions/nanodesk.desktop
similarity index 65%
rename from nanodesk-files/usr/share/xsessions/jwm-nanodesk.desktop
rename to nanodesk-files/usr/share/xsessions/nanodesk.desktop
index bfbc56c..aba15b4 100644
--- a/nanodesk-files/usr/share/xsessions/jwm-nanodesk.desktop
+++ b/nanodesk-files/usr/share/xsessions/nanodesk.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=Jwm
-Comment=Minimalistic pure X11 window manager with menu/tray support
+Name=nanodesk
+Comment=nanodesk configuration for jwm - Minimalistic pure X11 window manager with menu/tray support
 Type=Application
 Terminal=False
 Exec=/usr/bin/jwm -f /etc/jwm/system.nanodesk.jwmrc