Rename kwin to twin (part 1 of 2)

39 files changed, 216 insertions, 216 deletions

diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 0d69b83fc..206389b20 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -20,7 +20,7 @@
 #include <netwm.h>
 #include <kshortcut.h>
 #include <kkeynative.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <X11/XKBlib.h>
 #define XK_MISCELLANY
diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h
index 98ed91d5b..95d8b2559 100644
--- a/kcontrol/access/kaccess.h
+++ b/kcontrol/access/kaccess.h
@@ -7,7 +7,7 @@
 
 
 #include <kuniqueapplication.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 
 
 #include <X11/Xlib.h>
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 0f97753e4..e14be2af0 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -38,7 +38,7 @@
 #include <kmessagebox.h>
 #include <kpixmap.h>
 #include <kstandarddirs.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include "bgrender.h"
 #include "bgadvanced.h"
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 1e681c3d6..64a14ca63 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -52,8 +52,8 @@
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 #include <kurlrequester.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
 #include <kimagefilepreview.h>
 #include <knewstuff/downloaddialog.h>
 
@@ -74,10 +74,10 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
    m_multidesktop = _multidesktop;
    m_previewUpdates = true;
    
-   KWinModule *m_kwin;
-   m_kwin = new KWinModule(TQT_TQOBJECT(this));
-   m_curDesk = m_kwin->currentDesktop();
-   TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
+   KWinModule *m_twin;
+   m_twin = new KWinModule(TQT_TQOBJECT(this));
+   m_curDesk = m_twin->currentDesktop();
+   TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop()));
    m_useViewports = s.width() * s.height() > 1;
    
    m_numDesks = m_multidesktop ? KWin::numberOfDesktops() : 1;
@@ -90,12 +90,12 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
       m_numScreens = 1;
    }
    
-   TQPoint vx(m_kwin->currentViewport(m_kwin->currentDesktop()));
+   TQPoint vx(m_twin->currentViewport(m_twin->currentDesktop()));
    int t_eViewport = (vx.x() * vx.y());
    if (t_eViewport < 1) {
       t_eViewport = 1;
    }
-   delete m_kwin;
+   delete m_twin;
 
    m_desk = m_multidesktop ? KWin::currentDesktop() : 1;
    m_desk = m_multidesktop ? (m_useViewports ? (((m_desk - 1) * m_numViewports) + t_eViewport) : m_desk) : m_desk;
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index 0f5d035b6..450b140a5 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -356,7 +356,7 @@ void WidgetCanvas::drawSampleWidgets()
     KPixmap pmTitle;
     pmTitle.resize( width()-160, 20 );
 
-    // Switched to vertical gradient because those kwin styles that
+    // Switched to vertical gradient because those twin styles that
     // use the gradient have it vertical.
     KPixmapEffect::gradient(pmTitle, iaTitle, iaBlend,
                             KPixmapEffect::HorizontalGradient);
@@ -400,7 +400,7 @@ void WidgetCanvas::drawSampleWidgets()
     paint.setBrush( aTitle );paint.setPen( aTitle );
     paint.drawRect( 65, 30+5, width()-152, 20 );
 
-    // Switched to vertical gradient because those kwin styles that
+    // Switched to vertical gradient because those twin styles that
     // use the gradient have it vertical.
     pmTitle.resize( width()-152, 20 );
     KPixmapEffect::gradient(pmTitle, aTitle, aBlend,
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 4389a10fe..f2c00d230 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -26,7 +26,7 @@
 #include <kmessagebox.h>
 #include <kinstance.h>
 #include <kaction.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 5845cff8f..75ec4edcb 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -61,7 +61,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
 // see also KKeyModule::init() below !!!
 #define NOSLOTS
 #define KShortcuts KAccelShortcuts
-#include "../../kwin/kwinbindings.cpp"
+#include "../../twin/twinbindings.cpp"
 #include "../../kicker/kicker/core/kickerbindings.cpp"
 #include "../../kicker/taskbar/taskbarbindings.cpp"
 #include "../../kdesktop/kdesktopbindings.cpp"
@@ -209,7 +209,7 @@ void KKeyModule::load()
     if ( !kapp->dcopClient()->isAttached() )
       kapp->dcopClient()->attach();
     // TODO: create a reconfigureKeys() method.
-    kapp->dcopClient()->send("kwin", "", "reconfigure()", "");
+    kapp->dcopClient()->send("twin", "", "reconfigure()", "");
     kapp->dcopClient()->send("kdesktop", "", "configure()", "");
     kapp->dcopClient()->send("kicker", "Panel", "configure()", "");
   }
@@ -485,7 +485,7 @@ void KKeyModule::init()
 #define NOSLOTS
 #define KShortcuts KAccelShortcuts
 #include "../../klipper/klipperbindings.cpp"
