Rename kwin to twin (part 1 of 2)

35 files changed, 264 insertions, 264 deletions

diff --git a/kwin/kcmkwin/CMakeLists.txt b/kwin/kcmkwin/CMakeLists.txt
index 76ed077ec..e0ca44195 100644
--- a/kwin/kcmkwin/CMakeLists.txt
+++ b/kwin/kcmkwin/CMakeLists.txt
@@ -9,8 +9,8 @@
 #
 #################################################
 
-add_subdirectory( kwinoptions )
-add_subdirectory( kwindecoration )
-add_subdirectory( kwinrules )
+add_subdirectory( twinoptions )
+add_subdirectory( twindecoration )
+add_subdirectory( twinrules )
 
 install( FILES showdesktop.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
diff --git a/kwin/kcmkwin/Makefile.am b/kwin/kcmkwin/Makefile.am
index e3a4a3d24..1f371dd46 100644
--- a/kwin/kcmkwin/Makefile.am
+++ b/kwin/kcmkwin/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = kwinoptions kwindecoration kwinrules
+SUBDIRS = twinoptions twindecoration twinrules
 
 xdg_apps_DATA = showdesktop.desktop
\ No newline at end of file
diff --git a/kwin/kcmkwin/kwindecoration/CMakeLists.txt b/kwin/kcmkwin/kwindecoration/CMakeLists.txt
index 1d88ce5a9..5fbdb3653 100644
--- a/kwin/kcmkwin/kwindecoration/CMakeLists.txt
+++ b/kwin/kcmkwin/kwindecoration/CMakeLists.txt
@@ -12,7 +12,7 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/kwin/lib
+  ${CMAKE_SOURCE_DIR}/twin/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -23,15 +23,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kwindecoration.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES twindecoration.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
-##### kcm_kwindecoration (module) ###############
+##### kcm_twindecoration (module) ###############
 
-tde_add_kpart( kcm_kwindecoration AUTOMOC
+tde_add_kpart( kcm_twindecoration AUTOMOC
   SOURCES
-    kwindecoration.cpp buttons.cpp
-    kwindecorationIface.skel preview.cpp
+    twindecoration.cpp buttons.cpp
+    twindecorationIface.skel preview.cpp
   LINK tdecorations-shared tdeui-shared Xext
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/kcmkwin/kwindecoration/Makefile.am b/kwin/kcmkwin/kwindecoration/Makefile.am
index e7bac2af8..021c1ac3e 100644
--- a/kwin/kcmkwin/kwindecoration/Makefile.am
+++ b/kwin/kcmkwin/kwindecoration/Makefile.am
@@ -1,18 +1,18 @@
 INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
-kde_module_LTLIBRARIES = kcm_kwindecoration.la
+kde_module_LTLIBRARIES = kcm_twindecoration.la
 
-kcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel preview.cpp
-noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h preview.h
+kcm_twindecoration_la_SOURCES = twindecoration.cpp buttons.cpp twindecorationIface.skel preview.cpp
+noinst_HEADERS = twindecoration.h twindecorationIface.h buttons.h preview.h
 
-kcm_kwindecoration_la_LDFLAGS = \
+kcm_twindecoration_la_LDFLAGS = \
   -module -avoid-version $(all_libraries) -no-undefined
 
-kcm_kwindecoration_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
+kcm_twindecoration_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kcmkwindecoration.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kcmtwindecoration.pot
 
-xdg_apps_DATA = kwindecoration.desktop
+xdg_apps_DATA = twindecoration.desktop
diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp
index 7ddcb2af2..2c450aed1 100644
--- a/kwin/kcmkwin/kwindecoration/buttons.cpp
+++ b/kwin/kcmkwin/kwindecoration/buttons.cpp
@@ -1,15 +1,15 @@
 /*
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2004,  Sandro Giessl <[email protected]>
 	Copyright (c) 2001
 		Karol Szwed <[email protected]>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders)
+	Based on original "twintheme" (Window Borders)
 	Copyright (C) 2001 Rik Hemsley (rikkus) <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -46,7 +46,7 @@
 #include "pixmaps.h"
 
 
-#define BUTTONDRAGMIMETYPE "application/x-kde_kwindecoration_buttons"
+#define BUTTONDRAGMIMETYPE "application/x-kde_twindecoration_buttons"
 ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name)
 	: TQStoredDrag( BUTTONDRAGMIMETYPE, parent, name)
 {
diff --git a/kwin/kcmkwin/kwindecoration/buttons.h b/kwin/kcmkwin/kwindecoration/buttons.h
index 909adfe87..088d3414d 100644
--- a/kwin/kcmkwin/kwindecoration/buttons.h
+++ b/kwin/kcmkwin/kwindecoration/buttons.h
@@ -1,15 +1,15 @@
 /*
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2004, Sandro Giessl <[email protected]>
 	Copyright (c) 2001
 		Karol Szwed <[email protected]>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders) 
+	Based on original "twintheme" (Window Borders) 
 	Copyright (C) 2001 Rik Hemsley (rikkus) <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
index 65c951893..4ef509e5a 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -1,14 +1,14 @@
 /*
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2001
 		Karol Szwed <[email protected]>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders)
+	Based on original "twintheme" (Window Borders)
 	Copyright (C) 2001 Rik Hemsley (rikkus) <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -56,7 +56,7 @@
 #include <kaboutdata.h>
 #include <dcopclient.h>
 
-#include "kwindecoration.h"
+#include "twindecoration.h"
 #include "preview.h"
 #include <kdecoration_plugins_p.h>
 #include <kdecorationfactory.h>
@@ -64,16 +64,16 @@
 // KCModule plugin interface
 // =========================
 typedef KGenericFactory<KWinDecorationModule, TQWidget> KWinDecoFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") )
+K_EXPORT_COMPONENT_FACTORY( kcm_twindecoration, KWinDecoFactory("kcmtwindecoration") )
 
 KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &)
 	: DCOPObject("KWinClientDecoration"),
 	  KCModule(KWinDecoFactory::instance(), parent, name),
-          kwinConfig("kwinrc"),
+          twinConfig("twinrc"),
           pluginObject(0)
 {
-	kwinConfig.setGroup("Style");
-        plugins = new KDecorationPreviewPlugins( &kwinConfig );
+	twinConfig.setGroup("Style");
+        plugins = new KDecorationPreviewPlugins( &twinConfig );
 
 	TQVBoxLayout* layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); 
 
@@ -319,8 +319,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	// Set up the decoration lists and other UI settings
 	findDecorations();
 	createDecorationList();
-	readConfig( &kwinConfig );
-	resetPlugin( &kwinConfig );
+	readConfig( &twinConfig );
+	resetPlugin( &twinConfig );
 
 	tabWidget->insertTab( pluginPage, i18n("&Window Decoration") );
 	tabWidget->insertTab( buttonPage, i18n("&Buttons") );
@@ -343,11 +343,11 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c
 	connect( cBorder, TQT_SIGNAL( activated( int )), TQT_SLOT( slotBorderChanged( int )));
 //	connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
 
-	// Allow kwin dcop signal to update our selection list
-	connectDCOPSignal("kwin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false);
+	// Allow twin dcop signal to update our selection list
+	connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false);
 	
 	KAboutData *about =
-		new KAboutData(I18N_NOOP("kcmkwindecoration"),
+		new KAboutData(I18N_NOOP("kcmtwindecoration"),
 				I18N_NOOP("Window Decoration Control Module"),
 				0, 0, KAboutData::License_GPL,
 				I18N_NOOP("(c) 2001 Karol Szwed"));
@@ -363,11 +363,11 @@ KWinDecorationModule::~KWinDecorationModule()
 }
 
 
-// Find all theme desktop files in all 'data' dirs owned by kwin.
+// Find all theme desktop files in all 'data' dirs owned by twin.
 // And insert these into a DecorationInfo structure
 void KWinDecorationModule::findDecorations()
 {
-	TQStringList dirList = KGlobal::dirs()->findDirs("data", "kwin");
+	TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin");
 	TQStringList::ConstIterator it;
 
 	for (it = dirList.begin(); it != dirList.end(); it++)
@@ -382,7 +382,7 @@ void KWinDecorationModule::findDecorations()
 					KDesktopFile desktopFile(filename);
 					TQString libName = desktopFile.readEntry("X-KDE-Library");
 
-					if (!libName.isEmpty() && libName.startsWith( "kwin3_" ))
+					if (!libName.isEmpty() && libName.startsWith( "twin3_" ))
 					{
 						DecorationInfo di;
 						di.name = desktopFile.readName();
@@ -395,12 +395,12 @@ void KWinDecorationModule::findDecorations()
 }
 
 
-// Fills the decorationList with a list of available kwin decorations
+// Fills the decorationList with a list of available twin decorations
 void KWinDecorationModule::createDecorationList()
 {
 	TQValueList<DecorationInfo>::ConstIterator it;
 
-	// Sync with kwin hardcoded KDE2 style which has no desktop item
+	// Sync with twin hardcoded KDE2 style which has no desktop item
     TQStringList decorationNames;
 	decorationNames.append( i18n("KDE 2") );
 	for (it = decorations.begin(); it != decorations.end(); ++it)
@@ -415,11 +415,11 @@ void KWinDecorationModule::createDecorationList()
 // Reset the decoration plugin to what the user just selected
 void KWinDecorationModule::slotChangeDecoration( const TQString & text)
 {
-	KConfig kwinConfig("kwinrc");
-	kwinConfig.setGroup("Style");
+	KConfig twinConfig("twinrc");
+	twinConfig.setGroup("Style");
 
 	// Let the user see config options for the currently selected decoration
-	resetPlugin( &kwinConfig, text );
+	resetPlugin( &twinConfig, text );
 }
 
 
@@ -515,7 +515,7 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name )
 		}
 
 	if (libName.isEmpty())
-		libName = "kwin_default";	// KDE 2
+		libName = "twin_default";	// KDE 2
 
 	return libName;
 }
@@ -525,8 +525,8 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name )
 // pluginConfigWidget, allowing for dynamic configuration of decorations
 void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDecoName )
 {
-	// Config names are "kwin_icewm_config"
-	// for "kwin3_icewm" kwin client
+	// Config names are "twin_icewm_config"
+	// for "twin3_icewm" twin client
 
 	TQString oldName = styleToConfigLib( oldLibraryName );
 
@@ -585,7 +585,7 @@ void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDe
 }
 
 
-// Reads the kwin config settings, and sets all UI controls to those settings
+// Reads the twin config settings, and sets all UI controls to those settings
 // Updating the config plugin if required
 void KWinDecorationModule::readConfig( KConfig* conf )
 {
@@ -599,7 +599,7 @@ void KWinDecorationModule::readConfig( KConfig* conf )
 
 	oldLibraryName = currentLibraryName;
 	currentLibraryName = conf->readEntry("PluginLib",
-					((TQPixmap::defaultDepth() > 8) ? "kwin_plastik" : "kwin_quartz"));
+					((TQPixmap::defaultDepth() > 8) ? "twin_plastik" : "twin_quartz"));
 	TQString decoName = decorationName( currentLibraryName );
 
 	// If we are using the "default" kde client, use the "default" entry.
@@ -659,14 +659,14 @@ void KWinDecorationModule::readConfig( KConfig* conf )
 }
 
 
-// Writes the selected user configuration to the kwin config file
+// Writes the selected user configuration to the twin config file
 void KWinDecorationModule::writeConfig( KConfig* conf )
 {
 	TQString name = decorationList->currentText();
 	TQString libName = decorationLibName( name );
 
-	KConfig kwinConfig("kwinrc");
-	kwinConfig.setGroup("Style");
+	KConfig twinConfig("twinrc");
+	twinConfig.setGroup("Style");
 
 	// General settings
 	conf->writeEntry("PluginLib", libName);
@@ -712,35 +712,35 @@ void KWinDecorationModule::dcopUpdateClientList()
 {
 	// Changes the current active ListBox item, and
 	// Loads a new plugin configuration tab if required.
-	KConfig kwinConfig("kwinrc");
-	kwinConfig.setGroup("Style");
+	KConfig twinConfig("twinrc");
+	twinConfig.setGroup("Style");
 
-	readConfig( &kwinConfig );
-	resetPlugin( &kwinConfig );
+	readConfig( &twinConfig );
+	resetPlugin( &twinConfig );
 }
 
 
 // Virutal functions required by KCModule
 void KWinDecorationModule::load()
 {
-	KConfig kwinConfig("kwinrc");
-	kwinConfig.setGroup("Style");
+	KConfig twinConfig("twinrc");
+	twinConfig.setGroup("Style");
 
 	// Reset by re-reading the config
-	readConfig( &kwinConfig );
-        resetPlugin( &kwinConfig );
+	readConfig( &twinConfig );
+        resetPlugin( &twinConfig );
 }
 
 
 void KWinDecorationModule::save()
 {
-	KConfig kwinConfig("kwinrc");
-	kwinConfig.setGroup("Style");
+	KConfig twinConfig("twinrc");
+	twinConfig.setGroup("Style");
 
-	writeConfig( &kwinConfig );
-	emit pluginSave( &kwinConfig );
+	writeConfig( &twinConfig );
+	emit pluginSave( &twinConfig );
 
-	kwinConfig.sync();
+	twinConfig.sync();
 	resetKWin();
 	// resetPlugin() will get called via the above DCOP function
 }
@@ -807,8 +807,8 @@ void KWinDecorationModule::checkSupportedBorderSizes()
 
 TQString KWinDecorationModule::styleToConfigLib( TQString& styleLib )
 {
-        if( styleLib.startsWith( "kwin3_" ))
-            return "kwin_" + styleLib.mid( 6 ) + "_config";
+        if( styleLib.startsWith( "twin3_" ))
+            return "twin_" + styleLib.mid( 6 ) + "_config";
         else
             return styleLib + "_config";
 }
@@ -828,13 +828,13 @@ TQString KWinDecorationModule::quickHelp() const
 
 void KWinDecorationModule::resetKWin()
 {
-	bool ok = kapp->dcopClient()->send("kwin*", "KWinInterface",
+	bool ok = kapp->dcopClient()->send("twin*", "KWinInterface",
                         "reconfigure()", TQByteArray());
 	if (!ok)
-		kdDebug() << "kcmkwindecoration: Could not reconfigure kwin" << endl;
+		kdDebug() << "kcmtwindecoration: Could not reconfigure twin" << endl;
 }
 
-#include "kwindecoration.moc"
+#include "twindecoration.moc"
 // vim: ts=4
 // kate: space-indent off; tab-width 4;
 
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
index 3c5f12e6f..dc1e55ef6 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Exec=kcmshell kwindecoration
+Exec=kcmshell twindecoration
 Icon=kcmkwm
 Type=Application
-DocPath=kcontrol/kwindecoration/index.html
+DocPath=kcontrol/twindecoration/index.html
 
 X-KDE-ModuleType=Library
-X-KDE-Library=kwindecoration
-X-KDE-FactoryName=kwindecoration
+X-KDE-Library=twindecoration
+X-KDE-FactoryName=twindecoration
 
 Name=Window Decorations
 Name[af]=Venster Versierings
@@ -162,70 +162,70 @@ Comment[zh_CN]=配置窗口标题的观感
 Comment[zh_TW]=設定視窗標題列的外觀與感覺
 Comment[zu]=Hlanganisela ukubona kanye nokuzwa kwezihloko zama-window
 
-Keywords=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
-Keywords[ar]=kwin,نافذة,مسيير,الحافة,الشكل,سمة,مظهر,ملمس,تصميم,زر,معامل,مدبر,kwm,زخرفات
-Keywords[az]=kwin,pəncərə,idarəçi,kənar,tərz,örtü,görünüş,toxuma,yer,düymə,applet,kənar,kwm,dekorasiya,bəzək
-Keywords[be]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
-Keywords[bg]=прозорец, декорация, заглавие, бутони, меню, kwin, window, manager, border, style, theme, look, feel, layout, button, handle, edge, kwm, decoration
-Keywords[ca]=kwin,finestra,gestor,vora,estil,tema,aspecte,comportament,disposició,botó,nansa,marges,kwm,decoració
-Keywords[cs]=kwin,okno,správce,okraj,styl,motiv,vzhled,rozvržení,tlačítko,úchytka,hrana,kwm,dekorace
-Keywords[csb]=kwin,òkno,menedżer,zberk,sztél,téma,wëzdrzatk,ùchòwanié,ùstôw,knąpa,ùchwët,rańt,kwm,dekòracëjô
-Keywords[cy]=kwin,ffenestr,trefnydd,ymyl,arddull,thema,golwg,teimlad,haenlun,botwm,carn,kwm,addurniad
-Keywords[da]=kwin,vindue,håndtering,kant,stil,tema,udseende,fornemmelse,layout,knap,håndtag,kant,kwm,dekoration
+Keywords=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
+Keywords[ar]=twin,نافذة,مسيير,الحافة,الشكل,سمة,مظهر,ملمس,تصميم,زر,معامل,مدبر,kwm,زخرفات
+Keywords[az]=twin,pəncərə,idarəçi,kənar,tərz,örtü,görünüş,toxuma,yer,düymə,applet,kənar,kwm,dekorasiya,bəzək
+Keywords[be]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
+Keywords[bg]=прозорец, декорация, заглавие, бутони, меню, twin, window, manager, border, style, theme, look, feel, layout, button, handle, edge, kwm, decoration
+Keywords[ca]=twin,finestra,gestor,vora,estil,tema,aspecte,comportament,disposició,botó,nansa,marges,kwm,decoració
+Keywords[cs]=twin,okno,správce,okraj,styl,motiv,vzhled,rozvržení,tlačítko,úchytka,hrana,kwm,dekorace
+Keywords[csb]=twin,òkno,menedżer,zberk,sztél,téma,wëzdrzatk,ùchòwanié,ùstôw,knąpa,ùchwët,rańt,kwm,dekòracëjô
+Keywords[cy]=twin,ffenestr,trefnydd,ymyl,arddull,thema,golwg,teimlad,haenlun,botwm,carn,kwm,addurniad
+Keywords[da]=twin,vindue,håndtering,kant,stil,tema,udseende,fornemmelse,layout,knap,håndtag,kant,kwm,dekoration
 Keywords[de]=KWin,Kwm,Fenster,Manager,Rahmen,Design,Stile,Themes,Optik,Erscheinungsbild,Layout,Knöpfe,Ränder,Dekorationen
-Keywords[el]=kwin,παράθυρο,διαχειριστής,περίγραμμα,στυλ,θέμα,εμφάνιση,αίσθηση,διάταξη,κουμπί,χειρισμός,άκρο,kwm,διακόσμηση
-Keywords[eo]=kwin,fenestro,administrilo,rando,stilo,etoso,aspekto,konduto,aranĝo,butono,eĝo,kwm,ornamo
-Keywords[es]=kwin,ventana,gestor,borde,estilo,tema,aspecto,comportamiento,disposición,botón,asa,esquina,kwm,decoración
-Keywords[et]=kwin,aken,haldur,piire,stiil,teema,välimus,kasutamine,nupud,serv,kwm,dekoratsioon
-Keywords[eu]=kwin,leihoa,kudeatzailea,ertza,estiloa,gaia,itxura,antolaketa,botoia, maneiatzailea,ertzea,kwm,dekorazioa
-Keywords[fa]=kwin، پنجره، مدیر، لبه، سبک، چهره، ظاهر، احساس، طرح‌بندی، دکمه، گرداندن، لبه، kwm، تزئین
-Keywords[fi]=kwin,ikkuna,ikkunaohjelma,ikkunoinnin hallintaohjelma,tausta,tyyli,teema,ulkonäkö,tuntuma,ulkoasu,painike,kahva,kulma,kwm,kehys
-Keywords[fr]=kwin,fenêtre,gestionnaire,bordure,style,thème,apparence,ergonomie,disposition,bouton,poignée,bord,kwm,décoration
-Keywords[fy]=kwin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear
-Keywords[ga]=kwin,fuinneog,bainisteoir,imlíne,stíl,téama,leagan amach,cnaipe,hanla,ciumhais,kwm,maisiúchán
-Keywords[gl]=kwin,fiestra,xestor,beira,estilo,tema,apariencia,formato,botón,xestión,esquina,kwm,decoración
-Keywords[he]=מנהל חלונות,חלונות,מנהל,גבול,מסגרת,סגנון,ערכה,ערכת נושא,מראה,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, kwin,window,manager,border,style,theme,look,feel,layout,button,handle, edge,kwm,decoration
+Keywords[el]=twin,παράθυρο,διαχειριστής,περίγραμμα,στυλ,θέμα,εμφάνιση,αίσθηση,διάταξη,κουμπί,χειρισμός,άκρο,kwm,διακόσμηση
+Keywords[eo]=twin,fenestro,administrilo,rando,stilo,etoso,aspekto,konduto,aranĝo,butono,eĝo,kwm,ornamo
+Keywords[es]=twin,ventana,gestor,borde,estilo,tema,aspecto,comportamiento,disposición,botón,asa,esquina,kwm,decoración
+Keywords[et]=twin,aken,haldur,piire,stiil,teema,välimus,kasutamine,nupud,serv,kwm,dekoratsioon
+Keywords[eu]=twin,leihoa,kudeatzailea,ertza,estiloa,gaia,itxura,antolaketa,botoia, maneiatzailea,ertzea,kwm,dekorazioa
+Keywords[fa]=twin، پنجره، مدیر، لبه، سبک، چهره، ظاهر، احساس، طرح‌بندی، دکمه، گرداندن، لبه، kwm، تزئین
+Keywords[fi]=twin,ikkuna,ikkunaohjelma,ikkunoinnin hallintaohjelma,tausta,tyyli,teema,ulkonäkö,tuntuma,ulkoasu,painike,kahva,kulma,kwm,kehys
+Keywords[fr]=twin,fenêtre,gestionnaire,bordure,style,thème,apparence,ergonomie,disposition,bouton,poignée,bord,kwm,décoration
+Keywords[fy]=twin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear
+Keywords[ga]=twin,fuinneog,bainisteoir,imlíne,stíl,téama,leagan amach,cnaipe,hanla,ciumhais,kwm,maisiúchán
+Keywords[gl]=twin,fiestra,xestor,beira,estilo,tema,apariencia,formato,botón,xestión,esquina,kwm,decoración
+Keywords[he]=מנהל חלונות,חלונות,מנהל,גבול,מסגרת,סגנון,ערכה,ערכת נושא,מראה,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, twin,window,manager,border,style,theme,look,feel,layout,button,handle, edge,kwm,decoration
 Keywords[hi]=के-विन,विंडो,प्रबंधक,बार्डर,शैली,प्रसंग,रूप,अनुभव,ले-आउट,बटन,हैंडल,किनारा,केडबल्यूएम,सजावट
-Keywords[hr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras
+Keywords[hr]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras
 Keywords[hu]=KWin,ablak,kezelő,szegély,stílus,téma,kinézet,megjelenés,elrendezés,nyomógomb,fogantyú,perem,kwm,ablakstílus
-Keywords[is]=kwin,gluggi,gluggastjóri,gluggar,kantar,rammi,skreyting,þema,stíll,útlit,takki,kwm,skraut
-Keywords[it]=kwin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione
-Keywords[ja]=kwin,ウィンドウ,マネージャ,枠,スタイル,テーマ,ルック,外観,レイアウト,ボタン,ハンドル,エッジ,kwm,装飾
-Keywords[km]=kwin,បង្អួច,កម្មវិធី​គ្រប់គ្រង,ស៊ុម,រចនាប័ទ្ម,ស្បែក,មុខងារ,ប្លង់,ប៊ូតុង,ការ​ប្រើ,គែម,kwm,ការ​តុបតែង
-Keywords[lt]=kwin,window,manager,border,style,theme,look,feel,layout,buttons,handle,edge,kwm,decoration,langas,tvarkyklė,rėmelis,stilius,tema,žiūrėti,jausti,išdėstymas,mygtukai,kraštas,dekoracija
-Keywords[lv]=kwin, logs, menedžeris, rāmis, stils, tēma, skats, gars, izkārtojums, poga, rokturis, stūris, kwm, dekorācija
-Keywords[mk]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,стил,тема,изглед,чувство,распоред,копче,рачка,раб,декорација
+Keywords[is]=twin,gluggi,gluggastjóri,gluggar,kantar,rammi,skreyting,þema,stíll,útlit,takki,kwm,skraut
+Keywords[it]=twin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione
+Keywords[ja]=twin,ウィンドウ,マネージャ,枠,スタイル,テーマ,ルック,外観,レイアウト,ボタン,ハンドル,エッジ,kwm,装飾
+Keywords[km]=twin,បង្អួច,កម្មវិធី​គ្រប់គ្រង,ស៊ុម,រចនាប័ទ្ម,ស្បែក,មុខងារ,ប្លង់,ប៊ូតុង,ការ​ប្រើ,គែម,kwm,ការ​តុបតែង
+Keywords[lt]=twin,window,manager,border,style,theme,look,feel,layout,buttons,handle,edge,kwm,decoration,langas,tvarkyklė,rėmelis,stilius,tema,žiūrėti,jausti,išdėstymas,mygtukai,kraštas,dekoracija
+Keywords[lv]=twin, logs, menedžeris, rāmis, stils, tēma, skats, gars, izkārtojums, poga, rokturis, stūris, kwm, dekorācija
+Keywords[mk]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,стил,тема,изглед,чувство,распоред,копче,рачка,раб,декорација
 Keywords[mn]=KWin,Kwm,Цонх,Manager,Хүрээ,Design,Хэлбэр,Загвар, Optik,Харагдалт,Layout,Товч,Өнцөг,Засал
-Keywords[mt]=kwin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, layout, tqassim, użu, button, handle, edge, kwm, decoration
-Keywords[nb]=kwin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,layout,knapp,kant,kwm,pynt,dekorasjon
-Keywords[nds]=kwin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,layout,Knoop,Greep,Rand,kwm,Dekoratschoon
+Keywords[mt]=twin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, layout, tqassim, użu, button, handle, edge, kwm, decoration
+Keywords[nb]=twin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,layout,knapp,kant,kwm,pynt,dekorasjon
+Keywords[nds]=twin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,layout,Knoop,Greep,Rand,kwm,Dekoratschoon
 Keywords[ne]=के विन,सञ्झ्याल, प्रबन्धक, किनारा, शैली, विषयवस्तु, हेराइ, बुझाइ, सजावट, बटन, ह्यान्डल, छेउ,kwm, सजावट
-Keywords[nl]=kwin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer
-Keywords[nn]=kwin,vindauge,kant,bord,stil,tema,utsjånad,bunad,knapp,handtak,kwm,dekorasjon
-Keywords[nso]=kwin,window,molaodi,mollwane,mokgwa,molaetsa,tebelego,maikutlo,peakanyo,setobetswa,moswaro,nthla,kwm,kgabiso
-Keywords[pa]=kwin,handle,edge,kwm,decoration,ਝਰੋਖਾ,ਮੈਨੇਜਰ,ਹਾਸ਼ੀਆ,ਸ਼ੈਲੀ,ਸਰੂਪ,ਦਿੱਖ,ਖਾਕਾ,ਬਟਨ,ਹੈਂਡਲ,ਸਜਾਵਟ
-Keywords[pl]=kwin,okno,menedżer,brzeg,styl,motyw,wygląd,zachowanie,układ,przycisk,uchwyt,krawędź,kwm,dekoracja
-Keywords[pt]=kwin,janela,gestor,contorno,estilo,tema,aparência,comportamento,visual,botão,pega,extremo,kwm,decoração
-Keywords[pt_BR]=kwin,janela,gerenciador,borda,estilo,tema,aparência,aparência,botão, gerenciador,borda,kwm,decoração
-Keywords[ro]=kwin,fereastră,manager,margine,stil,tematică,aspect,comportament,format,buton,kwm,decorare
-Keywords[rw]=kwin,idirishya,muyobozi,impera,imisusire,insanganyamatsiko,imboneko,kumva,imigaragarire,buto,ikirindi,impera,kwm,ugutaaka
-Keywords[se]=kwin,láse,gieđahalli,ravda,stiila,fáddá,fárda,dovdu,hápmi,boallu,geavja,ravda,kwm,hearva
-Keywords[sk]=kwin,okno,správa,okraj,štýl,téma,vzhľad,rozloženie,tlačidlo,hrana,kwm,dekorácia,oblasť
-Keywords[sl]=kwin,okno,upravitelj,rob,meja,slog,stil,tema,pogled,občutek,gumb,ročaj,rob,kwm,okrasek
-Keywords[sr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,стил,тема,изглед,дугме,хватаљка,декорација
-Keywords[sr@Latn]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija
-Keywords[sv]=kwin,fönster,hanterare,kant,stil,tema,utseende,känsla,layout,knapp,hantera,kant,kwm,dekoration
-Keywords[ta]=kwin,சாளரம்,மேலாளர்,விளிம்பு,பாணி,தலைப்பு,பார்வை,உணர்தல்,உருவரை,விசை,கையாள்,முனை,kwm,அலங்கரிப்பு
-Keywords[th]=kwin,หน้าต่าง,ตัวจัดการ,กรอบ,ลักษณะ,ชุดตกแต่ง,มองเห็น,รู้สึก,การจัดวาง,ปุ่ม,ที่จับ,ขอบ,kwm,การตกแต่ง
-Keywords[tr]=kwin,pencere,yönetici,kenar,stil,tema,görünüş,doku,yerleşim,düğme,tutamaç,kenar,kwm,dekorasyon
-Keywords[uk]=kwin,вікно,менеджер,границя,стиль,тема,вигляд,поведінка,розклад,кнопка,handle,край,kwm,обрамлення
-Keywords[uz]=kwin,kwm,bezak,oyna,boshqaruvchi,usul,tashqi koʻrinish
-Keywords[uz@cyrillic]=kwin,kwm,безак,ойна,бошқарувчи,усул,ташқи кўриниш
-Keywords[ven]=kwin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza
-Keywords[vi]=kwin,cửa sổ,quản lý,bờ,kiểu,sắc thái,ngoại hình,cảm nhận,sắp xếp,nút,điều khiển,cạnh,kwm,trang trí
-Keywords[wa]=kwin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,layout;loukance,boton,apougnî,costé,kwm,gåliotaedje
-Keywords[xh]=kwin,window,umphathi,umda,uhlobo,umxholo wokuxoxwa,jonga,yiva,beka,iqhosha,umqheba,umda,kwm,uhombiso
-Keywords[zh_CN]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,窗口,管理器,边框,样式,主题,观感,布局,按钮,处理,边缘,装饰
-Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾
-Keywords[zu]=kwin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso
+Keywords[nl]=twin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer
+Keywords[nn]=twin,vindauge,kant,bord,stil,tema,utsjånad,bunad,knapp,handtak,kwm,dekorasjon
+Keywords[nso]=twin,window,molaodi,mollwane,mokgwa,molaetsa,tebelego,maikutlo,peakanyo,setobetswa,moswaro,nthla,kwm,kgabiso
+Keywords[pa]=twin,handle,edge,kwm,decoration,ਝਰੋਖਾ,ਮੈਨੇਜਰ,ਹਾਸ਼ੀਆ,ਸ਼ੈਲੀ,ਸਰੂਪ,ਦਿੱਖ,ਖਾਕਾ,ਬਟਨ,ਹੈਂਡਲ,ਸਜਾਵਟ
+Keywords[pl]=twin,okno,menedżer,brzeg,styl,motyw,wygląd,zachowanie,układ,przycisk,uchwyt,krawędź,kwm,dekoracja
+Keywords[pt]=twin,janela,gestor,contorno,estilo,tema,aparência,comportamento,visual,botão,pega,extremo,kwm,decoração
+Keywords[pt_BR]=twin,janela,gerenciador,borda,estilo,tema,aparência,aparência,botão, gerenciador,borda,kwm,decoração
+Keywords[ro]=twin,fereastră,manager,margine,stil,tematică,aspect,comportament,format,buton,kwm,decorare
+Keywords[rw]=twin,idirishya,muyobozi,impera,imisusire,insanganyamatsiko,imboneko,kumva,imigaragarire,buto,ikirindi,impera,kwm,ugutaaka
+Keywords[se]=twin,láse,gieđahalli,ravda,stiila,fáddá,fárda,dovdu,hápmi,boallu,geavja,ravda,kwm,hearva
+Keywords[sk]=twin,okno,správa,okraj,štýl,téma,vzhľad,rozloženie,tlačidlo,hrana,kwm,dekorácia,oblasť
+Keywords[sl]=twin,okno,upravitelj,rob,meja,slog,stil,tema,pogled,občutek,gumb,ročaj,rob,kwm,okrasek
+Keywords[sr]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,стил,тема,изглед,дугме,хватаљка,декорација
+Keywords[sr@Latn]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija
+Keywords[sv]=twin,fönster,hanterare,kant,stil,tema,utseende,känsla,layout,knapp,hantera,kant,kwm,dekoration
+Keywords[ta]=twin,சாளரம்,மேலாளர்,விளிம்பு,பாணி,தலைப்பு,பார்வை,உணர்தல்,உருவரை,விசை,கையாள்,முனை,kwm,அலங்கரிப்பு
+Keywords[th]=twin,หน้าต่าง,ตัวจัดการ,กรอบ,ลักษณะ,ชุดตกแต่ง,มองเห็น,รู้สึก,การจัดวาง,ปุ่ม,ที่จับ,ขอบ,kwm,การตกแต่ง
+Keywords[tr]=twin,pencere,yönetici,kenar,stil,tema,görünüş,doku,yerleşim,düğme,tutamaç,kenar,kwm,dekorasyon
+Keywords[uk]=twin,вікно,менеджер,границя,стиль,тема,вигляд,поведінка,розклад,кнопка,handle,край,kwm,обрамлення
+Keywords[uz]=twin,kwm,bezak,oyna,boshqaruvchi,usul,tashqi koʻrinish
+Keywords[uz@cyrillic]=twin,kwm,безак,ойна,бошқарувчи,усул,ташқи кўриниш
+Keywords[ven]=twin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza
+Keywords[vi]=twin,cửa sổ,quản lý,bờ,kiểu,sắc thái,ngoại hình,cảm nhận,sắp xếp,nút,điều khiển,cạnh,kwm,trang trí
+Keywords[wa]=twin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,layout;loukance,boton,apougnî,costé,kwm,gåliotaedje
+Keywords[xh]=twin,window,umphathi,umda,uhlobo,umxholo wokuxoxwa,jonga,yiva,beka,iqhosha,umqheba,umda,kwm,uhombiso
+Keywords[zh_CN]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,窗口,管理器,边框,样式,主题,观感,布局,按钮,处理,边缘,装饰
+Keywords[zh_TW]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾
+Keywords[zu]=twin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso
 Categories=Qt;KDE;X-KDE-settings-looknfeel;
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.h b/kwin/kcmkwin/kwindecoration/kwindecoration.h
index 53b3ed6ae..f6b535024 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.h
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.h
@@ -1,14 +1,14 @@
 /*
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2001
 		Karol Szwed <[email protected]>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders) 
+	Based on original "twintheme" (Window Borders) 
 	Copyright (C) 2001 Rik Hemsley (rikkus) <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@
 
 #include <kdecoration.h>
 
-#include "kwindecorationIface.h"
+#include "twindecorationIface.h"
 
 class KComboBox;
 class TQCheckBox;
@@ -109,7 +109,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
 
 		KDecorationPreview* preview;
 		KDecorationPlugins* plugins;
-		KConfig kwinConfig;
+		KConfig twinConfig;
 
 		TQCheckBox* cbUseCustomButtonPositions;
 	//	TQCheckBox* cbUseMiniWindows;
diff --git a/kwin/kcmkwin/kwindecoration/kwindecorationIface.h b/kwin/kcmkwin/kwindecoration/kwindecorationIface.h
index f45be6b7b..f50082648 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecorationIface.h
+++ b/kwin/kcmkwin/kwindecoration/kwindecorationIface.h
@@ -1,14 +1,14 @@
 /* 
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2001
 		Karol Szwed (gallium) <[email protected]>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders) 
+	Based on original "twintheme" (Window Borders) 
 	Copyright (C) 2001 Rik Hemsley (rikkus) <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
diff --git a/kwin/kcmkwin/kwindecoration/pixmaps.h b/kwin/kcmkwin/kwindecoration/pixmaps.h
index 76f60b3e9..710e01425 100644
--- a/kwin/kcmkwin/kwindecoration/pixmaps.h
+++ b/kwin/kcmkwin/kwindecoration/pixmaps.h
@@ -1,15 +1,15 @@
 /* 
-	This is the new kwindecoration kcontrol module
+	This is the new twindecoration kcontrol module
 
 	Copyright (c) 2004, Sandro Giessl <[email protected]>
 	Copyright (c) 2001
 		Karol Szwed <[email protected]>
 		http://gallium.n3.net/
 
-	Supports new kwin configuration plugins, and titlebar button position
+	Supports new twin configuration plugins, and titlebar button position
 	modification via dnd interface.
 
-	Based on original "kwintheme" (Window Borders) 
+	Based on original "twintheme" (Window Borders) 
 	Copyright (C) 2001 Rik Hemsley (rikkus) <[email protected]>
 
     This program is free software; you can redistribute it and/or modify
diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp
index ea894ecbc..ee8c59c75 100644
--- a/kwin/kcmkwin/kwindecoration/preview.cpp
+++ b/kwin/kcmkwin/kwindecoration/preview.cpp
@@ -454,7 +454,7 @@ KDecorationPreviewOptions::~KDecorationPreviewOptions()
 
 unsigned long KDecorationPreviewOptions::updateSettings()
     {
-    KConfig cfg( "kwinrc", true );
+    KConfig cfg( "twinrc", true );
     unsigned long changed = 0;
     changed |= d->updateKWinSettings( &cfg );
 
diff --git a/kwin/kcmkwin/kwinoptions/CMakeLists.txt b/kwin/kcmkwin/kwinoptions/CMakeLists.txt
index b3caf6ec0..591883e21 100644
--- a/kwin/kcmkwin/kwinoptions/CMakeLists.txt
+++ b/kwin/kcmkwin/kwinoptions/CMakeLists.txt
@@ -23,17 +23,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kwinoptions.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES twinoptions.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 install( FILES
-    kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop
-    kwinmoving.desktop kwintranslucency.desktop
+    twinactions.desktop twinadvanced.desktop twinfocus.desktop
+    twinmoving.desktop twintranslucency.desktop
   DESTINATION ${APPS_INSTALL_DIR}/.hidden )
 
 
-##### kcm_kwinoptions (module) ##################
+##### kcm_twinoptions (module) ##################
 
-tde_add_kpart( kcm_kwinoptions AUTOMOC
+tde_add_kpart( kcm_twinoptions AUTOMOC
   SOURCES windows.cpp mouse.cpp main.cpp
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/kcmkwin/kwinoptions/Makefile.am b/kwin/kcmkwin/kwinoptions/Makefile.am
index 7dd897762..d2b4e6583 100644
--- a/kwin/kcmkwin/kwinoptions/Makefile.am
+++ b/kwin/kcmkwin/kwinoptions/Makefile.am
@@ -1,18 +1,18 @@
 METASOURCES = AUTO
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kcm_kwinoptions.la 
+kde_module_LTLIBRARIES = kcm_twinoptions.la 
 
-kcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp
-kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-kcm_kwinoptions_la_LIBADD = $(LIB_TDEUI)
+kcm_twinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp
+kcm_twinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+kcm_twinoptions_la_LIBADD = $(LIB_TDEUI)
 
 noinst_HEADERS = windows.h mouse.h 
 
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/kcmkwm.pot
 
-kwin_kcmkwin_options_data_DATA = kwinactions.desktop  kwinadvanced.desktop  kwinfocus.desktop  kwinmoving.desktop  kwintranslucency.desktop 
-kwin_kcmkwin_options_datadir = $(kde_appsdir)/.hidden
+twin_kcmtwin_options_data_DATA = twinactions.desktop  twinadvanced.desktop  twinfocus.desktop  twinmoving.desktop  twintranslucency.desktop 
+twin_kcmtwin_options_datadir = $(kde_appsdir)/.hidden
 
-xdg_apps_DATA = kwinoptions.desktop
+xdg_apps_DATA = twinoptions.desktop
diff --git a/kwin/kcmkwin/kwinoptions/kwinactions.desktop b/kwin/kcmkwin/kwinoptions/kwinactions.desktop
index 61b58b06d..8f0b7b0ba 100644
--- a/kwin/kcmkwin/kwinoptions/kwinactions.desktop
+++ b/kwin/kcmkwin/kwinoptions/kwinactions.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell kwinactions
+Exec=kcmshell twinactions
 DocPath=kcontrol/windowmanagement/index.html#action-actions
 
 X-KDE-ModuleType=Library
-X-KDE-Library=kwinoptions
-X-KDE-FactoryName=kwinactions
+X-KDE-Library=twinoptions
+X-KDE-FactoryName=twinactions
 
 Name=Actions
 Name[af]=Aksies
diff --git a/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop b/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop
index e8b6b52e8..541f93e7f 100644
--- a/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop
+++ b/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell kwinadvanced
+Exec=kcmshell twinadvanced
 DocPath=kcontrol/windowmanagement/index.html#action-advanced
 
 X-KDE-ModuleType=Library
-X-KDE-Library=kwinoptions
-X-KDE-FactoryName=kwinadvanced
+X-KDE-Library=twinoptions
+X-KDE-FactoryName=twinadvanced
 
 Name=Advanced
 Name[af]=Gevorderde
diff --git a/kwin/kcmkwin/kwinoptions/kwinfocus.desktop b/kwin/kcmkwin/kwinoptions/kwinfocus.desktop
index 115463654..541c82501 100644
--- a/kwin/kcmkwin/kwinoptions/kwinfocus.desktop
+++ b/kwin/kcmkwin/kwinoptions/kwinfocus.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell kwinfocus
+Exec=kcmshell twinfocus
 DocPath=kcontrol/windowmanagement/index.html#action-focus
 
 X-KDE-ModuleType=Library
-X-KDE-Library=kwinoptions
-X-KDE-FactoryName=kwinfocus
+X-KDE-Library=twinoptions
+X-KDE-FactoryName=twinfocus
 
 Name=Focus
 Name[af]=Fokus
diff --git a/kwin/kcmkwin/kwinoptions/kwinmoving.desktop b/kwin/kcmkwin/kwinoptions/kwinmoving.desktop
index 912418e0e..9ba6aec20 100644
--- a/kwin/kcmkwin/kwinoptions/kwinmoving.desktop
+++ b/kwin/kcmkwin/kwinoptions/kwinmoving.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell kwinmoving
+Exec=kcmshell twinmoving
 DocPath=kcontrol/windowmanagement/index.html#action-moving
 
 X-KDE-ModuleType=Library
-X-KDE-Library=kwinoptions
-X-KDE-FactoryName=kwinmoving
+X-KDE-Library=twinoptions
+X-KDE-FactoryName=twinmoving
 
 Name=Moving
 Name[af]=Beweeg
diff --git a/kwin/kcmkwin/kwinoptions/kwinoptions.desktop b/kwin/kcmkwin/kwinoptions/kwinoptions.desktop
index 23a222197..e520dcc88 100644
--- a/kwin/kcmkwin/kwinoptions/kwinoptions.desktop
+++ b/kwin/kcmkwin/kwinoptions/kwinoptions.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell kwinoptions
+Exec=kcmshell twinoptions
 DocPath=kcontrol/windowmanagement/index.html
 
 X-KDE-ModuleType=Library
-X-KDE-Library=kwinoptions
-X-KDE-FactoryName=kwinoptions
+X-KDE-Library=twinoptions
+X-KDE-FactoryName=twinoptions
 
 Name=Window Behavior
 Name[af]=Venster Gedrag
diff --git a/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop b/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop
index e45e5928a..591cab231 100644
--- a/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop
+++ b/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell kwintranslucency
+Exec=kcmshell twintranslucency
 DocPath=kcontrol/windowmanagement/index.html#action-translucency
 
 X-KDE-ModuleType=Library
-X-KDE-Library=kwinoptions
-X-KDE-FactoryName=kwintranslucency
+X-KDE-Library=twinoptions
+X-KDE-FactoryName=twintranslucency
 
 Name=Translucency
 Name[af]=Deursigtigheid
diff --git a/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp
index 8c8a283f2..a10269eca 100644
--- a/kwin/kcmkwin/kwinoptions/main.cpp
+++ b/kwin/kcmkwin/kwinoptions/main.cpp
@@ -36,48 +36,48 @@
 
 extern "C"
 {
-	KDE_EXPORT KCModule *create_kwinfocus(TQWidget *parent, const char *name)
+	KDE_EXPORT KCModule *create_twinfocus(TQWidget *parent, const char *name)
 	{
-		//CT there's need for decision: kwm or kwin?
+		//CT there's need for decision: kwm or twin?
 		KGlobal::locale()->insertCatalogue("kcmkwm");
-		KConfig *c = new KConfig("kwinrc", false, true);
+		KConfig *c = new KConfig("twinrc", false, true);
 		return new KFocusConfig(true, c, parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_kwinactions(TQWidget *parent, const char *name)
+	KDE_EXPORT KCModule *create_twinactions(TQWidget *parent, const char *name)
 	{
-		//CT there's need for decision: kwm or kwin?
+		//CT there's need for decision: kwm or twin?
 		KGlobal::locale()->insertCatalogue("kcmkwm");
 		return new KActionsOptions( parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_kwinmoving(TQWidget *parent, const char *name)
+	KDE_EXPORT KCModule *create_twinmoving(TQWidget *parent, const char *name)
 	{
-		//CT there's need for decision: kwm or kwin?
+		//CT there's need for decision: kwm or twin?
 		KGlobal::locale()->insertCatalogue("kcmkwm");
-		KConfig *c = new KConfig("kwinrc", false, true);
+		KConfig *c = new KConfig("twinrc", false, true);
 		return new KMovingConfig(true, c, parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_kwinadvanced(TQWidget *parent, const char *name)
+	KDE_EXPORT KCModule *create_twinadvanced(TQWidget *parent, const char *name)
 	{
-		//CT there's need for decision: kwm or kwin?
+		//CT there's need for decision: kwm or twin?
 		KGlobal::locale()->insertCatalogue("kcmkwm");
-		KConfig *c = new KConfig("kwinrc", false, true);
+		KConfig *c = new KConfig("twinrc", false, true);
 		return new KAdvancedConfig(true, c, parent, name);
 	}
         
-	KDE_EXPORT KCModule *create_kwintranslucency(TQWidget *parent, const char *name)
+	KDE_EXPORT KCModule *create_twintranslucency(TQWidget *parent, const char *name)
 	{
-		//CT there's need for decision: kwm or kwin?
+		//CT there's need for decision: kwm or twin?
 		KGlobal::locale()->insertCatalogue("kcmkwm");
-		KConfig *c = new KConfig("kwinrc", false, true);
+		KConfig *c = new KConfig("twinrc", false, true);
 		return new KTranslucencyConfig(true, c, parent, name);
 	}
 
-	KDE_EXPORT KCModule *create_kwinoptions ( TQWidget *parent, const char* name)
+	KDE_EXPORT KCModule *create_twinoptions ( TQWidget *parent, const char* name)
 	{
-		//CT there's need for decision: kwm or kwin?
+		//CT there's need for decision: kwm or twin?
 		KGlobal::locale()->insertCatalogue("kcmkwm");
 		return new KWinOptions( parent, name);
 	}
@@ -86,7 +86,7 @@ extern "C"
 KWinOptions::KWinOptions(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-  mConfig = new KConfig("kwinrc", false, true);
+  mConfig = new KConfig("twinrc", false, true);
 
   TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
@@ -123,7 +123,7 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name)
   connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
     
   KAboutData *about =
-    new KAboutData(I18N_NOOP("kcmkwinoptions"), I18N_NOOP("Window Behavior Configuration Module"),
+    new KAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"),
                   0, 0, KAboutData::License_GPL,
                   I18N_NOOP("(c) 1997 - 2002 KWin and KControl Authors"));
 
@@ -167,11 +167,11 @@ void KWinOptions::save()
   mTranslucency->save();
 
   emit KCModule::changed( false );
-  // Send signal to kwin
+  // Send signal to twin
   mConfig->sync();
   if ( !kapp->dcopClient()->isAttached() )
       kapp->dcopClient()->attach();
-  kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+  kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 }
 
 
@@ -204,7 +204,7 @@ void KWinOptions::moduleChanged(bool state)
 KActionsOptions::KActionsOptions(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-  mConfig = new KConfig("kwinrc", false, true);
+  mConfig = new KConfig("twinrc", false, true);
 
   TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
@@ -240,11 +240,11 @@ void KActionsOptions::save()
   mWindowActions->save();
 
   emit KCModule::changed( false );
-  // Send signal to kwin
+  // Send signal to twin
   mConfig->sync();
   if ( !kapp->dcopClient()->isAttached() )
       kapp->dcopClient()->attach();
-  kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+  kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
 }
 
 
diff --git a/kwin/kcmkwin/kwinoptions/mouse.cpp b/kwin/kcmkwin/kwinoptions/mouse.cpp
index 30c18383c..30692d87f 100644
--- a/kwin/kcmkwin/kwinoptions/mouse.cpp
+++ b/kwin/kcmkwin/kwinoptions/mouse.cpp
@@ -565,7 +565,7 @@ void KTitleBarActionsConfig::save()
     config->sync();
     if ( !kapp->dcopClient()->isAttached() )
       kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
   }
 }
 
@@ -839,7 +839,7 @@ void KWindowActionsConfig::save()
     config->sync();
     if ( !kapp->dcopClient()->isAttached() )
       kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
   }
 }
 
diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp
index 30d0791e8..80185a427 100644
--- a/kwin/kcmkwin/kwinoptions/windows.cpp
+++ b/kwin/kcmkwin/kwinoptions/windows.cpp
@@ -53,7 +53,7 @@
 #include "windows.h"
 
 
-// kwin config keywords
+// twin config keywords
 #define KWIN_FOCUS                 "FocusPolicy"
 #define KWIN_PLACEMENT             "Placement"
 #define KWIN_MOVE                  "MoveMode"
@@ -535,7 +535,7 @@ void KFocusConfig::save( void )
         config->sync();
         if ( !kapp->dcopClient()->isAttached() )
             kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
     emit KCModule::changed(false);
 }
@@ -762,7 +762,7 @@ void KAdvancedConfig::save( void )
         config->sync();
         if ( !kapp->dcopClient()->isAttached() )
             kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
     emit KCModule::changed(false);
 }
@@ -907,7 +907,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare
     placementCombo->insertItem(i18n("Random"), RANDOM_PLACEMENT);
     placementCombo->insertItem(i18n("Centered"), CENTERED_PLACEMENT);
     placementCombo->insertItem(i18n("Zero-Cornered"), ZEROCORNERED_PLACEMENT);
-    // CT: disabling is needed as long as functionality misses in kwin
+    // CT: disabling is needed as long as functionality misses in twin
     //placementCombo->insertItem(i18n("Interactive"), INTERACTIVE_PLACEMENT);
     //placementCombo->insertItem(i18n("Manual"), MANUAL_PLACEMENT);
     placementCombo->setCurrentItem(SMART_PLACEMENT);
@@ -1098,7 +1098,7 @@ void KMovingConfig::load( void )
     setMinimizeAnim( anim );
     setMinimizeAnimSpeed( animSpeed );
 
-    // DF: please keep the default consistent with kwin (options.cpp line 145)
+    // DF: please keep the default consistent with twin (options.cpp line 145)
     key = config->readEntry(KWIN_RESIZE_OPAQUE, "Opaque");
     if( key == "Opaque")
         setResizeOpaque(RESIZE_OPAQUE);
@@ -1219,7 +1219,7 @@ void KMovingConfig::save( void )
         config->sync();
         if ( !kapp->dcopClient()->isAttached() )
             kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
     emit KCModule::changed(false);
 }
@@ -1232,7 +1232,7 @@ void KMovingConfig::defaults()
     setPlacement(SMART_PLACEMENT);
     setMoveResizeMaximized(false);
 
-    //copied from kcontrol/konq/kwindesktop, aleXXX
+    //copied from kcontrol/konq/twindesktop, aleXXX
     setWindowSnapZone(KWM_WNDW_SNAP_ZONE_DEFAULT);
     setBorderSnapZone(KWM_BRDR_SNAP_ZONE_DEFAULT);
     OverlapSnap->setChecked(false);
@@ -1277,7 +1277,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, TQ
   KActiveLabel *label = new KActiveLabel(i18n("<qt><b>It seems that alpha channel support is not available.</b><br><br>"
                                  "Please make sure you have "
                                  "<a href=\"http://www.freedesktop.org/\">Xorg &ge; 6.8</a>,"
-                                 " and installed the kompmgr that came with kwin.<br>"
+                                 " and installed the kompmgr that came with twin.<br>"
                                  "Also, make sure you have the following entries in your XConfig (e.g. /etc/X11/xorg.conf):<br><br>"
                                  "<i>Section \"Extensions\"<br>"
                                  "Option \"Composite\" \"Enable\"<br>"
@@ -1636,7 +1636,7 @@ void KTranslucencyConfig::save( void )
     config->sync();
         if ( !kapp->dcopClient()->isAttached() )
             kapp->dcopClient()->attach();
-        kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+        kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
   }
   if (useTranslucency->isChecked())
     startKompmgr();
diff --git a/kwin/kcmkwin/kwinoptions/windows.h b/kwin/kcmkwin/kwinoptions/windows.h
index 57ac7163e..e3b81d07a 100644
--- a/kwin/kcmkwin/kwinoptions/windows.h
+++ b/kwin/kcmkwin/kwinoptions/windows.h
@@ -200,7 +200,7 @@ public:
 private slots:
   void shadeHoverChanged(bool);
 
-  //copied from kcontrol/konq/kwindesktop, aleXXX
+  //copied from kcontrol/konq/twindesktop, aleXXX
   void setEBorders();
 
   void changed() { emit KCModule::changed(true); }
diff --git a/kwin/kcmkwin/kwinrules/CMakeLists.txt b/kwin/kcmkwin/kwinrules/CMakeLists.txt
index d505cf709..29aa24e4e 100644
--- a/kwin/kcmkwin/kwinrules/CMakeLists.txt
+++ b/kwin/kcmkwin/kwinrules/CMakeLists.txt
@@ -13,7 +13,7 @@ add_definitions( -DKCMRULES )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kwin/lib
+  ${CMAKE_SOURCE_DIR}/twin/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -24,30 +24,30 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kwinrules.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES twinrules.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
-##### kcm_kwinrules (module) ####################
+##### kcm_twinrules (module) ####################
 
-tde_add_kpart( kcm_kwinrules AUTOMOC
+tde_add_kpart( kcm_twinrules AUTOMOC
   SOURCES kcm.cpp
-  LINK kwinrules-static
+  LINK twinrules-static
   DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
-##### kwin_rules_dialog (tdeinit) ###############
+##### twin_rules_dialog (tdeinit) ###############
 
-tde_add_tdeinit_executable( kwin_rules_dialog
+tde_add_tdeinit_executable( twin_rules_dialog
   SOURCES main.cpp
-  LINK ${TQT_LIBRARIES} kwinrules-static )
+  LINK ${TQT_LIBRARIES} twinrules-static )
 
 
-##### kwinrules (static) ########################
+##### twinrules (static) ########################
 
-set( target kwinrules )
+set( target twinrules )
 
 set( ${target}_SRCS
-  ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp
+  ruleswidget.cpp ruleslist.cpp twinsrc.cpp detectwidget.cpp
   ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui
   editshortcutbase.ui )
 
diff --git a/kwin/kcmkwin/kwinrules/Makefile.am b/kwin/kcmkwin/kwinrules/Makefile.am
index 6fe4b8108..c9e7c7beb 100644
--- a/kwin/kcmkwin/kwinrules/Makefile.am
+++ b/kwin/kcmkwin/kwinrules/Makefile.am
@@ -1,29 +1,29 @@
 METASOURCES = AUTO
 AM_CPPFLAGS = $(all_includes) -DKCMRULES
-INCLUDES = -I$(top_srcdir)/kwin/lib
+INCLUDES = -I$(top_srcdir)/twin/lib
 
 bin_PROGRAMS =
 lib_LTLIBRARIES =
-tdeinit_LTLIBRARIES = kwin_rules_dialog.la
-kde_module_LTLIBRARIES = kcm_kwinrules.la 
-noinst_LTLIBRARIES = libkwinrules.la
+tdeinit_LTLIBRARIES = twin_rules_dialog.la
+kde_module_LTLIBRARIES = kcm_twinrules.la 
+noinst_LTLIBRARIES = libtwinrules.la
 
-libkwinrules_la_SOURCES = ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp \
+libtwinrules_la_SOURCES = ruleswidget.cpp ruleslist.cpp twinsrc.cpp detectwidget.cpp \
         ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui editshortcutbase.ui
-libkwinrules_la_LDFLAGS = $(all_libraries) -no-undefined
-libkwinrules_la_LIBADD = $(LIB_TDEUI)
+libtwinrules_la_LDFLAGS = $(all_libraries) -no-undefined
+libtwinrules_la_LIBADD = $(LIB_TDEUI)
 
-kcm_kwinrules_la_SOURCES = kcm.cpp 
-kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-kcm_kwinrules_la_LIBADD = libkwinrules.la 
-kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
+kcm_twinrules_la_SOURCES = kcm.cpp 
+kcm_twinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+kcm_twinrules_la_LIBADD = libtwinrules.la 
+kcm_twinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
 
-kwin_rules_dialog_la_SOURCES = main.cpp 
-kwin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-kwin_rules_dialog_la_LIBADD = libkwinrules.la 
-kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
+twin_rules_dialog_la_SOURCES = main.cpp 
+twin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+twin_rules_dialog_la_LIBADD = libtwinrules.la 
+twin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kcmkwinrules.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kcmtwinrules.pot
 
-xdg_apps_DATA = kwinrules.desktop
+xdg_apps_DATA = twinrules.desktop
diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp
index c30ae24ff..d82836868 100644
--- a/kwin/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kwin.h>
+#include <twin.h>
 #include <tqlabel.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
diff --git a/kwin/kcmkwin/kwinrules/detectwidget.h b/kwin/kcmkwin/kwinrules/detectwidget.h
index 9a2cca3d2..75e725f5f 100644
--- a/kwin/kcmkwin/kwinrules/detectwidget.h
+++ b/kwin/kcmkwin/kwinrules/detectwidget.h
@@ -23,7 +23,7 @@
 #include "detectwidgetbase.h"
 
 #include <kdialogbase.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include "../../rules.h"
 
diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp
index 90802c41d..c7cdc7587 100644
--- a/kwin/kcmkwin/kwinrules/kcm.cpp
+++ b/kwin/kcmkwin/kwinrules/kcm.cpp
@@ -28,10 +28,10 @@
 #include "ruleslist.h"
 
 extern "C"
-    KDE_EXPORT KCModule *create_kwinrules( TQWidget *parent, const char *name )
+    KDE_EXPORT KCModule *create_twinrules( TQWidget *parent, const char *name )
     {
-    //CT there's need for decision: kwm or kwin?
-    KGlobal::locale()->insertCatalogue( "kcmkwinrules" );
+    //CT there's need for decision: kwm or twin?
+    KGlobal::locale()->insertCatalogue( "kcmtwinrules" );
     return new KWinInternal::KCMRules( parent, name );
     }
 
@@ -40,13 +40,13 @@ namespace KWinInternal
 
 KCMRules::KCMRules( TQWidget *parent, const char *name )
 : KCModule( parent, name )
-, config( "kwinrulesrc" )
+, config( "twinrulesrc" )
     {
     TQVBoxLayout *layout = new TQVBoxLayout( this );
     widget = new KCMRulesList( this );
     layout->addWidget( TQT_TQWIDGET(widget) );
     connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool )));
-    KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ),
+    KAboutData *about = new KAboutData(I18N_NOOP( "kcmtwinrules" ),
         I18N_NOOP( "Window-Specific Settings Configuration Module" ),
         0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ));
     about->addAuthor("Lubos Lunak",0,"[email protected]");
@@ -64,11 +64,11 @@ void KCMRules::save()
     {
     widget->save();
     emit KCModule::changed( false );
-    // Send signal to kwin
+    // Send signal to twin
     config.sync();
     if( !kapp->dcopClient()->isAttached())
         kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     }
 
 void KCMRules::defaults()
diff --git a/kwin/kcmkwin/kwinrules/kwinrules.desktop b/kwin/kcmkwin/kwinrules/kwinrules.desktop
index 245994a8a..9d82ea38a 100644
--- a/kwin/kcmkwin/kwinrules/kwinrules.desktop
+++ b/kwin/kcmkwin/kwinrules/kwinrules.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell kwinrules
+Exec=kcmshell twinrules
 DocPath=kcontrol/windowmanagement/index.html
 
 X-KDE-ModuleType=Library
-X-KDE-Library=kwinrules
-X-KDE-FactoryName=kwinrules
+X-KDE-Library=twinrules
+X-KDE-FactoryName=twinrules
 
 Name=Window-Specific Settings
 Name[af]=Venser spesifike Instellings
diff --git a/kwin/kcmkwin/kwinrules/kwinsrc.cpp b/kwin/kcmkwin/kwinrules/kwinsrc.cpp
index 38f48e003..fb901efb6 100644
--- a/kwin/kcmkwin/kwinrules/kwinsrc.cpp
+++ b/kwin/kcmkwin/kwinrules/kwinsrc.cpp
@@ -1,4 +1,4 @@
-// Include some code from kwin core in order to avoid
+// Include some code from twin core in order to avoid
 // double implementation.
 
 #include "ruleslist.h"
diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp
index 4ed26a9e6..db3a9fc48 100644
--- a/kwin/kcmkwin/kwinrules/main.cpp
+++ b/kwin/kcmkwin/kwinrules/main.cpp
@@ -21,7 +21,7 @@
 #include <dcopclient.h>
 #include <kconfig.h>
 #include <klocale.h>
-#include <kwin.h>
+#include <twin.h>
 
 #include <X11/Xlib.h>
 #include <fixx11h.h>
@@ -34,7 +34,7 @@ namespace KWinInternal
 
 static void loadRules( TQValueList< Rules* >& rules )
     {
-    KConfig cfg( "kwinrulesrc", true );
+    KConfig cfg( "twinrulesrc", true );
     cfg.setGroup( "General" );
     int count = cfg.readNumEntry( "count" );
     for( int i = 1;
@@ -49,7 +49,7 @@ static void loadRules( TQValueList< Rules* >& rules )
 
 static void saveRules( const TQValueList< Rules* >& rules )
     {
-    KConfig cfg( "kwinrulesrc" );
+    KConfig cfg( "twinrulesrc" );
     TQStringList groups = cfg.groupList();
     for( TQStringList::ConstIterator it = groups.begin();
          it != groups.end();
@@ -258,7 +258,7 @@ static int edit( Window wid, bool whole_app )
     saveRules( rules );
     if( !kapp->dcopClient()->isAttached())
         kapp->dcopClient()->attach();
-    kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
+    kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
     return 0;
     }
     
@@ -275,8 +275,8 @@ static const KCmdLineOptions options[] =
 extern "C"
 KDE_EXPORT int kdemain( int argc, char* argv[] )
     {
-    KLocale::setMainCatalogue( "kcmkwinrules" );
-    KCmdLineArgs::init( argc, argv, "kwin_rules_dialog", I18N_NOOP( "KWin" ),
+    KLocale::setMainCatalogue( "kcmtwinrules" );
+    KCmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "KWin" ),
 	I18N_NOOP( "KWin helper utility" ), "1.0" );
     KCmdLineArgs::addCmdLineOptions( options );
     KApplication app;
diff --git a/kwin/kcmkwin/kwinrules/ruleslist.cpp b/kwin/kcmkwin/kwinrules/ruleslist.cpp
index e525e472f..29e02549d 100644
--- a/kwin/kcmkwin/kwinrules/ruleslist.cpp
+++ b/kwin/kcmkwin/kwinrules/ruleslist.cpp
@@ -150,7 +150,7 @@ void KCMRulesList::load()
          ++it )
         delete *it;
     rules.clear();
-    KConfig cfg( "kwinrulesrc", true );
+    KConfig cfg( "twinrulesrc", true );
     cfg.setGroup( "General" );
     int count = cfg.readNumEntry( "count" );
     rules.reserve( count );
@@ -171,7 +171,7 @@ void KCMRulesList::load()
 
 void KCMRulesList::save()
     {
-    KConfig cfg( "kwinrulesrc" );
+    KConfig cfg( "twinrulesrc" );
     TQStringList groups = cfg.groupList();
     for( TQStringList::ConstIterator it = groups.begin();
          it != groups.end();
diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
index 7a82a8149..cfe96458e 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <kpushbutton.h>
 #include <tqlabel.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <klocale.h>
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.h b/kwin/kcmkwin/kwinrules/ruleswidget.h
index b47ad88ab..2a9b0d036 100644
--- a/kwin/kcmkwin/kwinrules/ruleswidget.h
+++ b/kwin/kcmkwin/kwinrules/ruleswidget.h
@@ -21,7 +21,7 @@
 #define __RULESWIDGET_H__
 
 #include <kdialogbase.h>
-#include <kwin.h>
+#include <twin.h>
 #include <kshortcutdialog.h>
 
 #include "ruleswidgetbase.h"