diff --git a/:usr:local/afpfs-ng-OSX/bin/AFP2_mount_vars b/:usr:local/afpfs-ng/bin/AFP2_mount_vars
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/AFP2_mount_vars
rename to :usr:local/afpfs-ng/bin/AFP2_mount_vars
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Info.plist b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Info.plist
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Info.plist
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Info.plist
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/MacOS/afpfs-ng-OSX.mount_cmd b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/MacOS/afpfs-ng-OSX.mount_cmd
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/MacOS/afpfs-ng-OSX.mount_cmd
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/MacOS/afpfs-ng-OSX.mount_cmd
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/AppSettings.plist b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/AppSettings.plist
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/AppSettings.plist
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/AppSettings.plist
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/MainMenu.nib b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/MainMenu.nib
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/MainMenu.nib
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/MainMenu.nib
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/appIcon.icns b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/appIcon.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/appIcon.icns
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/appIcon.icns
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/script b/:usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/script
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.mount_cmd.app/Contents/Resources/script
rename to :usr:local/afpfs-ng/bin/afpfs-ng.mount_cmd.app/Contents/Resources/script
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Info.plist b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Info.plist
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Info.plist
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Info.plist
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/MacOS/applet b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/MacOS/applet
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/MacOS/applet
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/MacOS/applet
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/PkgInfo b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/PkgInfo
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/PkgInfo
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/PkgInfo
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/Scripts/main.scpt b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/Scripts/main.scpt
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/Scripts/main.scpt
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/Scripts/main.scpt
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.icns b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/applet.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.icns
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/applet.icns
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.rsrc b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/applet.rsrc
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/applet.rsrc
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/applet.rsrc
diff --git a/:usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf b/:usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/bin/afpfs-ng-OSX.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf
rename to :usr:local/afpfs-ng/bin/afpfs-ng.volume_select.app/Contents/Resources/description.rtfd/TXT.rtf
diff --git a/:usr:local/afpfs-ng-OSX/icon/logged_on_folder.icns b/:usr:local/afpfs-ng/icon/logged_on_folder.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/icon/logged_on_folder.icns
rename to :usr:local/afpfs-ng/icon/logged_on_folder.icns
diff --git a/:usr:local/afpfs-ng-OSX/icon/server.icns b/:usr:local/afpfs-ng/icon/server.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/icon/server.icns
rename to :usr:local/afpfs-ng/icon/server.icns
diff --git a/:usr:local/afpfs-ng-OSX/icon/shared_folder.icns b/:usr:local/afpfs-ng/icon/shared_folder.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/icon/shared_folder.icns
rename to :usr:local/afpfs-ng/icon/shared_folder.icns
diff --git a/:usr:local/afpfs-ng-OSX/icon/shared_volume.icns b/:usr:local/afpfs-ng/icon/shared_volume.icns
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/icon/shared_volume.icns
rename to :usr:local/afpfs-ng/icon/shared_volume.icns
diff --git a/:usr:local/afpfs-ng-OSX/link/AFP2 Mounts/make_dir b/:usr:local/afpfs-ng/link/AFP2 Mounts/make_dir
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/link/AFP2 Mounts/make_dir
rename to :usr:local/afpfs-ng/link/AFP2 Mounts/make_dir
diff --git a/:usr:local/afpfs-ng-OSX/mount/make_dir b/:usr:local/afpfs-ng/mount/make_dir
similarity index 100%
rename from :usr:local/afpfs-ng-OSX/mount/make_dir
rename to :usr:local/afpfs-ng/mount/make_dir
diff --git a/source/afpfs-ng-OSX.mount_cmd.command b/source/afpfs-ng.mount_cmd.command
similarity index 50%
rename from source/afpfs-ng-OSX.mount_cmd.command
rename to source/afpfs-ng.mount_cmd.command
index a4496c3..11a8572 100755
--- a/source/afpfs-ng-OSX.mount_cmd.command
+++ b/source/afpfs-ng.mount_cmd.command
@@ -1,22 +1,22 @@
 #!/bin/bash
 
 # only run commands if mount variables file is not empty (contains variables)