-#include "../../kwin/kwinbindings.cpp"
+#include "../../twin/twinbindings.cpp"
 #include "../../kicker/kicker/core/kickerbindings.cpp"
 #include "../../kicker/taskbar/taskbarbindings.cpp"
 #include "../../kdesktop/kdesktopbindings.cpp"
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index d3b29fffe..a91fca234 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -132,7 +132,7 @@ extern "C"
   KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/)
   {
 	// What does this do?  Why not insert klipper and kxkb, too? --ellis, 2002/01/15
-	KGlobal::locale()->insertCatalogue("kwin");
+	KGlobal::locale()->insertCatalogue("twin");
 	KGlobal::locale()->insertCatalogue("kdesktop");
 	KGlobal::locale()->insertCatalogue("kicker");
 	return new KeyModule(parent, "kcmkeys");
@@ -168,7 +168,7 @@ extern "C"
 #define CTRL Qt::CTRL
 #define ALT Qt::ALT
 #include "../../klipper/klipperbindings.cpp"
-#include "../../kwin/kwinbindings.cpp"
+#include "../../twin/twinbindings.cpp"
 #define KICKER_ALL_BINDINGS
 #include "../../kicker/kicker/core/kickerbindings.cpp"
 #include "../../kicker/taskbar/taskbarbindings.cpp"
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 68c43365e..3b17a69e1 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -111,7 +111,7 @@ void ShortcutsModule::initGUI()
 // see also KShortcutsModule::init() below !!!
 #define NOSLOTS
 #define KICKER_ALL_BINDINGS
-#include "../../kwin/kwinbindings.cpp"
+#include "../../twin/twinbindings.cpp"
 #include "../../kicker/kicker/core/kickerbindings.cpp"
 #include "../../kicker/taskbar/taskbarbindings.cpp"
 #include "../../kdesktop/kdesktopbindings.cpp"
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index 3a72e6417..04e8c1282 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -34,7 +34,7 @@
 #include <kpanelextension.h>
 #include <kpixmap.h>
 #include <kstandarddirs.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include "main.h"
 #include "../background/bgrender.h"
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index e7d333537..cf884c0be 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -141,30 +141,30 @@ void KDesktopConfig::load( bool useDefaults )
   else
      groupname.sprintf("Desktops-screen-%d", konq_screen_number);
 
-  KConfig * kwinconfig = new KConfig("kwinrc");
+  KConfig * twinconfig = new KConfig("twinrc");
 
-  kwinconfig->setReadDefaults( useDefaults );
+  twinconfig->setReadDefaults( useDefaults );
 
-  kwinconfig->setGroup("Desktops");
+  twinconfig->setGroup("Desktops");
   for(int i = 1; i <= maxDesktops; i++)
   {
     TQString key_name(TQString("Name_") + TQString::number(i));
     TQString name = TQString::fromUtf8(info.desktopName(i));
     if (name.isEmpty()) // Get name from configuration if none is set in the WM.
     {
-        name = kwinconfig->readEntry(key_name, i18n("Desktop %1").arg(i));
+        name = twinconfig->readEntry(key_name, i18n("Desktop %1").arg(i));
     }
     _nameInput[i-1]->setText(name);
 
     // Is this entry immutable or not in the range of configured desktops?
-    _labelImmutable[i - 1] = kwinconfig->entryIsImmutable(key_name);
+    _labelImmutable[i - 1] = twinconfig->entryIsImmutable(key_name);
     _nameInput[i-1]->setEnabled(i <= n && !_labelImmutable[i - 1]);
   }
 
-  _numInput->setEnabled(!kwinconfig->entryIsImmutable("Number"));
+  _numInput->setEnabled(!twinconfig->entryIsImmutable("Number"));
 
-  delete kwinconfig;
-  kwinconfig = 0;
+  delete twinconfig;
+  twinconfig = 0;
 
   TQString configfile;
   if (konq_screen_number == 0)
diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h
index 7fd06d3c6..938049628 100644
--- a/kcontrol/konq/desktop.h
+++ b/kcontrol/konq/desktop.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 class KLineEdit;
 class KIntNumInput;
 
-// if you change this, update also the number of keyboard shortcuts in kwin/kwinbindings.cpp
+// if you change this, update also the number of keyboard shortcuts in twin/twinbindings.cpp
 static const int maxDesktops = 20;
 
 class KDesktopConfig : public KCModule
diff --git a/kcontrol/konq/desktopbehavior.desktop b/kcontrol/konq/desktopbehavior.desktop
index d20ba1ae1..904084637 100644
--- a/kcontrol/konq/desktopbehavior.desktop
+++ b/kcontrol/konq/desktopbehavior.desktop
@@ -212,7 +212,7 @@ Keywords[pl]=konqueror,menedżer plików,kfm,wskazówki,informacja o pliku,osobn
 Keywords[pt]=konqueror,gestor de ficheiros,kfm,dicas,dicas de ficheiros,janela separada,comportamento,utilização de memória,URL de base,
 Keywords[pt_BR]=konqueror,gerenciador de arquivos,kfm,dicas,arquivos de dicas,janelas separadas,janelas unidas,comportamento,comportamento,uso de memória,URL local, 
 Keywords[ro]=konqueror,manager de fișiere,kfm,sfaturi,ferestre separate,comportament,utilizare memorie,URL Acasă
-Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji kwinjira,
+Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji twinjira,
 Keywords[se]=konqueror,fiilagieđahalli,kfm,rávvagat,fiilarávvagat,iežaš láse,ođđa láset,láhtten,muitugeavaheapmi,ruoktu-URL
 Keywords[sk]=konqueror,správa súborov,kfm,tipy,oddelené okná,nové okná,správanie,využitie pamäti,domovské URL
 Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,kfm,namigi,namigi datotek,ločeno okno,ustvari okna,obnašanje,poraba pomnilnika,domači URL
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index 49725a3af..437c74197 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -410,7 +410,7 @@ void DesktopBehavior::save()
     // for the standalone menubar setting
     kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
     kapp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data );
-    kapp->dcopClient()->send( "kwin*", "", "reconfigure()", data );
+    kapp->dcopClient()->send( "twin*", "", "reconfigure()", data );
 }
 
 void DesktopBehavior::enableChanged()
diff --git a/kcontrol/konq/webbehavior.desktop b/kcontrol/konq/webbehavior.desktop
index 3dfe93b69..44eed0c7c 100644
--- a/kcontrol/konq/webbehavior.desktop
+++ b/kcontrol/konq/webbehavior.desktop
@@ -212,7 +212,7 @@ Keywords[pl]=konqueror,menedżer plików,kfm,wskazówki,informacja o pliku,osobn
 Keywords[pt]=konqueror,gestor de ficheiros,kfm,dicas,dicas de ficheiros,janela separada,comportamento,utilização de memória,URL de base,
 Keywords[pt_BR]=konqueror,gerenciador de arquivos,kfm,dicas,arquivos de dicas,janelas separadas,janelas unidas,comportamento,comportamento,uso de memória,URL local, 
 Keywords[ro]=konqueror,manager de fișiere,kfm,sfaturi,ferestre separate,comportament,utilizare memorie,URL Acasă
-Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji kwinjira,
+Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji twinjira,
 Keywords[se]=konqueror,fiilagieđahalli,kfm,rávvagat,fiilarávvagat,iežaš láse,ođđa láset,láhtten,muitugeavaheapmi,ruoktu-URL
 Keywords[sk]=konqueror,správa súborov,kfm,tipy,oddelené okná,nové okná,správanie,využitie pamäti,domovské URL
 Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,kfm,namigi,namigi datotek,ločeno okno,ustvari okna,obnašanje,poraba pomnilnika,domači URL
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index dfeb7c69e..c8bd71408 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -119,7 +119,7 @@ static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& n
   settings.writeEntry("/qt/Palette/inactive", inactcg);
   settings.writeEntry("/qt/Palette/disabled", discg);
 
-  // export kwin's colors to qtrc for kstyle to use
+  // export twin's colors to qtrc for kstyle to use
   kglobals.setGroup("WM");
 
   // active colors
diff --git a/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml b/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml
index 1c5b0a50b..3d534f9b6 100644
--- a/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml
+++ b/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml
@@ -121,21 +121,21 @@
     <linkColor rgb="#ffffff" object="global" />
     <visitedLinkColor rgb="#ffffff" object="global" />
     <alternateBackground rgb="#000028" object="global" />
-    <activeForeground rgb="#ffffff" object="kwin" />
-    <inactiveBackground rgb="#1e1e1e" object="kwin" />
-    <inactiveBlend rgb="#1e1e1e" object="kwin" />
-    <activeBackground rgb="#00005a" object="kwin" />
-    <activeBlend rgb="#00005a" object="kwin" />
-    <inactiveForeground rgb="#808080" object="kwin" />
-    <activeTitleBtnBg rgb="#ffffff" object="kwin" />
-    <inactiveTitleBtnBg rgb="#aaaaaa" object="kwin" />
-    <frame rgb="#000085" object="kwin" />
-    <inactiveFrame rgb="#1e1e1e" object="kwin" />
-    <handle rgb="#000085" object="kwin" />
-    <inactiveHandle rgb="#1e1e1e" object="kwin" />
+    <activeForeground rgb="#ffffff" object="twin" />
+    <inactiveBackground rgb="#1e1e1e" object="twin" />
+    <inactiveBlend rgb="#1e1e1e" object="twin" />
+    <activeBackground rgb="#00005a" object="twin" />
+    <activeBlend rgb="#00005a" object="twin" />
+    <inactiveForeground rgb="#808080" object="twin" />
+    <activeTitleBtnBg rgb="#ffffff" object="twin" />
+    <inactiveTitleBtnBg rgb="#aaaaaa" object="twin" />
+    <frame rgb="#000085" object="twin" />
+    <inactiveFrame rgb="#1e1e1e" object="twin" />
+    <handle rgb="#000085" object="twin" />
+    <inactiveHandle rgb="#1e1e1e" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_plastik" >
+  <wm type="builtin" name="twin3_plastik" >
     <border size="3" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml b/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml
index 0dde3eb7b..2b648eac4 100644
--- a/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml
+++ b/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml
@@ -121,21 +121,21 @@
     <linkColor rgb="#ffffff" object="global" />
     <visitedLinkColor rgb="#ffffff" object="global" />
     <alternateBackground rgb="#000028" object="global" />
-    <activeForeground rgb="#ffffff" object="kwin" />
-    <inactiveBackground rgb="#1e1e1e" object="kwin" />
-    <inactiveBlend rgb="#1e1e1e" object="kwin" />
-    <activeBackground rgb="#00005a" object="kwin" />
-    <activeBlend rgb="#00005a" object="kwin" />
-    <inactiveForeground rgb="#808080" object="kwin" />
-    <activeTitleBtnBg rgb="#ffffff" object="kwin" />
-    <inactiveTitleBtnBg rgb="#aaaaaa" object="kwin" />
-    <frame rgb="#000085" object="kwin" />
-    <inactiveFrame rgb="#1e1e1e" object="kwin" />
-    <handle rgb="#000085" object="kwin" />
-    <inactiveHandle rgb="#1e1e1e" object="kwin" />
+    <activeForeground rgb="#ffffff" object="twin" />
+    <inactiveBackground rgb="#1e1e1e" object="twin" />
+    <inactiveBlend rgb="#1e1e1e" object="twin" />
+    <activeBackground rgb="#00005a" object="twin" />
+    <activeBlend rgb="#00005a" object="twin" />
+    <inactiveForeground rgb="#808080" object="twin" />
+    <activeTitleBtnBg rgb="#ffffff" object="twin" />
+    <inactiveTitleBtnBg rgb="#aaaaaa" object="twin" />
+    <frame rgb="#000085" object="twin" />
+    <inactiveFrame rgb="#1e1e1e" object="twin" />
+    <handle rgb="#000085" object="twin" />
+    <inactiveHandle rgb="#1e1e1e" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_plastik" >
+  <wm type="builtin" name="twin3_plastik" >
     <border size="3" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml b/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml
index 6f9b75099..a93aba33a 100644
--- a/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml
+++ b/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml
@@ -121,21 +121,21 @@
     <linkColor rgb="#000000" object="global" />
     <visitedLinkColor rgb="#000000" object="global" />
     <alternateBackground rgb="#d7d7ff" object="global" />
-    <activeForeground rgb="#000000" object="kwin" />
-    <inactiveBackground rgb="#e1e1e1" object="kwin" />
-    <inactiveBlend rgb="#e1e1e1" object="kwin" />
-    <activeBackground rgb="#a5a5ff" object="kwin" />
-    <activeBlend rgb="#a5a5ff" object="kwin" />
-    <inactiveForeground rgb="#808080" object="kwin" />
-    <activeTitleBtnBg rgb="#000000" object="kwin" />
-    <inactiveTitleBtnBg rgb="#555555" object="kwin" />
-    <frame rgb="#7a7aff" object="kwin" />
-    <inactiveFrame rgb="#e1e1e1" object="kwin" />
-    <handle rgb="#7a7aff" object="kwin" />
-    <inactiveHandle rgb="#e1e1e1" object="kwin" />
+    <activeForeground rgb="#000000" object="twin" />
+    <inactiveBackground rgb="#e1e1e1" object="twin" />
+    <inactiveBlend rgb="#e1e1e1" object="twin" />
+    <activeBackground rgb="#a5a5ff" object="twin" />
+    <activeBlend rgb="#a5a5ff" object="twin" />
+    <inactiveForeground rgb="#808080" object="twin" />
+    <activeTitleBtnBg rgb="#000000" object="twin" />
+    <inactiveTitleBtnBg rgb="#555555" object="twin" />
+    <frame rgb="#7a7aff" object="twin" />
+    <inactiveFrame rgb="#e1e1e1" object="twin" />
+    <handle rgb="#7a7aff" object="twin" />
+    <inactiveHandle rgb="#e1e1e1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_plastik" >
+  <wm type="builtin" name="twin3_plastik" >
     <border size="3" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml b/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml
