diff --git a/shell_integration/icons/CMakeLists.txt b/shell_integration/icons/CMakeLists.txt
index 5e2c958df..04235c55b 100644
--- a/shell_integration/icons/CMakeLists.txt
+++ b/shell_integration/icons/CMakeLists.txt
@@ -7,7 +7,7 @@ if( UNIX AND NOT APPLE )
 	FOREACH( file ${files} )
 	    # the GLOB returns a absolute path. Make it relative by replacing the current src dir by nothing
 	    STRING(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/${size}/" "" shortFile ${file})
-	    STRING(REPLACE "oC" ${APPLICATION_NAME} brandedName ${shortFile})
+	    STRING(REPLACE "oC" ${APPLICATION_SHORTNAME} brandedName ${shortFile})
 	    install(FILES ${file} DESTINATION ${ICON_DIR}/${size}/apps RENAME ${brandedName})
 	ENDFOREACH(file)
     ENDFOREACH(size)
diff --git a/shell_integration/nautilus/CMakeLists.txt b/shell_integration/nautilus/CMakeLists.txt
index 21f557d2f..d8f75d8a5 100644
--- a/shell_integration/nautilus/CMakeLists.txt
+++ b/shell_integration/nautilus/CMakeLists.txt
@@ -3,8 +3,6 @@
 if( UNIX AND NOT APPLE )
 
     configure_file(syncstate.py syncstate.py COPYONLY)
-    configure_file(syncstate.py syncstate_nemo.py COPYONLY)
-    configure_file(syncstate.py syncstate_caja.py COPYONLY)
 
     # Call the setupappname.sh script to set the custom app name.
     set (cmd "${CMAKE_CURRENT_SOURCE_DIR}/setappname.sh")
diff --git a/shell_integration/nautilus/createcajaplugin.sh b/shell_integration/nautilus/createcajaplugin.sh
index 860850d1a..8912d4a3f 100755
--- a/shell_integration/nautilus/createcajaplugin.sh
+++ b/shell_integration/nautilus/createcajaplugin.sh
@@ -3,5 +3,6 @@
 # this script creates a plugin for caja, just by replacing
 # all occurences of Nautilus with Caja (case sensitive).
 
+cp syncstate.py syncstate_caja.py
 sed -i.org -e 's/Nautilus/Caja/g' syncstate_caja.py
 sed -i.org -e 's/nautilus/caja/g' syncstate_caja.py
diff --git a/shell_integration/nautilus/createnemoplugin.sh b/shell_integration/nautilus/createnemoplugin.sh
index c6463b7ff..0e08affc4 100755
--- a/shell_integration/nautilus/createnemoplugin.sh
+++ b/shell_integration/nautilus/createnemoplugin.sh
@@ -3,4 +3,5 @@
 # this script creates a plugin for nemo, just be replacing
 # all occurences of Nautilus with Nemo.
 
+cp syncstate.py syncstate_nemo.py
 sed -i.org -e 's/autilus/emo/g' syncstate_nemo.py