diff --git a/MacOS_X_InstallGuide.md b/MacOS_X_InstallGuide.md
index 56bdb78c6..330d2fb4e 100644
--- a/MacOS_X_InstallGuide.md
+++ b/MacOS_X_InstallGuide.md
@@ -89,4 +89,4 @@ You can now compile RS into Qt Creator or with terminal
 
 You can change Target and SDK in *./retroshare.pri:82* changing value of QMAKE_MACOSX_DEPLOYMENT_TARGET and QMAKE_MAC_SDK
 
-You can find compiled application on *./retroshare/retroshare-gui/src/RetroShare06.app*
+You can find compiled application on *./retroshare/retroshare-gui/src/retroshare06.app*
diff --git a/README.md b/README.md
index 2a7ebbdd0..d0316dc95 100644
--- a/README.md
+++ b/README.md
@@ -68,8 +68,8 @@ Compilation on Linux
 
    The executables produced will be:
 
-         /usr/bin/RetroShare06
-         /usr/bin/RetroShare06-nogui
+         /usr/bin/retroshare06
+         /usr/bin/retroshare06-nogui
 
 5. Uninstall:
    ```bash
diff --git a/Start_RetroShare-Gui_Debug.bat b/Start_RetroShare-Gui_Debug.bat
index 3ba38c3f8..53c57b2a0 100755
--- a/Start_RetroShare-Gui_Debug.bat
+++ b/Start_RetroShare-Gui_Debug.bat
@@ -4,8 +4,8 @@ set RSPATH=.\retroshare-gui\src\debug
 
 set PATH=%QTDIR%\bin;%LIBS%\bin;%PATH%
 
-If not exist %RSPATH%\RetroShare06.exe (
+If not exist %RSPATH%\retroshare06.exe (
   build-all-mingw32make.bat
 )
 
-%RSPATH%\RetroShare06.exe
+%RSPATH%\retroshare06.exe
diff --git a/build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install b/build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install
index c60111bf3..2e58d591d 100644
--- a/build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install
+++ b/build_scripts/Debian+Ubuntu/debian/retroshare06-nogui.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/bin/RetroShare06-nogui
+debian/tmp/usr/bin/retroshare06-nogui
 debian/tmp/usr/share/RetroShare06/bdboot.txt
 debian/tmp/usr/share/RetroShare06/webui/*
diff --git a/build_scripts/Debian+Ubuntu/debian/retroshare06.install b/build_scripts/Debian+Ubuntu/debian/retroshare06.install
index 089770666..4e0582f2f 100644
--- a/build_scripts/Debian+Ubuntu/debian/retroshare06.install
+++ b/build_scripts/Debian+Ubuntu/debian/retroshare06.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/bin/RetroShare06
-debian/tmp/usr/bin/RetroShare06-nogui
+debian/tmp/usr/bin/retroshare06
+debian/tmp/usr/bin/retroshare06-nogui
 debian/tmp/usr/share/applications/retroshare06.desktop
 debian/tmp/usr/share/icons/hicolor/*
 debian/tmp/usr/share/pixmaps/retroshare06.xpm
diff --git a/build_scripts/RedHat+Fedora/data/retroshare.desktop b/build_scripts/RedHat+Fedora/data/retroshare.desktop
index 1e7992a74..49ce10116 100644
--- a/build_scripts/RedHat+Fedora/data/retroshare.desktop
+++ b/build_scripts/RedHat+Fedora/data/retroshare.desktop
@@ -2,7 +2,7 @@
 Version=1.0
 Name=RetroShare06
 Comment=Securely share files with your friends
-Exec=/usr/bin/RetroShare06 %U
+Exec=/usr/bin/retroshare06 %U
 Icon=/usr/share/pixmaps/retroshare06.xpm
 Terminal=false
 Type=Application
diff --git a/build_scripts/RedHat+Fedora/retroshare06.spec b/build_scripts/RedHat+Fedora/retroshare06.spec
index 54d706cf7..45bc74742 100644
--- a/build_scripts/RedHat+Fedora/retroshare06.spec
+++ b/build_scripts/RedHat+Fedora/retroshare06.spec
@@ -72,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/RetroShare06
+%{_bindir}/retroshare06
 %defattr(644, root, root)
 %{_datadir}/pixmaps/%{name}.xpm  
 %{_datadir}/icons/hicolor
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files nogui
 %defattr(-, root, root)
-%{_bindir}/RetroShare06-nogui
+%{_bindir}/retroshare06-nogui
 %defattr(644, root, root)
 %{_datadir}/RetroShare06
 
diff --git a/build_scripts/Windows/build/pack.bat b/build_scripts/Windows/build/pack.bat
index 3e8773614..b466cefc5 100644
--- a/build_scripts/Windows/build/pack.bat
+++ b/build_scripts/Windows/build/pack.bat
@@ -116,7 +116,7 @@ echo copy external binaries
 copy "%RootPath%\libs\bin\*.dll" "%RsDeployPath%" %Quite%
 
 echo copy dependencies
-call :copy_dependencies "%RsDeployPath%\RetroShare06.exe" "%RsDeployPath%"
+call :copy_dependencies "%RsDeployPath%\retroshare06.exe" "%RsDeployPath%"
 
 echo copy Qt DLL's
 copy "%QtPath%\Qt%QtMainVersion1%Svg%QtMainVersion2%.dll" "%RsDeployPath%" %Quite%
diff --git a/build_scripts/Windows/installer/retroshare-Qt4.nsi b/build_scripts/Windows/installer/retroshare-Qt4.nsi
index 4efaa22de..5be261f69 100644
--- a/build_scripts/Windows/installer/retroshare-Qt4.nsi
+++ b/build_scripts/Windows/installer/retroshare-Qt4.nsi
@@ -41,7 +41,7 @@
 !define SOURCEDIR "..\..\.."
 
 # Get version from executable
-!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\RetroShare06.exe" VERSION_
+!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\retroshare06.exe" VERSION_
 !define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD}
 ;!define REVISION ${VERSION_4}
 
@@ -107,7 +107,7 @@ Var StyleSheetDir
 !define MUI_COMPONENTSPAGE_SMALLDESC
 !define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support"
 !define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/"
-!define MUI_FINISHPAGE_RUN "$INSTDIR\RetroShare06.exe"
+!define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare06.exe"
 !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt
 !define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt
 !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
@@ -180,8 +180,8 @@ Section $(Section_Main) Section_Main
 
   ; Main binaries
   SetOutPath "$INSTDIR"
-  File /oname=RetroShare06.exe "${RELEASEDIR}\retroshare-gui\src\release\RetroShare06.exe"
-  File /oname=retroshare06-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\RetroShare06-nogui.exe"
+  File /oname=retroshare06.exe "${RELEASEDIR}\retroshare-gui\src\release\retroshare06.exe"
+  File /oname=retroshare06-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\retroshare06-nogui.exe"
 
   ; Qt binaries
   File "${QTDIR}\bin\QtCore4.dll"
@@ -270,7 +270,7 @@ SectionEnd
 ;  WriteRegStr HKCR retroshare "" "PQI File"
 ;  WriteRegBin HKCR retroshare EditFlags 00000100
 ;  WriteRegStr HKCR "retroshare\shell" "" open
-;  WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\RetroShare06.exe" "%1"`
+;  WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\retroshare06.exe" "%1"`
 ;SectionEnd
 
 # Shortcuts