index 01b3001d9..602f21613 100644
--- a/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml
+++ b/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml
@@ -121,21 +121,21 @@
     <linkColor rgb="#000000" object="global" />
     <visitedLinkColor rgb="#000000" object="global" />
     <alternateBackground rgb="#d7d7ff" object="global" />
-    <activeForeground rgb="#000000" object="kwin" />
-    <inactiveBackground rgb="#e1e1e1" object="kwin" />
-    <inactiveBlend rgb="#e1e1e1" object="kwin" />
-    <activeBackground rgb="#a5a5ff" object="kwin" />
-    <activeBlend rgb="#a5a5ff" object="kwin" />
-    <inactiveForeground rgb="#808080" object="kwin" />
-    <activeTitleBtnBg rgb="#000000" object="kwin" />
-    <inactiveTitleBtnBg rgb="#555555" object="kwin" />
-    <frame rgb="#7a7aff" object="kwin" />
-    <inactiveFrame rgb="#e1e1e1" object="kwin" />
-    <handle rgb="#7a7aff" object="kwin" />
-    <inactiveHandle rgb="#e1e1e1" object="kwin" />
+    <activeForeground rgb="#000000" object="twin" />
+    <inactiveBackground rgb="#e1e1e1" object="twin" />
+    <inactiveBlend rgb="#e1e1e1" object="twin" />
+    <activeBackground rgb="#a5a5ff" object="twin" />
+    <activeBlend rgb="#a5a5ff" object="twin" />
+    <inactiveForeground rgb="#808080" object="twin" />
+    <activeTitleBtnBg rgb="#000000" object="twin" />
+    <inactiveTitleBtnBg rgb="#555555" object="twin" />
+    <frame rgb="#7a7aff" object="twin" />
+    <inactiveFrame rgb="#e1e1e1" object="twin" />
+    <handle rgb="#7a7aff" object="twin" />
+    <inactiveHandle rgb="#e1e1e1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_plastik" >
+  <wm type="builtin" name="twin3_plastik" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml b/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml
index 78d258374..4164a5e55 100644
--- a/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml
+++ b/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml
@@ -90,17 +90,17 @@
     <buttonForeground rgb="#000000" object="global" />
     <linkColor rgb="#0000c0" object="global" />
     <visitedLinkColor rgb="#800080" object="global" />
-    <activeForeground rgb="#ffffff" object="kwin" />
-    <inactiveBackground rgb="#dcdcdc" object="kwin" />
-    <inactiveBlend rgb="#dcdcdc" object="kwin" />
-    <activeBackground rgb="#0a5f89" object="kwin" />
-    <activeBlend rgb="#0a5f89" object="kwin" />
-    <inactiveForeground rgb="#000000" object="kwin" />
-    <activeTitleBtnBg rgb="#c0c0c0" object="kwin" />
-    <inactiveTitleBtnBg rgb="#a7b5c7" object="kwin" />
+    <activeForeground rgb="#ffffff" object="twin" />
+    <inactiveBackground rgb="#dcdcdc" object="twin" />
+    <inactiveBlend rgb="#dcdcdc" object="twin" />
+    <activeBackground rgb="#0a5f89" object="twin" />
+    <activeBlend rgb="#0a5f89" object="twin" />
+    <inactiveForeground rgb="#000000" object="twin" />
+    <activeTitleBtnBg rgb="#c0c0c0" object="twin" />
+    <inactiveTitleBtnBg rgb="#a7b5c7" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_default" >
+  <wm type="builtin" name="twin3_default" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Keramik/Keramik.xml b/kcontrol/krdb/themes/Keramik/Keramik.xml
index cd50d7b56..6e38bbf0e 100644
--- a/kcontrol/krdb/themes/Keramik/Keramik.xml
+++ b/kcontrol/krdb/themes/Keramik/Keramik.xml
@@ -90,17 +90,17 @@
     <buttonForeground rgb="#000000" object="global" />
     <linkColor rgb="#0000c0" object="global" />
     <visitedLinkColor rgb="#800080" object="global" />
-    <activeForeground rgb="#ffffff" object="kwin" />
-    <inactiveBackground rgb="#afd6ff" object="kwin" />
-    <inactiveBlend rgb="#afd6ff" object="kwin" />
-    <activeBackground rgb="#3e91eb" object="kwin" />
-    <activeBlend rgb="#3e91eb" object="kwin" />
-    <inactiveForeground rgb="#ffffff" object="kwin" />
-    <activeTitleBtnBg rgb="#dcdcdc" object="kwin" />
-    <inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" />
+    <activeForeground rgb="#ffffff" object="twin" />
+    <inactiveBackground rgb="#afd6ff" object="twin" />
+    <inactiveBlend rgb="#afd6ff" object="twin" />
+    <activeBackground rgb="#3e91eb" object="twin" />
+    <activeBlend rgb="#3e91eb" object="twin" />
+    <inactiveForeground rgb="#ffffff" object="twin" />
+    <activeTitleBtnBg rgb="#dcdcdc" object="twin" />
+    <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_keramik" >
+  <wm type="builtin" name="twin3_keramik" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Plastik/Plastik.xml b/kcontrol/krdb/themes/Plastik/Plastik.xml
index 53b115550..bc4f62c1e 100644
--- a/kcontrol/krdb/themes/Plastik/Plastik.xml
+++ b/kcontrol/krdb/themes/Plastik/Plastik.xml
@@ -90,17 +90,17 @@
     <buttonForeground rgb="#000000" object="global" />
     <linkColor rgb="#0000ee" object="global" />
     <visitedLinkColor rgb="#52188b" object="global" />
