7 files changed, 25 insertions, 25 deletions
diff --git a/kwin-styles/cde/CMakeLists.txt b/kwin-styles/cde/CMakeLists.txt
index ed7aa565..790ff84c 100644
--- a/kwin-styles/cde/CMakeLists.txt
+++ b/kwin-styles/cde/CMakeLists.txt
@@ -23,11 +23,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES cde.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES cde.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
-##### kwin3_cde ##################################
+##### twin3_cde ##################################
 
-tde_add_kpart( kwin3_cde AUTOMOC
+tde_add_kpart( twin3_cde AUTOMOC
   SOURCES cdeclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/cde/Makefile.am b/kwin-styles/cde/Makefile.am
index 6bf41213..129a22bc 100644
--- a/kwin-styles/cde/Makefile.am
+++ b/kwin-styles/cde/Makefile.am
@@ -3,16 +3,16 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = kwin3_cde.la
+kde_module_LTLIBRARIES = twin3_cde.la
 
-kwin3_cde_la_SOURCES = cdeclient.cpp
-kwin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin3_cde_la_LIBADD = -ltdecorations
+twin3_cde_la_SOURCES = cdeclient.cpp
+twin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin3_cde_la_LIBADD = -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = cdeclient.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 lnk_DATA = cde.desktop
 
 EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin-styles/cde/cde.desktop b/kwin-styles/cde/cde.desktop
index 410c666d..a5f1ac66 100644
--- a/kwin-styles/cde/cde.desktop
+++ b/kwin-styles/cde/cde.desktop
@@ -3,4 +3,4 @@ Name=CDE
 Name[af]=Cde
 Name[hi]=सीडीई
 Name[ne]=सीडीई
-X-KDE-Library=kwin3_cde
+X-KDE-Library=twin3_cde
diff --git a/kwin-styles/cde/cdeclient.cpp b/kwin-styles/cde/cdeclient.cpp
index d21f4770..03eb14fa 100644
--- a/kwin-styles/cde/cdeclient.cpp
+++ b/kwin-styles/cde/cdeclient.cpp
@@ -150,7 +150,7 @@ static int scaleCoord(int c)
 
 static void readConfig(CdeClientFactory *f)
 {
-    KConfig conf( "kwincderc" );
+    KConfig conf( "twincderc" );
 
     conf.setGroup("General");
     coloredFrame = conf.readBoolEntry( "UseTitleBarBorderColors", true );
diff --git a/kwin-styles/cde/config/CMakeLists.txt b/kwin-styles/cde/config/CMakeLists.txt
index 9064c2bd..5faec263 100644
--- a/kwin-styles/cde/config/CMakeLists.txt
+++ b/kwin-styles/cde/config/CMakeLists.txt
@@ -19,9 +19,9 @@ link_directories(
   ${TQT_LIBRARY_DIRS}
 )
 
-##### kwin_cde_config (module) ###################
+##### twin_cde_config (module) ###################
 
-tde_add_kpart( kwin_cde_config AUTOMOC
+tde_add_kpart( twin_cde_config AUTOMOC
   SOURCES config.cpp
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin-styles/cde/config/Makefile.am b/kwin-styles/cde/config/Makefile.am
index d5c6da85..3e5bd243 100644
--- a/kwin-styles/cde/config/Makefile.am
+++ b/kwin-styles/cde/config/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kwin_cde_config.la
+kde_module_LTLIBRARIES = twin_cde_config.la
 
-kwin_cde_config_la_SOURCES = config.cpp
-kwin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-kwin_cde_config_la_LIBADD  = $(LIB_TDEUI)
+twin_cde_config_la_SOURCES = config.cpp
+twin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_cde_config_la_LIBADD  = $(LIB_TDEUI)
 
 METASOURCES = AUTO
 noinst_HEADERS = config.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 
 
 ###KMAKE-start (don't edit or delete this block)
diff --git a/kwin-styles/cde/config/config.cpp b/kwin-styles/cde/config/config.cpp
index cf58377d..fcd2de42 100644
--- a/kwin-styles/cde/config/config.cpp
+++ b/kwin-styles/cde/config/config.cpp
@@ -13,18 +13,18 @@ extern "C" KDE_EXPORT TQObject* allocate_config( KConfig* conf, TQWidget* parent
 
 
 /* NOTE: 
- * 'conf' 	is a pointer to the kwindecoration modules open kwin config,
+ * 'conf' 	is a pointer to the twindecoration modules open twin config,
  *			and is by default set to the "Style" group.
  *
  * 'parent'	is the parent of the TQObject, which is a VBox inside the
- *			Configure tab in kwindecoration
+ *			Configure tab in twindecoration
  */
 
 CdeConfig::CdeConfig( KConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
-	cdeConfig = new KConfig("kwincderc");
-	KGlobal::locale()->insertCatalogue("kwin_art_clients");
+	cdeConfig = new KConfig("twincderc");
+	KGlobal::locale()->insertCatalogue("twin_art_clients");
 	
 	groupBox = new TQVBox( parent );
 	
@@ -57,7 +57,7 @@ CdeConfig::CdeConfig( KConfig* conf, TQWidget* parent )
 //	connect( cbTitlebarButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
 	connect( bgAlign, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotSelectionChanged(int)) );
 
-	// Make the widgets visible in kwindecoration
+	// Make the widgets visible in twindecoration
 	groupBox->show();
 }
 
@@ -80,8 +80,8 @@ void CdeConfig::slotSelectionChanged( int )
 	emit changed();
 }
 
-// Loads the configurable options from the kwinrc config file
-// It is passed the open config from kwindecoration to improve efficiency
+// Loads the configurable options from the twinrc config file
+// It is passed the open config from twindecoration to improve efficiency
 void CdeConfig::load( KConfig* /*conf*/ )
 {
 	cdeConfig->setGroup("General");
@@ -99,7 +99,7 @@ void CdeConfig::load( KConfig* /*conf*/ )
 }
 
 
-// Saves the configurable options to the kwinrc config file
+// Saves the configurable options to the twinrc config file
 void CdeConfig::save( KConfig* /*conf*/ )
 {
 	cdeConfig->setGroup("General");