diff --git a/debian/tdebluez.install b/debian/tdebluez.install
index 95a00d4..a1975ae 100644
--- a/debian/tdebluez.install
+++ b/debian/tdebluez.install
@@ -1,6 +1,6 @@
 opt/trinity/bin/tdebluez
 opt/trinity/bin/tdebluezauth
-opt/trinity/bin/tdeioclient
+opt/trinity/bin/tdebluezioclient
 opt/trinity/lib/trinity/tdebluez.so
 opt/trinity/lib/trinity/tdebluez.la
 opt/trinity/lib/libtdeinit_tdebluez.so
diff --git a/src/tdeioclient/CMakeLists.txt b/src/tdeioclient/CMakeLists.txt
index 19cc86d..71bfc28 100644
--- a/src/tdeioclient/CMakeLists.txt
+++ b/src/tdeioclient/CMakeLists.txt
@@ -9,16 +9,15 @@
 #
 #################################################
 
-project (tdeioclient)
+project (tdebluezioclient)
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/src/libtdebluez
-  ${CMAKE_SOURCE_DIR}/src/tdeioclient
   ${CMAKE_BINARY_DIR}/src
-  ${CMAKE_BINARY_DIR}/src/tdeioclient
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${DBUS_INCLUDE_DIRS}
@@ -29,11 +28,11 @@ link_directories(
   ${TQT_LIBRARY_DIRS}
 )
 
-##### tdeioclient (tdeinit) ######################
+##### tdebluezioclient ###########################
 
-tde_add_executable ( tdeioclient AUTOMOC
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
   SOURCES
-  	commandhandler.cpp main.cpp 
+    commandhandler.cpp main.cpp
   LINK
     ${DBUS_TQT_LIBRARIES} tdecore-shared tdebluez-shared tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
diff --git a/src/tdeioclient/main.cpp b/src/tdeioclient/main.cpp
index 59762b7..cfd8e82 100644
--- a/src/tdeioclient/main.cpp
+++ b/src/tdeioclient/main.cpp
@@ -55,8 +55,8 @@ static TDECmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    TDEAboutData about("tdeioclient",
-            I18N_NOOP("tdeio client"),
+    TDEAboutData about("tdebluezioclient",
+            I18N_NOOP("tdeio client for tdebluez"),
             version, description,
             TDEAboutData::License_GPL,
             "(C) 2004 Fred Schaettgen", 0, 0,