-    <activeForeground rgb="#ffffff" object="kwin" />
-    <inactiveBackground rgb="#9daaba" object="kwin" />
-    <inactiveBlend rgb="#9daaba" object="kwin" />
-    <activeBackground rgb="#418edc" object="kwin" />
-    <activeBlend rgb="#6b91b8" object="kwin" />
-    <inactiveForeground rgb="#dddddd" object="kwin" />
-    <activeTitleBtnBg rgb="#dcdcdc" object="kwin" />
-    <inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" />
+    <activeForeground rgb="#ffffff" object="twin" />
+    <inactiveBackground rgb="#9daaba" object="twin" />
+    <inactiveBlend rgb="#9daaba" object="twin" />
+    <activeBackground rgb="#418edc" object="twin" />
+    <activeBlend rgb="#6b91b8" object="twin" />
+    <inactiveForeground rgb="#dddddd" object="twin" />
+    <activeTitleBtnBg rgb="#dcdcdc" object="twin" />
+    <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_plastik" >
+  <wm type="builtin" name="twin3_plastik" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Platinum/Platinum.xml b/kcontrol/krdb/themes/Platinum/Platinum.xml
index 2fc50ba36..415ad177a 100644
--- a/kcontrol/krdb/themes/Platinum/Platinum.xml
+++ b/kcontrol/krdb/themes/Platinum/Platinum.xml
@@ -90,17 +90,17 @@
     <buttonForeground rgb="#000000" object="global" />
     <linkColor rgb="#0000c0" object="global" />
     <visitedLinkColor rgb="#800080" object="global" />
-    <activeForeground rgb="#020202" object="kwin" />
-    <inactiveBackground rgb="#96a7ca" object="kwin" />
-    <inactiveBlend rgb="#9db0d0" object="kwin" />
-    <activeBackground rgb="#e9e9e9" object="kwin" />
-    <activeBlend rgb="#e9e9e9" object="kwin" />
-    <inactiveForeground rgb="#5d7091" object="kwin" />
-    <activeTitleBtnBg rgb="#dcdcdc" object="kwin" />
-    <inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" />
+    <activeForeground rgb="#020202" object="twin" />
+    <inactiveBackground rgb="#96a7ca" object="twin" />
+    <inactiveBlend rgb="#9db0d0" object="twin" />
+    <activeBackground rgb="#e9e9e9" object="twin" />
+    <activeBlend rgb="#e9e9e9" object="twin" />
+    <inactiveForeground rgb="#5d7091" object="twin" />
+    <activeTitleBtnBg rgb="#dcdcdc" object="twin" />
+    <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_system" >
+  <wm type="builtin" name="twin3_system" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Redmond/Redmond.xml b/kcontrol/krdb/themes/Redmond/Redmond.xml
index 4ec27ceee..629ddc78f 100644
--- a/kcontrol/krdb/themes/Redmond/Redmond.xml
+++ b/kcontrol/krdb/themes/Redmond/Redmond.xml
@@ -90,17 +90,17 @@
     <buttonForeground rgb="#000000" object="global" />
     <linkColor rgb="#0000c0" object="global" />
     <visitedLinkColor rgb="#800080" object="global" />
-    <activeForeground rgb="#ffffff" object="kwin" />
-    <inactiveBackground rgb="#dcdcdc" object="kwin" />
-    <inactiveBlend rgb="#dcdcdc" object="kwin" />
-    <activeBackground rgb="#002468" object="kwin" />
-    <activeBlend rgb="#a8ccf0" object="kwin" />
-    <inactiveForeground rgb="#000000" object="kwin" />
-    <activeTitleBtnBg rgb="#dcdcdc" object="kwin" />
-    <inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" />
+    <activeForeground rgb="#ffffff" object="twin" />
+    <inactiveBackground rgb="#dcdcdc" object="twin" />
+    <inactiveBlend rgb="#dcdcdc" object="twin" />
+    <activeBackground rgb="#002468" object="twin" />
+    <activeBlend rgb="#a8ccf0" object="twin" />
+    <inactiveForeground rgb="#000000" object="twin" />
+    <activeTitleBtnBg rgb="#dcdcdc" object="twin" />
+    <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_redmond" >
+  <wm type="builtin" name="twin3_redmond" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/Sunshine/Sunshine.xml b/kcontrol/krdb/themes/Sunshine/Sunshine.xml
index 92a4a8bf0..00fe8f06a 100644
--- a/kcontrol/krdb/themes/Sunshine/Sunshine.xml
+++ b/kcontrol/krdb/themes/Sunshine/Sunshine.xml
@@ -90,17 +90,17 @@
     <buttonForeground rgb="#000000" object="global" />
     <linkColor rgb="#0000ff" object="global" />
     <visitedLinkColor rgb="#c0ffff" object="global" />
-    <activeForeground rgb="#ffffff" object="kwin" />
-    <inactiveBackground rgb="#aeb2c3" object="kwin" />
-    <inactiveBlend rgb="#aeb2c3" object="kwin" />
-    <activeBackground rgb="#b24d7a" object="kwin" />
-    <activeBlend rgb="#aeb2c3" object="kwin" />
-    <inactiveForeground rgb="#000000" object="kwin" />
-    <activeTitleBtnBg rgb="#aeb2c3" object="kwin" />
-    <inactiveTitleBtnBg rgb="#aeb2c3" object="kwin" />
+    <activeForeground rgb="#ffffff" object="twin" />
+    <inactiveBackground rgb="#aeb2c3" object="twin" />
+    <inactiveBlend rgb="#aeb2c3" object="twin" />
+    <activeBackground rgb="#b24d7a" object="twin" />
+    <activeBlend rgb="#aeb2c3" object="twin" />
+    <inactiveForeground rgb="#000000" object="twin" />
+    <activeTitleBtnBg rgb="#aeb2c3" object="twin" />
+    <inactiveTitleBtnBg rgb="#aeb2c3" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_cde" >
+  <wm type="builtin" name="twin3_cde" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml b/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml
index 20138db4a..3a7332628 100644
--- a/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml
+++ b/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml
@@ -121,21 +121,21 @@
     <linkColor rgb="#ffff00" object="global" />
     <visitedLinkColor rgb="#ffff00" object="global" />
     <alternateBackground rgb="#0000d7" object="global" />