@@ -279,15 +279,15 @@ Section $(Section_StartMenu) Section_StartMenu
   SetOutPath "$INSTDIR"
   CreateDirectory "$SMPROGRAMS\${APPNAME}"
   CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0
+  CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0
 SectionEnd
 
 Section $(Section_Desktop) Section_Desktop
-  CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0
+  CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0
 SectionEnd
 
 Section $(Section_QuickLaunch) Section_QuickLaunch
-  CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0
+  CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0
 SectionEnd
 SectionGroupEnd
 
@@ -296,7 +296,7 @@ Section $(Section_AutoStart) Section_AutoStart
 SectionEnd
 
 ;Section $(Section_AutoStart) Section_AutoStart
-;  CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe -m" 0
+;  CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe -m" 0
 ;SectionEnd
 
 Section -FinishSection
@@ -305,7 +305,7 @@ Section -FinishSection
     WriteRegStr HKLM "Software\${APPNAME}" "Version" "${VERSION}"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\RetroShare06.exe"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\retroshare06.exe"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${PUBLISHER}"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" "1"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" "1"
diff --git a/build_scripts/Windows/installer/retroshare-Qt5.nsi b/build_scripts/Windows/installer/retroshare-Qt5.nsi
index cda4aff3a..f982bad13 100644
--- a/build_scripts/Windows/installer/retroshare-Qt5.nsi
+++ b/build_scripts/Windows/installer/retroshare-Qt5.nsi
@@ -41,7 +41,7 @@
 !define SOURCEDIR "..\..\.."
 
 # Get version from executable
-!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\RetroShare06.exe" VERSION_
+!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\retroshare06.exe" VERSION_
 !define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD}
 ;!define REVISION ${VERSION_4}
 
@@ -107,7 +107,7 @@ Var StyleSheetDir
 !define MUI_COMPONENTSPAGE_SMALLDESC
 !define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support"
 !define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/"
-!define MUI_FINISHPAGE_RUN "$INSTDIR\RetroShare06.exe"
+!define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare06.exe"
 !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt
 !define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt
 !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
@@ -180,8 +180,8 @@ Section $(Section_Main) Section_Main
 
   ; Main binaries
   SetOutPath "$INSTDIR"
-  File /oname=RetroShare06.exe "${RELEASEDIR}\retroshare-gui\src\release\RetroShare06.exe"
-  File /oname=retroshare06-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\RetroShare06-nogui.exe"
+  File /oname=retroshare06.exe "${RELEASEDIR}\retroshare-gui\src\release\retroshare06.exe"
+  File /oname=retroshare06-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\retroshare06-nogui.exe"
 
   ; Qt binaries
   File "${QTDIR}\bin\Qt5Core.dll"
