12 files changed, 4 insertions, 4 deletions
diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake
index f264f816cb..c3d9d7bd2d 100644
--- a/cmake/scripts/linux/Install.cmake
+++ b/cmake/scripts/linux/Install.cmake
@@ -204,7 +204,7 @@ if(ENABLE_EVENTCLIENTS)
   file(WRITE ${CMAKE_BINARY_DIR}/packages/deb/defs.py ICON_PATH="usr/share/pixmaps/${APP_NAME_LC}/")
   install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/deb/defs.py
                    ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/__init__.py
-                   "${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py"
+                   ${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/PS3BDRemote/ps3_remote.py
                    ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/xbmcclient.py
                    ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/zeroconf.py
           DESTINATION ${PYTHON_LIB_PATH}/${APP_NAME_LC}
@@ -253,7 +253,7 @@ if(ENABLE_EVENTCLIENTS)
           COMPONENT kodi-eventclients-dev)
 
   # Install kodi-eventclients-ps3
-  install(PROGRAMS "${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py"
+  install(PROGRAMS ${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/PS3BDRemote/ps3_remote.py
           RENAME ${APP_NAME_LC}-ps3remote
           DESTINATION ${bindir}
           COMPONENT kodi-eventclients-ps3)
@@ -266,7 +266,7 @@ if(ENABLE_EVENTCLIENTS)
   endif()
 
   # Install kodi-eventclients-xbmc-send
-  install(PROGRAMS "${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/Kodi Send/kodi-send.py"
+  install(PROGRAMS ${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/KodiSend/kodi-send.py
           RENAME ${APP_NAME_LC}-send
           DESTINATION ${bindir}
           COMPONENT kodi-eventclients-xbmc-send)
diff --git a/tools/EventClients/Clients/Kodi Send/kodi-send.py b/tools/EventClients/Clients/KodiSend/kodi-send.py
index c114a22b3b..c114a22b3b 100755
--- a/tools/EventClients/Clients/Kodi Send/kodi-send.py
+++ b/tools/EventClients/Clients/KodiSend/kodi-send.py
diff --git a/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py b/tools/EventClients/Clients/PS3BDRemote/ps3_remote.py
index e902bb8519..e902bb8519 100755
--- a/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py
+++ b/tools/EventClients/Clients/PS3BDRemote/ps3_remote.py
diff --git a/tools/EventClients/Clients/PS3 Sixaxis Controller/README.ubuntu b/tools/EventClients/Clients/PS3SixaxisController/README.ubuntu
index bf4a5a43a8..bf4a5a43a8 100644
--- a/tools/EventClients/Clients/PS3 Sixaxis Controller/README.ubuntu
+++ b/tools/EventClients/Clients/PS3SixaxisController/README.ubuntu
diff --git a/tools/EventClients/Clients/PS3 Sixaxis Controller/ps3d.py b/tools/EventClients/Clients/PS3SixaxisController/ps3d.py
index defc6494a5..254a17961c 100755
--- a/tools/EventClients/Clients/PS3 Sixaxis Controller/ps3d.py
+++ b/tools/EventClients/Clients/PS3SixaxisController/ps3d.py
@@ -25,7 +25,7 @@ import threading
 import os
 
 if os.path.exists("../../lib/python"):
-    sys.path.append("../PS3 BD Remote")
+    sys.path.append("../PS3BDRemote")
     sys.path.append("../../lib/python")
     from bt.hid import HID
     from bt.bt import bt_lookup_name
diff --git a/tools/EventClients/Clients/Xbox360 Controller/Xbox360Controller.cpp b/tools/EventClients/Clients/Xbox360Controller/Xbox360Controller.cpp
index caf2870dca..caf2870dca 100644
--- a/tools/EventClients/Clients/Xbox360 Controller/Xbox360Controller.cpp
+++ b/tools/EventClients/Clients/Xbox360Controller/Xbox360Controller.cpp
diff --git a/tools/EventClients/Clients/Xbox360 Controller/Xbox360Controller.h b/tools/EventClients/Clients/Xbox360Controller/Xbox360Controller.h
index 9ae3be5c15..9ae3be5c15 100644
--- a/tools/EventClients/Clients/Xbox360 Controller/Xbox360Controller.h
+++ b/tools/EventClients/Clients/Xbox360Controller/Xbox360Controller.h
diff --git a/tools/EventClients/Clients/Xbox360 Controller/Xbox360EventClient.cpp b/tools/EventClients/Clients/Xbox360Controller/Xbox360EventClient.cpp
index 077914f446..077914f446 100644
--- a/tools/EventClients/Clients/Xbox360 Controller/Xbox360EventClient.cpp
+++ b/tools/EventClients/Clients/Xbox360Controller/Xbox360EventClient.cpp
diff --git a/tools/EventClients/Clients/Xbox360 Controller/Xbox360EventClient.vcproj b/tools/EventClients/Clients/Xbox360Controller/Xbox360EventClient.vcproj
index 3a5a8b6562..3a5a8b6562 100644
--- a/tools/EventClients/Clients/Xbox360 Controller/Xbox360EventClient.vcproj
+++ b/tools/EventClients/Clients/Xbox360Controller/Xbox360EventClient.vcproj
diff --git a/tools/EventClients/Clients/Xbox360 Controller/stdafx.cpp b/tools/EventClients/Clients/Xbox360Controller/stdafx.cpp
index 648e7e6843..648e7e6843 100644
--- a/tools/EventClients/Clients/Xbox360 Controller/stdafx.cpp
+++ b/tools/EventClients/Clients/Xbox360Controller/stdafx.cpp
diff --git a/tools/EventClients/Clients/Xbox360 Controller/stdafx.h b/tools/EventClients/Clients/Xbox360Controller/stdafx.h
index b005a839de..b005a839de 100644
--- a/tools/EventClients/Clients/Xbox360 Controller/stdafx.h
+++ b/tools/EventClients/Clients/Xbox360Controller/stdafx.h
diff --git a/tools/EventClients/Clients/Xbox360 Controller/targetver.h b/tools/EventClients/Clients/Xbox360Controller/targetver.h
index 6fe8eb79e1..6fe8eb79e1 100644
--- a/tools/EventClients/Clients/Xbox360 Controller/targetver.h
+++ b/tools/EventClients/Clients/Xbox360Controller/targetver.h