-    <activeForeground rgb="#ffff00" object="kwin" />
-    <inactiveBackground rgb="#1e1ee1" object="kwin" />
-    <inactiveBlend rgb="#1e1ee1" object="kwin" />
-    <activeBackground rgb="#0000b4" object="kwin" />
-    <activeBlend rgb="#0000b4" object="kwin" />
-    <inactiveForeground rgb="#808080" object="kwin" />
-    <activeTitleBtnBg rgb="#ffff00" object="kwin" />
-    <inactiveTitleBtnBg rgb="#aaaa55" object="kwin" />
-    <frame rgb="#00007a" object="kwin" />
-    <inactiveFrame rgb="#1e1ee1" object="kwin" />
-    <handle rgb="#00007a" object="kwin" />
-    <inactiveHandle rgb="#1e1ee1" object="kwin" />
+    <activeForeground rgb="#ffff00" object="twin" />
+    <inactiveBackground rgb="#1e1ee1" object="twin" />
+    <inactiveBlend rgb="#1e1ee1" object="twin" />
+    <activeBackground rgb="#0000b4" object="twin" />
+    <activeBlend rgb="#0000b4" object="twin" />
+    <inactiveForeground rgb="#808080" object="twin" />
+    <activeTitleBtnBg rgb="#ffff00" object="twin" />
+    <inactiveTitleBtnBg rgb="#aaaa55" object="twin" />
+    <frame rgb="#00007a" object="twin" />
+    <inactiveFrame rgb="#1e1ee1" object="twin" />
+    <handle rgb="#00007a" object="twin" />
+    <inactiveHandle rgb="#1e1ee1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_quartz" >
+  <wm type="builtin" name="twin3_quartz" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml b/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml
index a1e6fd5e4..c624bbb6e 100644
--- a/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml
+++ b/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml
@@ -121,21 +121,21 @@
     <linkColor rgb="#ffff00" object="global" />
     <visitedLinkColor rgb="#ffff00" object="global" />
     <alternateBackground rgb="#0000d7" object="global" />
-    <activeForeground rgb="#ffff00" object="kwin" />
-    <inactiveBackground rgb="#1e1ee1" object="kwin" />
-    <inactiveBlend rgb="#1e1ee1" object="kwin" />
-    <activeBackground rgb="#0000b4" object="kwin" />
-    <activeBlend rgb="#0000b4" object="kwin" />
-    <inactiveForeground rgb="#808080" object="kwin" />
-    <activeTitleBtnBg rgb="#ffff00" object="kwin" />
-    <inactiveTitleBtnBg rgb="#aaaa55" object="kwin" />
-    <frame rgb="#00007a" object="kwin" />
-    <inactiveFrame rgb="#1e1ee1" object="kwin" />
-    <handle rgb="#00007a" object="kwin" />
-    <inactiveHandle rgb="#1e1ee1" object="kwin" />
+    <activeForeground rgb="#ffff00" object="twin" />
+    <inactiveBackground rgb="#1e1ee1" object="twin" />
+    <inactiveBlend rgb="#1e1ee1" object="twin" />
+    <activeBackground rgb="#0000b4" object="twin" />
+    <activeBlend rgb="#0000b4" object="twin" />
+    <inactiveForeground rgb="#808080" object="twin" />
+    <activeTitleBtnBg rgb="#ffff00" object="twin" />
+    <inactiveTitleBtnBg rgb="#aaaa55" object="twin" />
+    <frame rgb="#00007a" object="twin" />
+    <inactiveFrame rgb="#1e1ee1" object="twin" />
+    <handle rgb="#00007a" object="twin" />
+    <inactiveHandle rgb="#1e1ee1" object="twin" />
   </colors>
   <cursors name="" />
-  <wm type="builtin" name="kwin3_quartz" >
+  <wm type="builtin" name="twin3_quartz" >
     <border size="1" />
   </wm>
   <konqueror>
diff --git a/kcontrol/kthememanager/README b/kcontrol/kthememanager/README
index 0fe235115..cd32a528a 100644
--- a/kcontrol/kthememanager/README
+++ b/kcontrol/kthememanager/README
@@ -44,15 +44,15 @@ Sample XML theme config file:
 </desktop>
 <icons name="crystalsvg" />
 <sounds>
-    <event object="global|kwin" name="eventname" url="theme:/sounds/file.wav" />
+    <event object="global|twin" name="eventname" url="theme:/sounds/file.wav" />
     ...
 </sounds>
 <colors contrast="7">
-    <alternateBackground rgb="#123456" object="global|kwin"/>
+    <alternateBackground rgb="#123456" object="global|twin"/>
     ...
 </colors>
 <cursors name="theme_name" />
-<wm type="builtin|custom" name="kwin_lib_name">
+<wm type="builtin|custom" name="twin_lib_name">
     <buttons left="M" right="HIAX" />
     <border size="number" />
 </wm>
diff --git a/kcontrol/kthememanager/TODO b/kcontrol/kthememanager/TODO
index 944f79b78..d19cf03f2 100644
--- a/kcontrol/kthememanager/TODO
+++ b/kcontrol/kthememanager/TODO
@@ -1,5 +1,5 @@
 - use KHotNewStuff for directly downloading themes from kde-look.org
-- custom pixmap kwin themes (requires kwmtheme to be ported first)
+- custom pixmap twin themes (requires kwmtheme to be ported first)
 - write user and theme developer documentation
 
 Handle:
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index 5396d9e2b..3b82e889e 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -127,9 +127,9 @@ TQString KTheme::createYourself( bool pack )
     // 2. Background theme
     KConfig * globalConf = KGlobal::config();
 
