diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 5c6e3a408..9b503ace5 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -62,15 +62,13 @@
 
 cmake_minimum_required(VERSION 3.1.0)
 
-# gufi_* scripts
+# gufi_*.py scripts
 set(TOOLS
   find
   getfattr
   ls
   stat
   stats
-
-  jail # gufi_jail is used by sshd_config to prevent commands other than gufi_* from running
 )
 
 # python libraries installed into bin for convenience
@@ -82,32 +80,37 @@ set(LIBRARIES
 if (CLIENT)
   # add the paramiko source for installing
   # keep the trailing / to rename the directory
-  install(DIRECTORY ${DEP_BUILD_PREFIX}/paramiko-master/ DESTINATION lib/GUFI/paramiko COMPONENT Client)
+  install(DIRECTORY "${DEP_BUILD_PREFIX}/paramiko-master/" DESTINATION lib/GUFI/paramiko COMPONENT Client)
 endif()
 
 foreach(TOOL ${TOOLS})
-  configure_file(gufi_${TOOL} gufi_${TOOL} @ONLY)
+  configure_file("gufi_${TOOL}.py" "gufi_${TOOL}" @ONLY)
 
-  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gufi_${TOOL} DESTINATION bin COMPONENT Server)
+  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/gufi_${TOOL}" DESTINATION bin COMPONENT Server)
 
-  # when running make install, client files will not overwrite server files
+  # when building, client files WILL NOT overwrite server files
+  # when installing, client files WILL overwrite server files
   if (CLIENT)
-    configure_file(gufi_client gufi_client_${TOOL} @ONLY)
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gufi_client_${TOOL}
-      RENAME gufi_${TOOL}
+    configure_file("gufi_client.py" "gufi_client_${TOOL}" @ONLY)
+    install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/gufi_client_${TOOL}"
+      RENAME "gufi_${TOOL}"
       DESTINATION bin
       COMPONENT Client)
   endif()
 endforeach()
 
+# gufi_jail is used by sshd_config to prevent commands other than gufi_* from running
+configure_file(gufi_jail gufi_jail @ONLY)
+install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/gufi_jail" DESTINATION bin COMPONENT Server)
+
 foreach(LIB ${LIBRARIES})
-  configure_file(${LIB} ${LIB} @ONLY)
+  configure_file("${LIB}" "${LIB}" @ONLY)
 
-  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${LIB} DESTINATION bin COMPONENT Server)
+  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${LIB}" DESTINATION bin COMPONENT Server)
 
   # when running make install, client files will not overwrite server files
   if (CLIENT)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIB} DESTINATION bin COMPONENT Client)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LIB}" DESTINATION bin COMPONENT Client)
   endif()
 endforeach()
 
diff --git a/scripts/gufi_client b/scripts/gufi_client.py
similarity index 100%
rename from scripts/gufi_client
rename to scripts/gufi_client.py
diff --git a/scripts/gufi_find b/scripts/gufi_find.py
similarity index 100%
rename from scripts/gufi_find
rename to scripts/gufi_find.py
diff --git a/scripts/gufi_getfattr b/scripts/gufi_getfattr.py
similarity index 100%
rename from scripts/gufi_getfattr
rename to scripts/gufi_getfattr.py
diff --git a/scripts/gufi_ls b/scripts/gufi_ls.py
similarity index 100%
rename from scripts/gufi_ls
rename to scripts/gufi_ls.py
diff --git a/scripts/gufi_stat b/scripts/gufi_stat.py
similarity index 100%
rename from scripts/gufi_stat
rename to scripts/gufi_stat.py
diff --git a/scripts/gufi_stats b/scripts/gufi_stats.py
similarity index 100%
rename from scripts/gufi_stats
rename to scripts/gufi_stats.py