diff --git a/tdelirc/irkick/CMakeLists.txt b/tdelirc/irkick/CMakeLists.txt
index d8d14d9..415c3b7 100644
--- a/tdelirc/irkick/CMakeLists.txt
+++ b/tdelirc/irkick/CMakeLists.txt
@@ -30,7 +30,7 @@ link_directories(
 
 tde_add_library( irkick_common STATIC_PIC AUTOMOC
   SOURCES irkick.cpp irkick.skel
-    irkick.stub klircclient.cpp
+    irkick.stub tdelircclient.cpp
   LINK tdeui-shared tdelirc-static
 )
 
diff --git a/tdelirc/irkick/Makefile.am b/tdelirc/irkick/Makefile.am
index c30b7bb..6e3e0d3 100644
--- a/tdelirc/irkick/Makefile.am
+++ b/tdelirc/irkick/Makefile.am
@@ -8,7 +8,7 @@ tdeinit_LTLIBRARIES = irkick.la
 CLEANFILES = dummy.cpp
 
 libirkick_common_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDESYCOCA) ../tdelirc/libtdelirc.la
-libirkick_common_la_SOURCES = main.cpp irkick.cpp irkick.skel irkick.stub klircclient.cpp
+libirkick_common_la_SOURCES = main.cpp irkick.cpp irkick.skel irkick.stub tdelircclient.cpp
 
 libirkick_common_la_LDFLAGS = $(all_libraries)
 
@@ -30,11 +30,11 @@ dummy.cpp:
 #kdedservicesdir = $(kde_servicesdir)/kded
 #kdedservices_DATA = irkick.desktop
 #lib_LTLIBRARIES = libkded_irkick.la
-#libkded_irkick_la_SOURCES = irkick.cpp irkick.skel irkick.stub klircclient.cpp
+#libkded_irkick_la_SOURCES = irkick.cpp irkick.skel irkick.stub tdelircclient.cpp
 #libkded_irkick_la_LDFLAGS = $(all_libraries) -module -avoid-version
 #libkded_irkick_la_LIBADD = $(LIB_TDECORE) ../tdelirc/libtdelirc.la
 
-noinst_HEADERS = irkick.h klircclient.h irkick_stub.h
+noinst_HEADERS = irkick.h tdelircclient.h irkick_stub.h
 
 INCLUDES = -I$(srcdir)/../tdelirc $(all_includes)
 
diff --git a/tdelirc/irkick/irkick.h b/tdelirc/irkick/irkick.h
index 786e100..cecc26b 100644
--- a/tdelirc/irkick/irkick.h
+++ b/tdelirc/irkick/irkick.h
@@ -24,7 +24,7 @@
 
 #include "modes.h"
 #include "iractions.h"
-#include "klircclient.h"
+#include "tdelircclient.h"
 
 class TQMouseEvent;
 
diff --git a/tdelirc/irkick/klircclient.cpp b/tdelirc/irkick/tdelircclient.cpp
similarity index 98%
rename from tdelirc/irkick/klircclient.cpp
rename to tdelirc/irkick/tdelircclient.cpp
index b7051fc..feb69cb 100644
--- a/tdelirc/irkick/klircclient.cpp
+++ b/tdelirc/irkick/tdelircclient.cpp
@@ -40,7 +40,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 
-#include "klircclient.h"
+#include "tdelircclient.h"
 
 
 KLircClient::KLircClient(TQWidget *parent, const char *name) : TQObject(parent, name), theSocket(0), listIsUpToDate(false)
@@ -238,4 +238,4 @@ void KLircClient::sendCommand(const TQString &command)
 }
 
 
-#include "klircclient.moc"
+#include "tdelircclient.moc"
diff --git a/tdelirc/irkick/klircclient.h b/tdelirc/irkick/tdelircclient.h
similarity index 97%
rename from tdelirc/irkick/klircclient.h
rename to tdelirc/irkick/tdelircclient.h
index 3af4637..68c1906 100644
--- a/tdelirc/irkick/klircclient.h
+++ b/tdelirc/irkick/tdelircclient.h
@@ -10,8 +10,8 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
-#ifndef KLIRCCLIENT_H
-#define KLIRCCLIENT_H
+#ifndef TDELIRCCLIENT_H
+#define TDELIRCCLIENT_H
 
 #include <tqobject.h>
 #include <tqmap.h>