-    KConfig kwinConf( "kwinrc", true );
-    kwinConf.setGroup( "Desktops" );
-    uint numDesktops = kwinConf.readUnsignedNumEntry( "Number", 4 );
+    KConfig twinConf( "twinrc", true );
+    twinConf.setGroup( "Desktops" );
+    uint numDesktops = twinConf.readUnsignedNumEntry( "Number", 4 );
 
     KConfig desktopConf( "kdesktoprc", true );
     desktopConf.setGroup( "Background Common" );
@@ -205,9 +205,9 @@ TQString KTheme::createYourself( bool pack )
               << "messageboxQuestion";
 
     // 4.2 KWin sounds
-    KConfig * kwinSoundConf = new KConfig( "kwin.eventsrc", true );
-    TQStringList kwinEvents;
-    kwinEvents << "activate" << "close" << "delete" <<
+    KConfig * twinSoundConf = new KConfig( "twin.eventsrc", true );
+    TQStringList twinEvents;
+    twinEvents << "activate" << "close" << "delete" <<
         "desktop1" << "desktop2" << "desktop3" << "desktop4" <<
         "desktop5" << "desktop6" << "desktop7" << "desktop8" <<
         "maximize" << "minimize" << "moveend" << "movestart" <<
@@ -217,10 +217,10 @@ TQString KTheme::createYourself( bool pack )
 
     TQDomElement soundsElem = m_dom.createElement( "sounds" );
     createSoundList( stdEvents, "global", soundsElem, soundConf );
-    createSoundList( kwinEvents, "kwin", soundsElem, kwinSoundConf );
+    createSoundList( twinEvents, "twin", soundsElem, twinSoundConf );
     m_root.appendChild( soundsElem );
     delete soundConf;
-    delete kwinSoundConf;
+    delete twinSoundConf;
 
 
     // 5. Colors
@@ -236,13 +236,13 @@ TQString KTheme::createYourself( bool pack )
     for ( TQStringList::Iterator it = stdColors.begin(); it != stdColors.end(); ++it )
         createColorElem( ( *it ), "global", colorsElem, globalConf );
 
-    TQStringList kwinColors;
-    kwinColors << "activeForeground" << "inactiveBackground" << "inactiveBlend" << "activeBackground"
+    TQStringList twinColors;
+    twinColors << "activeForeground" << "inactiveBackground" << "inactiveBlend" << "activeBackground"
                << "activeBlend" << "inactiveForeground" << "activeTitleBtnBg" << "inactiveTitleBtnBg"
                << "frame" << "inactiveFrame" << "handle" << "inactiveHandle";
     globalConf->setGroup( "WM" );
-    for ( TQStringList::Iterator it = kwinColors.begin(); it != kwinColors.end(); ++it )
-        createColorElem( ( *it ), "kwin", colorsElem, globalConf );
+    for ( TQStringList::Iterator it = twinColors.begin(); it != twinColors.end(); ++it )
+        createColorElem( ( *it ), "twin", colorsElem, globalConf );
 
     m_root.appendChild( colorsElem );
 
@@ -256,19 +256,19 @@ TQString KTheme::createYourself( bool pack )
     // TODO copy the cursor theme?
 
     // 7. KWin
-    kwinConf.setGroup( "Style" );
+    twinConf.setGroup( "Style" );
     TQDomElement wmElem = m_dom.createElement( "wm" );
-    wmElem.setAttribute( "name", kwinConf.readEntry( "PluginLib" ) );
-    wmElem.setAttribute( "type", "builtin" );    // TODO support pixmap themes when the kwin client gets ported
-    if ( kwinConf.readBoolEntry( "CustomButtonPositions" )  )
+    wmElem.setAttribute( "name", twinConf.readEntry( "PluginLib" ) );
+    wmElem.setAttribute( "type", "builtin" );    // TODO support pixmap themes when the twin client gets ported
+    if ( twinConf.readBoolEntry( "CustomButtonPositions" )  )
     {
         TQDomElement buttonsElem = m_dom.createElement( "buttons" );
-        buttonsElem.setAttribute( "left", kwinConf.readEntry( "ButtonsOnLeft" ) );
-        buttonsElem.setAttribute( "right", kwinConf.readEntry( "ButtonsOnRight" ) );
+        buttonsElem.setAttribute( "left", twinConf.readEntry( "ButtonsOnLeft" ) );
+        buttonsElem.setAttribute( "right", twinConf.readEntry( "ButtonsOnRight" ) );
         wmElem.appendChild( buttonsElem );
     }
     TQDomElement borderElem = m_dom.createElement( "border" );
-    borderElem.setAttribute( "size", kwinConf.readNumEntry( "BorderSize", 1 ) );
+    borderElem.setAttribute( "size", twinConf.readNumEntry( "BorderSize", 1 ) );
     wmElem.appendChild( borderElem );
     m_root.appendChild( wmElem );
 
@@ -493,7 +493,7 @@ void KTheme::apply()
     if ( !soundsElem.isNull() )
     {
         KConfig soundConf( "knotify.eventsrc" );
-        KConfig kwinSoundConf( "kwin.eventsrc" );
+        KConfig twinSoundConf( "twin.eventsrc" );
         TQDomNodeList eventList = soundsElem.elementsByTagName( "event" );
         for ( uint i = 0; i < eventList.count(); i++ )
         {
@@ -506,18 +506,18 @@ void KTheme::apply()
                 soundConf.writeEntry( "soundfile", unprocessFilePath( "sounds", eventElem.attribute( "url" ) ) );
                 soundConf.writeEntry( "presentation", soundConf.readNumEntry( "presentation" ) | 1 );
             }
-            else if ( object == "kwin" )
+            else if ( object == "twin" )
             {
-                kwinSoundConf.setGroup( eventElem.attribute( "name" ) );
-                kwinSoundConf.writeEntry( "soundfile", unprocessFilePath( "sounds", eventElem.attribute( "url" ) ) );
-                kwinSoundConf.writeEntry( "presentation", soundConf.readNumEntry( "presentation" ) | 1 );
+                twinSoundConf.setGroup( eventElem.attribute( "name" ) );
+                twinSoundConf.writeEntry( "soundfile", unprocessFilePath( "sounds", eventElem.attribute( "url" ) ) );
+                twinSoundConf.writeEntry( "presentation", soundConf.readNumEntry( "presentation" ) | 1 );
             }
         }
 
         soundConf.sync();
