diff --git a/amor/amor.cpp b/amor/amor.cpp
index 2efb896..0a9b436 100644
--- a/amor/amor.cpp
+++ b/amor/amor.cpp
@@ -38,8 +38,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstartupinfo.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
 #include <kstandarddirs.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
diff --git a/doc/amor/index.docbook b/doc/amor/index.docbook
index 8b72736..0437312 100644
--- a/doc/amor/index.docbook
+++ b/doc/amor/index.docbook
@@ -57,7 +57,7 @@ tricks.  &amor; also has many different themes which change the appearance
 and behavior of the animation.
 </para>
 
-<note><para>Since &amor; works with the &kde; window manager &kwin;, the
+<note><para>Since &amor; works with the &kde; window manager &twin;, the
 application will only work from within &kde;.  It is possible that &amor;
 would work from within another &kde;-compliant window manager, but none are
 known to work at the time of this writing.</para></note>
diff --git a/doc/amor/man-amor.6.docbook b/doc/amor/man-amor.6.docbook
index 17dca2f..8327909 100644
--- a/doc/amor/man-amor.6.docbook
+++ b/doc/amor/man-amor.6.docbook
@@ -60,7 +60,7 @@ comprehensive user manual.</para>
 <refsect1>
 <title>Bugs</title>
 
-<para>&amor; currently only works with the &kwin; window manager.</para>
+<para>&amor; currently only works with the &twin; window manager.</para>
 </refsect1>
 
 <refsect1>
diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp
index 83a45aa..498f93d 100644
--- a/fifteenapplet/fifteenapplet.cpp
+++ b/fifteenapplet/fifteenapplet.cpp
@@ -208,7 +208,7 @@ void PiecesTable::resetMap()
     tqrepaint();
 }
 
-void PiecesTable::checkwin()
+void PiecesTable::chectwin()
 {
     if(!_randomized) return;
 
@@ -289,7 +289,7 @@ void PiecesTable::mousePressEvent(TQMouseEvent* e)
         updateCell(row, col, false);
 
         // check if the player wins with this move
-        checkwin();
+        chectwin();
     }
 }
 
diff --git a/fifteenapplet/fifteenapplet.h b/fifteenapplet/fifteenapplet.h
index 8cc25c6..e76eecf 100644
--- a/fifteenapplet/fifteenapplet.h
+++ b/fifteenapplet/fifteenapplet.h
@@ -50,7 +50,7 @@ protected:
 
     void initMap();
     void initColors();
-    void checkwin();
+    void chectwin();
 
 protected slots:
     void randomizeMap();
diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp
index 7b8b064..c7051a7 100644
--- a/kmoon/kmoonapplet.cpp
+++ b/kmoon/kmoonapplet.cpp
@@ -32,7 +32,7 @@
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kstartupinfo.h>
 #include <kmessagebox.h>
 #include <kaboutdata.h>
diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp
index 3e727c5..89858c8 100644
--- a/kmoon/kmoonwidget.cpp
+++ b/kmoon/kmoonwidget.cpp
@@ -32,7 +32,7 @@
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kstartupinfo.h>
 #include <kmessagebox.h>
 #include <kaboutdata.h>
diff --git a/kodo/kodometer.h b/kodo/kodometer.h
index 501555d..503b78c 100644
--- a/kodo/kodometer.h
+++ b/kodo/kodometer.h
@@ -47,7 +47,7 @@
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
 #include <ktoolbar.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <X11/Xlib.h>
 
diff --git a/kteatime/main.cpp b/kteatime/main.cpp
index fb147a6..cfb625c 100644
--- a/kteatime/main.cpp
+++ b/kteatime/main.cpp
@@ -24,7 +24,7 @@
  *
  */
 
-#include <kwin.h>
+#include <twin.h>
 #include <kstartupinfo.h>
 #include <kcmdlineargs.h>
 #include <kaboutdata.h>