7 files changed, 22 insertions, 22 deletions
diff --git a/kwin/clients/modernsystem/CMakeLists.txt b/kwin/clients/modernsystem/CMakeLists.txt
index 723ddffe1..62c2d766c 100644
--- a/kwin/clients/modernsystem/CMakeLists.txt
+++ b/kwin/clients/modernsystem/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_subdirectory( config )
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/kwin/lib
+  ${CMAKE_SOURCE_DIR}/twin/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -24,12 +24,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
 
-##### kwin3_modernsys (module) ##################
+##### twin3_modernsys (module) ##################
 
-tde_add_kpart( kwin3_modernsys
+tde_add_kpart( twin3_modernsys
   SOURCES modernsys.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/modernsystem/Makefile.am b/kwin/clients/modernsystem/Makefile.am
index 7850663ba..e4c21d7a3 100644
--- a/kwin/clients/modernsystem/Makefile.am
+++ b/kwin/clients/modernsystem/Makefile.am
@@ -3,16 +3,16 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = config
 
-kde_module_LTLIBRARIES = kwin3_modernsys.la
+kde_module_LTLIBRARIES = twin3_modernsys.la
 
-kwin3_modernsys_la_SOURCES = modernsys.cpp
-kwin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la
-kwin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_modernsys_la_SOURCES = modernsys.cpp
+twin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la
+twin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = modernsys.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 lnk_DATA = modernsystem.desktop
 
 EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin/clients/modernsystem/config/CMakeLists.txt b/kwin/clients/modernsystem/config/CMakeLists.txt
index e2468db33..8a6d6db43 100644
--- a/kwin/clients/modernsystem/config/CMakeLists.txt
+++ b/kwin/clients/modernsystem/config/CMakeLists.txt
@@ -20,9 +20,9 @@ link_directories(
 )
 
 
-##### kwin_modernsys_config (module) ############
+##### twin_modernsys_config (module) ############
 
-tde_add_kpart( kwin_modernsys_config AUTOMOC
+tde_add_kpart( twin_modernsys_config AUTOMOC
   SOURCES config.cpp
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/modernsystem/config/Makefile.am b/kwin/clients/modernsystem/config/Makefile.am
index 55a695684..aaae38b2a 100644
--- a/kwin/clients/modernsystem/config/Makefile.am
+++ b/kwin/clients/modernsystem/config/Makefile.am
@@ -1,14 +1,14 @@
 
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kwin_modernsys_config.la
+kde_module_LTLIBRARIES = twin_modernsys_config.la
 
-kwin_modernsys_config_la_SOURCES = config.cpp
-kwin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_modernsys_config_la_LIBADD = $(LIB_TDEUI)
+twin_modernsys_config_la_SOURCES = config.cpp
+twin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_modernsys_config_la_LIBADD = $(LIB_TDEUI)
 
 METASOURCES = AUTO
 noinst_HEADERS = config.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 
diff --git a/kwin/clients/modernsystem/config/config.cpp b/kwin/clients/modernsystem/config/config.cpp
index f5260ba7d..136ff3492 100644
--- a/kwin/clients/modernsystem/config/config.cpp
+++ b/kwin/clients/modernsystem/config/config.cpp
@@ -19,16 +19,16 @@ extern "C"
 }
 
 
-// '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
 
 ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent)
 {	
-	clientrc = new KConfig("kwinmodernsysrc");
-	KGlobal::locale()->insertCatalogue("kwin_clients");
+	clientrc = new KConfig("twinmodernsysrc");
+	KGlobal::locale()->insertCatalogue("twin_clients");
 	mainw = new TQWidget(parent);
 	vbox = new TQVBoxLayout(mainw);
 	vbox->setSpacing(6);
diff --git a/kwin/clients/modernsystem/modernsys.cpp b/kwin/clients/modernsystem/modernsys.cpp
index 30344d75c..b6e7cda01 100644
--- a/kwin/clients/modernsystem/modernsys.cpp
+++ b/kwin/clients/modernsystem/modernsys.cpp
@@ -217,7 +217,7 @@ void ModernSysFactory::read_config()
     bool showh;
     int hsize, hwidth, bwidth, theight;
 
-    KConfig c("kwinmodernsysrc");
+    KConfig c("twinmodernsysrc");
     c.setGroup("General");
     showh = c.readBoolEntry("ShowHandle", true);
 
diff --git a/kwin/clients/modernsystem/modernsystem.desktop b/kwin/clients/modernsystem/modernsystem.desktop
index d6247a390..994fd2860 100644
--- a/kwin/clients/modernsystem/modernsystem.desktop
+++ b/kwin/clients/modernsystem/modernsystem.desktop
@@ -66,4 +66,4 @@ Name[vi]=Hệ thống Hiện đại
 Name[wa]=Sistinme modiene
 Name[zh_CN]=现代系统
 Name[zh_TW]=現代系統
-X-KDE-Library=kwin3_modernsys
+X-KDE-Library=twin3_modernsys