-        kwinSoundConf.sync();
+        twinSoundConf.sync();
         client->send("knotify", "", "reconfigure()", TQString(""));
-        // TODO signal kwin sounds change?
+        // TODO signal twin sounds change?
     }
 
     // 5. Colors
@@ -538,7 +538,7 @@ void KTheme::apply()
             TQString object = colorElem.attribute( "object" );
             if ( object == "global" )
                 colorConf->setGroup( "General" );
-            else if ( object == "kwin" )
+            else if ( object == "twin" )
                 colorConf->setGroup( "WM" );
 
             TQString colName = colorElem.tagName();
@@ -573,27 +573,27 @@ void KTheme::apply()
 
     if ( !wmElem.isNull() )
     {
-        KConfig kwinConf( "kwinrc" );
-        kwinConf.setGroup( "Style" );
+        KConfig twinConf( "twinrc" );
+        twinConf.setGroup( "Style" );
         TQString type = wmElem.attribute( "type" );
         if ( type == "builtin" )
-            kwinConf.writeEntry( "PluginLib", wmElem.attribute( "name" ) );
+            twinConf.writeEntry( "PluginLib", wmElem.attribute( "name" ) );
         //else // TODO support custom themes
         TQDomNodeList buttons = wmElem.elementsByTagName ("buttons");
         if ( buttons.count() > 0 )
         {
-            kwinConf.writeEntry( "CustomButtonPositions", true );
-            kwinConf.writeEntry( "ButtonsOnLeft", getProperty( wmElem, "buttons", "left" ) );
-            kwinConf.writeEntry( "ButtonsOnRight", getProperty( wmElem, "buttons", "right" ) );
+            twinConf.writeEntry( "CustomButtonPositions", true );
+            twinConf.writeEntry( "ButtonsOnLeft", getProperty( wmElem, "buttons", "left" ) );
+            twinConf.writeEntry( "ButtonsOnRight", getProperty( wmElem, "buttons", "right" ) );
         }
         else
         {
-            kwinConf.writeEntry( "CustomButtonPositions", false );
+            twinConf.writeEntry( "CustomButtonPositions", false );
         }
-        kwinConf.writeEntry( "BorderSize", getProperty( wmElem, "border", "size" ) );
+        twinConf.writeEntry( "BorderSize", getProperty( wmElem, "border", "size" ) );
 
-        kwinConf.sync();
-        client->send( "kwin", "", "reconfigure()", TQString("") );
+        twinConf.sync();
+        client->send( "twin", "", "reconfigure()", TQString("") );
     }
 
     // 8. Konqueror
diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h
index 0ec3c94cf..6ba23f535 100644
--- a/kcontrol/kthememanager/ktheme.h
+++ b/kcontrol/kthememanager/ktheme.h
@@ -171,7 +171,7 @@ private:
     /**
      * Creates a list of "event" elements based on:
      * @param events The list of events to work on
-     * @param object Specifier (currently "global" or "kwin")
+     * @param object Specifier (currently "global" or "twin")
      * @param parent Parent element to append to
      * @param cfg The KConfig object to work with
      */
diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index f48d621cf..0529eb91d 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <kregexpeditorinterface.h>
 #include <kparts/componentfactory.h>
 
diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp
index eb8ddbd7f..baada1f1f 100644
--- a/kcontrol/randr/ktimerdialog.cpp
+++ b/kcontrol/randr/ktimerdialog.cpp
@@ -26,7 +26,7 @@
 #include <qprogressbar.h>
 #include <qlabel.h>
 
-#include <kwin.h>
+#include <twin.h>
 #include <kiconloader.h>
 
 #include <klocale.h>
diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp
index ed0c8b2cf..cb5760fcc 100644
--- a/kcontrol/screensaver/kswidget.cpp
+++ b/kcontrol/screensaver/kswidget.cpp
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <kwin.h>
+#include <twin.h>
 #include "testwin.h"
 
 #ifdef HAVE_GLXCHOOSEVISUAL
diff --git a/kcontrol/screensaver/testwin.cpp b/kcontrol/screensaver/testwin.cpp
index 3676c0db7..dd250e084 100644
--- a/kcontrol/screensaver/testwin.cpp
+++ b/kcontrol/screensaver/testwin.cpp
@@ -1,4 +1,4 @@
-#include <kwin.h>
+#include <twin.h>
 #include "testwin.h"
 
 class QXEmbed;
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index ba6559c1b..ecfd6fea9 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -649,7 +649,7 @@ void KCMStyle::save()
 
 	if (m_bEffectsDirty) {
 		KIPC::sendMessageAll(KIPC::SettingsChanged);
-		kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+		kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 	}
         //update kicker to re-used tooltips kicker parameter otherwise, it overwritted
         //by style tooltips parameters.
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index a13963e09..a07189cde 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -29,7 +29,7 @@
 #include <kconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kcolorbutton.h>
 #include <tqlabel.h>
 
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index d7219e17e..cedbd42fd 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -29,7 +29,7 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <tqcheckbox.h>
 #include <tqlayout.h>
@@ -177,7 +177,7 @@ void KCMXinerama::save() {
 
 		if (!kapp->dcopClient()->isAttached())
 			kapp->dcopClient()->attach();
-		kapp->dcopClient()->send("kwin", "", "reconfigure()", TQString(""));
+		kapp->dcopClient()->send("twin", "", "reconfigure()", TQString(""));
 
 		ksplashrc->setGroup("Xinerama");
 		ksplashrc->writeEntry("KSplashScreen", xw->_enableXinerama->isChecked() ? xw->_ksplashDisplay->currentItem() : -2 /* ignore Xinerama */);