-if [ -s /usr/local/afpfs-ng-OSX/bin/AFP2_mount_vars ]; then \
+if [ -s /usr/local/afpfs-ng/bin/AFP2_mount_vars ]; then \
 
-source /usr/local/afpfs-ng-OSX/bin/AFP2_mount_vars
-mount_afp2 afp://"$afpServerIP"/"$afpVolumeName" /usr/local/afpfs-ng-OSX/mount/"$afpMountName"
+source /usr/local/afpfs-ng/bin/AFP2_mount_vars
+mount_afp2 afp://"$afpServerIP"/"$afpVolumeName" /usr/local/afpfs-ng/mount/"$afpMountName"
 
 osascript -e 'tell application "Finder"
-make new alias to POSIX file "/usr/local/afpfs-ng-OSX/mount/'"$afpMountName"'" at POSIX file "/usr/local/afpfs-ng-OSX/link/AFP2 Mounts"
+make new alias to POSIX file "/usr/local/afpfs-ng/mount/'"$afpMountName"'" at POSIX file "/usr/local/afpfs-ng/link/AFP2 Mounts"
 set name of result to "'"$afpMountName"'"
 end tell'
 
 # clear content of mount variables file
-> /usr/local/afpfs-ng-OSX/bin/AFP2_mount_vars
+> /usr/local/afpfs-ng/bin/AFP2_mount_vars
 
 sleep 2
 
 # force quit volume selection app (required when first ran after system boot, probably due to bug in AppleScript)
-kill $(ps -ax | grep "afpfs-ng-OSX.volume_select.app" | awk '!/grep/' | cut -c 1-5)
+kill $(ps -ax | grep "afpfs-ng.volume_select.app" | awk '!/grep/' | cut -c 1-5)
 
 fi
diff --git a/source/afpfs-ng-OSX.volume_select.scpt b/source/afpfs-ng.volume_select.scpt
similarity index 85%
rename from source/afpfs-ng-OSX.volume_select.scpt
rename to source/afpfs-ng.volume_select.scpt
index b92d47c..f28537a 100755
Binary files a/source/afpfs-ng-OSX.volume_select.scpt and b/source/afpfs-ng.volume_select.scpt differ
diff --git a/source/post-installation script/afpfs-ng-OSX.post_install.command b/source/post-installation script/afpfs-ng.post_install.command
similarity index 100%
rename from source/post-installation script/afpfs-ng-OSX.post_install.command
rename to source/post-installation script/afpfs-ng.post_install.command
diff --git a/~:Library/Scripts/afpfs-ng-OSX/Unmount ALL AFP2.x volumes.scpt b/~:Library/Scripts/afpfs-ng-OSX/Unmount ALL AFP2.x volumes.scpt
deleted file mode 100755
index a48218e..0000000
Binary files a/~:Library/Scripts/afpfs-ng-OSX/Unmount ALL AFP2.x volumes.scpt and /dev/null differ
diff --git a/~:Library/Scripts/afpfs-ng-OSX/Mount AFP2.x volume.scpt b/~:Library/Scripts/afpfs-ng/Mount AFP2.x volume.scpt
similarity index 53%
rename from ~:Library/Scripts/afpfs-ng-OSX/Mount AFP2.x volume.scpt
rename to ~:Library/Scripts/afpfs-ng/Mount AFP2.x volume.scpt
index f6d7a3a..96c69a2 100755
Binary files a/~:Library/Scripts/afpfs-ng-OSX/Mount AFP2.x volume.scpt and b/~:Library/Scripts/afpfs-ng/Mount AFP2.x volume.scpt differ
diff --git a/~:Library/Scripts/afpfs-ng/Unmount ALL AFP2.x volumes.scpt b/~:Library/Scripts/afpfs-ng/Unmount ALL AFP2.x volumes.scpt
new file mode 100755
index 0000000..ad1b37f
Binary files /dev/null and b/~:Library/Scripts/afpfs-ng/Unmount ALL AFP2.x volumes.scpt differ