@@ -288,7 +288,7 @@ SectionEnd
 ;  WriteRegStr HKCR retroshare "" "PQI File"
 ;  WriteRegBin HKCR retroshare EditFlags 00000100
 ;  WriteRegStr HKCR "retroshare\shell" "" open
-;  WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\RetroShare06.exe" "%1"`
+;  WriteRegStr HKCR "retroshare\shell\open\command" "" `"$INSTDIR\retroshare06.exe" "%1"`
 ;SectionEnd
 
 # Shortcuts
@@ -297,15 +297,15 @@ Section $(Section_StartMenu) Section_StartMenu
   SetOutPath "$INSTDIR"
   CreateDirectory "$SMPROGRAMS\${APPNAME}"
   CreateShortCut "$SMPROGRAMS\${APPNAME}\$(Link_Uninstall).lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0
+  CreateShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0
 SectionEnd
 
 Section $(Section_Desktop) Section_Desktop
-  CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0
+  CreateShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0
 SectionEnd
 
 Section $(Section_QuickLaunch) Section_QuickLaunch
-  CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe" 0
+  CreateShortCut "$QUICKLAUNCH\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe" 0
 SectionEnd
 SectionGroupEnd
 
@@ -314,7 +314,7 @@ Section $(Section_AutoStart) Section_AutoStart
 SectionEnd
 
 ;Section $(Section_AutoStart) Section_AutoStart
-;  CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\RetroShare06.exe" "" "$INSTDIR\RetroShare06.exe -m" 0
+;  CreateShortCut "$SMSTARTUP\${APPNAME}.lnk" "$INSTDIR\retroshare06.exe" "" "$INSTDIR\retroshare06.exe -m" 0
 ;SectionEnd
 
 Section -FinishSection
@@ -323,7 +323,7 @@ Section -FinishSection
     WriteRegStr HKLM "Software\${APPNAME}" "Version" "${VERSION}"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\RetroShare06.exe"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\retroshare06.exe"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${PUBLISHER}"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" "1"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" "1"
diff --git a/data/retroshare06.desktop b/data/retroshare06.desktop
index 3d91b7982..6cbf3a9b5 100644
--- a/data/retroshare06.desktop
+++ b/data/retroshare06.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Version=1.0
 Name=RetroShare06
 Comment=Securely share files with your friends
-Exec=/usr/bin/RetroShare06 %U
+Exec=/usr/bin/retroshare06 %U
 Icon=/usr/share/pixmaps/retroshare06.xpm
 Terminal=false
 Type=Application
diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri
index cbfec1b8d..d60d7a94a 100644
--- a/plugins/Common/retroshare_plugin.pri
+++ b/plugins/Common/retroshare_plugin.pri
@@ -80,7 +80,7 @@ macx {
 	#https://developer.apple.com/library/mac/documentation/Porting/Conceptual/PortingUnix/compiling/compiling.html
 	QMAKE_LFLAGS_PLUGIN -= -dynamiclib
 	QMAKE_LFLAGS_PLUGIN += -bundle
-	QMAKE_LFLAGS_PLUGIN += -bundle_loader "../../retroshare-gui/src/RetroShare06.app/Contents/MacOS/RetroShare06"
+	QMAKE_LFLAGS_PLUGIN += -bundle_loader "../../retroshare-gui/src/retroshare06.app/Contents/MacOS/retroshare06"
 
 	OBJECTS_DIR = temp/obj
 	MOC_DIR = temp/moc
diff --git a/retroshare-gui/src/Info.plist b/retroshare-gui/src/Info.plist
index 72df6d774..556074271 100755
--- a/retroshare-gui/src/Info.plist
+++ b/retroshare-gui/src/Info.plist
@@ -13,9 +13,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
-	<string>RetroShare06</string>
+	<string>retroshare06</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.RetroShare06</string>
+	<string>com.retroshare06</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>CFBundleDocumentTypes</key>
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 7c0e24d72..661bcd954 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -4,7 +4,7 @@ TEMPLATE = app
 QT     += network xml
 CONFIG += qt gui uic qrc resources idle bitdht
 CONFIG += link_prl
-TARGET = RetroShare06
+TARGET = retroshare06
 DEFINES += TARGET=\\\"$${TARGET}\\\"
 
 # Plz never commit the .pro with these flags enabled.
diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro
index 358cb65f4..a55caf7de 100644
--- a/retroshare-nogui/src/retroshare-nogui.pro
+++ b/retroshare-nogui/src/retroshare-nogui.pro
@@ -1,7 +1,7 @@
 !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
 
 TEMPLATE = app
-TARGET = RetroShare06-nogui
+TARGET = retroshare06-nogui
 CONFIG += bitdht
 #CONFIG += introserver
 CONFIG -= qt xml gui