diff --git a/client/Makefile.am b/client/Makefile.am
index 3eb3546..1cce474 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -4,19 +4,19 @@ SUBDIRS = config
 
 KDE_CXXFLAGS = -DQT_PLUGIN
 
-INCLUDES = $(all_includes) -I$(kde_includes)/kwin
+INCLUDES = $(all_includes) -I$(kde_includes)/twin
 
-kwindir = $(kde_datadir)/kwin/
-kwin_DATA = crystal.desktop
+twindir = $(kde_datadir)/twin/
+twin_DATA = crystal.desktop
 
 noinst_HEADERS = crystalclient.h crystalbutton.h imageholder.h buttonimage.h tiles.h overlays.h
 
-kde_module_LTLIBRARIES = kwin3_crystal.la
-kwin3_crystal_la_SOURCES = crystalclient.cc myrootpixmap.cc crystalbutton.cpp \
+kde_module_LTLIBRARIES = twin3_crystal.la
+twin3_crystal_la_SOURCES = crystalclient.cc myrootpixmap.cc crystalbutton.cpp \
 	imageholder.cpp buttonimage.cpp tiles.h overlays.h
-kwin3_crystal_la_LIBADD = $(kde_libraries)/libtdecorations.la $(LIB_QT) $(LIB_TDEUI)
-kwin3_crystal_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -lDCOP
-kwin3_crystal_la_METASOURCES = AUTO
+twin3_crystal_la_LIBADD = $(kde_libraries)/libtdecorations.la $(LIB_QT) $(LIB_TDEUI)
+twin3_crystal_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx -lDCOP
+twin3_crystal_la_METASOURCES = AUTO
 
 CLEANFILES = tiles.h overlays.h
-DISTCLEANFILES = $(kwin3_crystal_la_METASOURCES)
+DISTCLEANFILES = $(twin3_crystal_la_METASOURCES)
diff --git a/client/config/Makefile.am b/client/config/Makefile.am
index f4025f0..1e0b6c0 100644
--- a/client/config/Makefile.am
+++ b/client/config/Makefile.am
@@ -6,17 +6,17 @@ INCLUDES = $(all_includes)
 
 noinst_HEADERS = crystalconfig.h
 
-kde_module_LTLIBRARIES = kwin_crystal_config.la
-kwin_crystal_config_la_SOURCES = configdialog.ui infodialog.ui crystalconfig.cc crystalconfig.h
-kwin_crystal_config_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE)
-kwin_crystal_config_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT)
-kwin_crystal_config_la_METASOURCES = AUTO
+kde_module_LTLIBRARIES = twin_crystal_config.la
+twin_crystal_config_la_SOURCES = configdialog.ui infodialog.ui crystalconfig.cc crystalconfig.h
+twin_crystal_config_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE)
+twin_crystal_config_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_QT)
+twin_crystal_config_la_METASOURCES = AUTO
 
-DISTCLEANFILES = $(kwin_crystal_config_la_METASOURCES)
+DISTCLEANFILES = $(twin_crystal_config_la_METASOURCES)
 
 crystalconfig.cc: configdialog.h infodialog.h
 
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kwin_crystal_config.pot
+	$(XGETTEXT) *.cpp -o $(podir)/twin_crystal_config.pot
 METASOURCES = AUTO
diff --git a/client/config/crystalconfig.cc b/client/config/crystalconfig.cc
index cc16e3e..ca3b708 100644
--- a/client/config/crystalconfig.cc
+++ b/client/config/crystalconfig.cc
@@ -48,7 +48,7 @@
 CrystalConfig::CrystalConfig(KConfig*, TQWidget* parent)
     : TQObject(parent), config_(0), dialog_(0)
 {
-	config_ = new KConfig("kwincrystalrc");
+	config_ = new KConfig("twincrystalrc");
 	
 	dialog_ = new ConfigDialog(parent);
 	dialog_->show();
diff --git a/client/config/infodialog.ui b/client/config/infodialog.ui
index f654f4d..fbf1bf7 100644
--- a/client/config/infodialog.ui
+++ b/client/config/infodialog.ui
@@ -101,7 +101,7 @@
                 <enum>PaletteBackground</enum>
             </property>
             <property name="text">
-                <string>Crystal kwin decoration theme,
+                <string>Crystal twin decoration theme,
 Sascha Hlusiak &lt;spam84@nurfuerspam.de&gt;, 2004-2007.
 
 You may look for the most recent version at kde-look.org:</string>
diff --git a/client/crystal.desktop b/client/crystal.desktop
index 167e51f..5a8738b 100644
--- a/client/crystal.desktop
+++ b/client/crystal.desktop
@@ -2,4 +2,4 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Crystal
-X-KDE-Library=kwin3_crystal
+X-KDE-Library=twin3_crystal
diff --git a/client/crystalclient.cc b/client/crystalclient.cc
index 2263b3c..6c54f38 100644
--- a/client/crystalclient.cc
+++ b/client/crystalclient.cc
@@ -32,7 +32,7 @@
 #include <tqapplication.h>
 #include <tqimage.h>
 #include <tqpopupmenu.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kprocess.h>
 
 #include "crystalclient.h"
@@ -186,7 +186,7 @@ void setupOverlay(WND_CONFIG *cfg,int mode,TQString filename)
 bool CrystalFactory::readConfig()
 {
     // create a config object
-	KConfig config("kwincrystalrc");
+	KConfig config("twincrystalrc");
 	config.setGroup("General");
 	TQColor c;
 
diff --git a/client/imageholder.h b/client/imageholder.h
index d43009f..bed7fca 100644
--- a/client/imageholder.h
+++ b/client/imageholder.h
@@ -23,7 +23,7 @@
 #define _IMAGEHOLDER_INCLUDED_
 
 
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include "myrootpixmap.h"
 
 struct WND_CONFIG;
diff --git a/client/myrootpixmap.cc b/client/myrootpixmap.cc
index 25f4dd6..7100099 100644
--- a/client/myrootpixmap.cc
+++ b/client/myrootpixmap.cc
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <kimageeffect.h>
 #include <kpixmapio.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <kdebug.h>
 #include <netwm.h>
 #include <dcopclient.h>
diff --git a/crystal.kdevelop b/crystal.kdevelop
index 09343a8..e7bc2da 100644
--- a/crystal.kdevelop
+++ b/crystal.kdevelop
@@ -19,7 +19,7 @@
   </general>
   <kdevautoproject>
     <general>
-      <activetarget>client/kwin3_crystal.la</activetarget>
+      <activetarget>client/twin3_crystal.la</activetarget>
       <useconfiguration>default</useconfiguration>
     </general>
     <run>