diff --git a/clients/b2/Makefile.am b/clients/b2/Makefile.am
index 62b2878c7a..c59cb35213 100644
--- a/clients/b2/Makefile.am
+++ b/clients/b2/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = libkwinb2.la
+kde_module_LTLIBRARIES = kwin_b2.la
 
-libkwinb2_la_SOURCES = b2client.cpp
-libkwinb2_la_LIBADD = ../../kwin.la
-libkwinb2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_b2_la_SOURCES = b2client.cpp
+kwin_b2_la_LIBADD = ../../kwin.la
+kwin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = b2client.h
diff --git a/clients/b2/b2.desktop b/clients/b2/b2.desktop
index db17c018e1..e3e36ae03b 100644
--- a/clients/b2/b2.desktop
+++ b/clients/b2/b2.desktop
@@ -3,4 +3,4 @@ Encoding=UTF-8
 Name=B II
 Name[af]=b ii
 Name[xx]=xx
-X-KDE-Library=libkwinb2
+X-KDE-Library=kwin_b2
diff --git a/clients/b2/config/Makefile.am b/clients/b2/config/Makefile.am
index 60ddfc6542..c4b4cf38d2 100644
--- a/clients/b2/config/Makefile.am
+++ b/clients/b2/config/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = libkwinb2_config.la
+kde_module_LTLIBRARIES = kwin_b2_config.la
 
-libkwinb2_config_la_SOURCES = config.cpp
-libkwinb2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkwinb2_config_la_LIBADD = $(LIB_KDEUI)
+kwin_b2_config_la_SOURCES = config.cpp
+kwin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+kwin_b2_config_la_LIBADD = $(LIB_KDEUI)
 
 METASOURCES = AUTO
 noinst_HEADERS = config.h
@@ -12,7 +12,7 @@ noinst_HEADERS = config.h
 lnkdir = $(kde_datadir)/kwin/
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/libkwinb2_config.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kwin_b2_config.pot
 
 ###KMAKE-start (don't edit or delete this block)
 
diff --git a/clients/b2/config/config.cpp b/clients/b2/config/config.cpp
index 9c3a3aceca..7135b156dc 100644
--- a/clients/b2/config/config.cpp
+++ b/clients/b2/config/config.cpp
@@ -1,5 +1,5 @@
 /* 	
- * $Id:$
+ * $Id$
  *
  *	This file contains the B2 configuration widget
  *
@@ -35,7 +35,7 @@ B2Config::B2Config( KConfig* conf, QWidget* parent )
 	: QObject( parent )
 {
 	b2Config = new KConfig("kwinb2rc");
-	KGlobal::locale()->insertCatalogue("libkwinquartz_config");
+	KGlobal::locale()->insertCatalogue("kwinquartz_config");
 	gb = new QGroupBox( 1, Qt::Horizontal, 
 						i18n("Decoration Settings"), parent );
 	cbColorBorder = new QCheckBox( 
diff --git a/clients/default/Makefile.am b/clients/default/Makefile.am
index b330f4824e..bbb4cb52f3 100644
--- a/clients/default/Makefile.am
+++ b/clients/default/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = libkwindefault.la
+kde_module_LTLIBRARIES = kwin_default.la
 
-libkwindefault_la_SOURCES = kdedefault.cpp
-libkwindefault_la_LIBADD = ../../kwin.la
-libkwindefault_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_default_la_SOURCES = kdedefault.cpp
+kwin_default_la_LIBADD = ../../kwin.la
+kwin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = kdedefault.h
diff --git a/clients/default/config/Makefile.am b/clients/default/config/Makefile.am
index c0de6771fe..3b38e59aa2 100644
--- a/clients/default/config/Makefile.am
+++ b/clients/default/config/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = libkwindefault_config.la
+kde_module_LTLIBRARIES = kwin_default_config.la
 
-libkwindefault_config_la_SOURCES = config.cpp
-libkwindefault_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkwindefault_config_la_LIBADD = $(LIB_KDEUI)
+kwin_default_config_la_SOURCES = config.cpp
+kwin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+kwin_default_config_la_LIBADD = $(LIB_KDEUI)
 
 METASOURCES = AUTO
 noinst_HEADERS = config.h
@@ -12,7 +12,7 @@ noinst_HEADERS = config.h
 lnkdir = $(kde_datadir)/kwin/
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/libkwindefault_config.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kwindefault_config.pot
 
 ###KMAKE-start (don't edit or delete this block)
 
diff --git a/clients/default/config/config.cpp b/clients/default/config/config.cpp
index 8cd1bdc6e3..063326eaf7 100644
--- a/clients/default/config/config.cpp
+++ b/clients/default/config/config.cpp
@@ -31,7 +31,7 @@ extern "C"
 KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, QWidget* parent )
 	: QObject( parent )
 {
-	KGlobal::locale()->insertCatalogue("libkwindefault_config");
+	KGlobal::locale()->insertCatalogue("kwin_default_config");
 	highcolor = QPixmap::defaultDepth() > 8;
 	gb = new QGroupBox( 1, Qt::Horizontal, 
 		i18n("Decoration Settings"), parent );
diff --git a/clients/icewm/Makefile.am b/clients/icewm/Makefile.am
index 85d8321578..47b108c2a0 100644
--- a/clients/icewm/Makefile.am
+++ b/clients/icewm/Makefile.am
@@ -2,11 +2,11 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . config icewm-themes
 
-kde_module_LTLIBRARIES = libkwinicewm.la
+kde_module_LTLIBRARIES = kwin_icewm.la
 
-libkwinicewm_la_SOURCES = icewm.cpp 
-libkwinicewm_la_LIBADD = ../../kwin.la
-libkwinicewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_icewm_la_SOURCES = icewm.cpp 
+kwin_icewm_la_LIBADD = ../../kwin.la
+kwin_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = icewm.h
diff --git a/clients/icewm/config/Makefile.am b/clients/icewm/config/Makefile.am
index 51a844e0af..a2bf1952e7 100644
--- a/clients/icewm/config/Makefile.am
+++ b/clients/icewm/config/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = libkwinicewm_config.la
+kde_module_LTLIBRARIES = kwin_icewm_config.la
 
-libkwinicewm_config_la_SOURCES = config.cpp
-libkwinicewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkwinicewm_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
+kwin_icewm_config_la_SOURCES = config.cpp
+kwin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+kwin_icewm_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) 
 
 METASOURCES = AUTO
 noinst_HEADERS = config.h
@@ -12,7 +12,7 @@ noinst_HEADERS = config.h
 lnkdir = $(kde_datadir)/kwin/
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/libkwinicewm_config.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kwinicewm_config.pot
 
 ###KMAKE-start (don't edit or delete this block)
 
diff --git a/clients/icewm/config/config.cpp b/clients/icewm/config/config.cpp
index bae62a146e..6fd03f5bae 100644
--- a/clients/icewm/config/config.cpp
+++ b/clients/icewm/config/config.cpp
@@ -57,7 +57,7 @@ IceWMConfig::IceWMConfig( KConfig* conf, QWidget* parent )
 	: QObject( parent )
 {
 	icewmConfig = new KConfig("kwinicewmrc");
-	KGlobal::locale()->insertCatalogue("libkwinicewm_config");
+	KGlobal::locale()->insertCatalogue("kwin_icewm_config");
 
 	gb1 = new QGroupBox( 1, Qt::Horizontal, 
 				i18n("IceWM Theme Selector"), parent );
diff --git a/clients/icewm/icewm.desktop b/clients/icewm/icewm.desktop
index 11ea1fcb16..97e32a2c19 100644
--- a/clients/icewm/icewm.desktop
+++ b/clients/icewm/icewm.desktop
@@ -5,4 +5,4 @@ Name[af]=icewm
 Name[xh]=UmkhenkceWM
 Name[xx]=xx
 Name[zu]=Iqhwa leWM
-X-KDE-Library=libkwinicewm
+X-KDE-Library=kwin_icewm
diff --git a/clients/kde1/Makefile.am b/clients/kde1/Makefile.am
index 45105bfa0f..6fcb9f85b5 100644
--- a/clients/kde1/Makefile.am
+++ b/clients/kde1/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = $(all_includes) 
 
-kde_module_LTLIBRARIES = libkwinkde1.la
+kde_module_LTLIBRARIES = kwin_kde1.la
 
-libkwinkde1_la_SOURCES = kde1client.cpp
-libkwinkde1_la_LIBADD = ../../kwin.la
-libkwinkde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_kde1_la_SOURCES = kde1client.cpp
+kwin_kde1_la_LIBADD = ../../kwin.la
+kwin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = kde1client.h
diff --git a/clients/kde1/kde1.desktop b/clients/kde1/kde1.desktop
index d2fb2921bc..94b5364408 100644
--- a/clients/kde1/kde1.desktop
+++ b/clients/kde1/kde1.desktop
@@ -3,4 +3,4 @@ Encoding=UTF-8
 Name=KDE 1
 Name[af]=kde 1
 Name[xx]=xx
-X-KDE-Library=libkwinkde1
+X-KDE-Library=kwin_kde1
diff --git a/clients/kstep/Makefile.am b/clients/kstep/Makefile.am
index 970e90ced2..3662363e4e 100644
--- a/clients/kstep/Makefile.am
+++ b/clients/kstep/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = $(all_includes) 
 
-kde_module_LTLIBRARIES = libkwinkstep.la
+kde_module_LTLIBRARIES = kwin_kstep.la
 
-libkwinkstep_la_SOURCES = nextclient.cpp
-libkwinkstep_la_LIBADD = ../../kwin.la
-libkwinkstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_kstep_la_SOURCES = nextclient.cpp
+kwin_kstep_la_LIBADD = ../../kwin.la
+kwin_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = nextclient.h
diff --git a/clients/kstep/kstep.desktop b/clients/kstep/kstep.desktop
index 0a22cdff5b..3257aa15e6 100644
--- a/clients/kstep/kstep.desktop
+++ b/clients/kstep/kstep.desktop
@@ -3,11 +3,10 @@ Encoding=UTF-8
 Name=KStep
 Name[af]=kstep
 Name[eo]=Step
-Name[fr]=kStep
 Name[mi]=KHïkoi
 Name[nb]=KSteg
 Name[sv]=Kstep
 Name[xh]=Inqwanqwa le K
 Name[xx]=xx
 Name[zu]=Izinga le K
-X-KDE-Library=libkwinkstep
+X-KDE-Library=kwin_kstep
diff --git a/clients/kwmtheme/Makefile.am b/clients/kwmtheme/Makefile.am
index 8ea3d19975..323b0327c4 100644
--- a/clients/kwmtheme/Makefile.am
+++ b/clients/kwmtheme/Makefile.am
@@ -1,11 +1,11 @@
 SUBDIRS=cli_installer
 INCLUDES = $(all_includes) 
 
-kde_module_LTLIBRARIES = libkwinkwmtheme.la
+kde_module_LTLIBRARIES = kwin_kwmtheme.la
 
-libkwinkwmtheme_la_SOURCES = kwmthemeclient.cpp
-libkwinkwmtheme_la_LIBADD = ../../kwin.la
-libkwinkwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_kwmtheme_la_SOURCES = kwmthemeclient.cpp
+kwin_kwmtheme_la_LIBADD = ../../kwin.la
+kwin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = kwmthemeclient.h
diff --git a/clients/kwmtheme/kwmtheme.desktop b/clients/kwmtheme/kwmtheme.desktop
index 835155851b..83b1e37b4b 100644
--- a/clients/kwmtheme/kwmtheme.desktop
+++ b/clients/kwmtheme/kwmtheme.desktop
@@ -4,6 +4,7 @@ Name=KWM Theme
 Name[af]=kwm tema
 Name[ar]=تيمة KWM
 Name[az]=KWM Örtüsü
+Name[be]=Тэма KWM
 Name[bg]=Тема KWM
 Name[br]=Gwiskad KWM
 Name[bs]=KWM Tema
@@ -17,7 +18,7 @@ Name[es]=Tema de KWM
 Name[et]=KWM teema
 Name[eu]=KWM Tema
 Name[fi]=KWM-teema
-Name[fr]=Thème kWM
+Name[fr]=Thème KWM
 Name[gl]=Tema do KWM
 Name[hr]=KWM Tema
 Name[hu]=KWM téma
@@ -26,7 +27,7 @@ Name[is]=KWM þema
 Name[it]=Tema KWM
 Name[ja]=KWM テーマ
 Name[ko]=KWM 테마
-Name[lt]=KWM Tema
+Name[lt]=KWM tema
 Name[lv]=KWM Tēma
 Name[mi]=Kaupapa KWM
 Name[mk]=KWM тема
@@ -38,6 +39,7 @@ Name[oc]=Tema KWM
 Name[pl]=Motyw KWM
 Name[pt]=Tema KWM
 Name[pt_BR]=Tema KWM
+Name[ro]=Tematică KWM
 Name[ru]=Стиль KWM
 Name[sk]=Téma KWM
 Name[sl]=Tema KWM
@@ -51,4 +53,4 @@ Name[xx]=xx
 Name[zh_CN]=KWM 主题
 Name[zh_TW]=KWM 主題
 Name[zu]=Isigaba bizo se KWM
-X-KDE-Library=libkwinkwmtheme
+X-KDE-Library=kwin_kwmtheme
diff --git a/clients/laptop/Makefile.am b/clients/laptop/Makefile.am
index 624de53472..2694f30b4b 100644
--- a/clients/laptop/Makefile.am
+++ b/clients/laptop/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = libkwinlaptop.la
+kde_module_LTLIBRARIES = kwin_laptop.la
 
-libkwinlaptop_la_SOURCES = laptopclient.cpp
-libkwinlaptop_la_LIBADD = ../../kwin.la
-libkwinlaptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_laptop_la_SOURCES = laptopclient.cpp
+kwin_laptop_la_LIBADD = ../../kwin.la
+kwin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = laptopclient.h
diff --git a/clients/laptop/laptop.desktop b/clients/laptop/laptop.desktop
index f66196d6df..0f54763b7c 100644
--- a/clients/laptop/laptop.desktop
+++ b/clients/laptop/laptop.desktop
@@ -33,4 +33,4 @@ Name[xx]=xx
 Name[zh_CN]=膝上计算机
 Name[zh_TW]=膝上型的電腦
 Name[zu]=Ikhomputha elucezu
-X-KDE-Library=libkwinlaptop
+X-KDE-Library=kwin_laptop
diff --git a/clients/modernsystem/Makefile.am b/clients/modernsystem/Makefile.am
index e2a68e57da..b700291ab9 100644
--- a/clients/modernsystem/Makefile.am
+++ b/clients/modernsystem/Makefile.am
@@ -4,11 +4,11 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = config
 
-kde_module_LTLIBRARIES = libkwinmodernsys.la
+kde_module_LTLIBRARIES = kwin_modernsys.la
 
-libkwinmodernsys_la_SOURCES = modernsys.cpp
-libkwinmodernsys_la_LIBADD = ../../kwin.la
-libkwinmodernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_modernsys_la_SOURCES = modernsys.cpp
+kwin_modernsys_la_LIBADD = ../../kwin.la
+kwin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = modernsys.h
diff --git a/clients/modernsystem/config/Makefile.am b/clients/modernsystem/config/Makefile.am
index 274abcb7de..42353a5ee6 100644
--- a/clients/modernsystem/config/Makefile.am
+++ b/clients/modernsystem/config/Makefile.am
@@ -2,11 +2,11 @@
 
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = libkwinmodernsys_config.la
+kde_module_LTLIBRARIES = kwin_modernsys_config.la
 
-libkwinmodernsys_config_la_SOURCES = config.cpp
-libkwinmodernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkwinmodernsys_config_la_LIBADD = $(LIB_KDEUI)
+kwin_modernsys_config_la_SOURCES = config.cpp
+kwin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+kwin_modernsys_config_la_LIBADD = $(LIB_KDEUI)
 
 METASOURCES = AUTO
 noinst_HEADERS = config.h
@@ -14,4 +14,4 @@ noinst_HEADERS = config.h
 lnkdir = $(kde_datadir)/kwin/
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/libkwinmodernsys_config.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kwinmodernsys_config.pot
diff --git a/clients/modernsystem/config/config.cpp b/clients/modernsystem/config/config.cpp
index 54fa36357b..a7b00c711d 100644
--- a/clients/modernsystem/config/config.cpp
+++ b/clients/modernsystem/config/config.cpp
@@ -26,7 +26,7 @@ extern "C"
 ModernSysConfig::ModernSysConfig(KConfig* conf, QWidget* parent) : QObject(parent)
 {	
 	clientrc = new KConfig("kwinmodernsysrc");
-	KGlobal::locale()->insertCatalogue("libkwinmodernsys_config");
+	KGlobal::locale()->insertCatalogue("kwin_modernsys_config");
 	mainw = new QWidget(parent);
 	vbox = new QVBoxLayout(mainw);
 	vbox->setSpacing(6);
diff --git a/clients/modernsystem/modernsystem.desktop b/clients/modernsystem/modernsystem.desktop
index 26e7cafe4a..f12ae961c1 100644
--- a/clients/modernsystem/modernsystem.desktop
+++ b/clients/modernsystem/modernsystem.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=ModSystem 
-X-KDE-Library=libkwinmodernsys
+X-KDE-Library=kwin_modernsys
diff --git a/clients/quartz/Makefile.am b/clients/quartz/Makefile.am
index 5394148651..b02fb77958 100644
--- a/clients/quartz/Makefile.am
+++ b/clients/quartz/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = libkwinquartz.la
+kde_module_LTLIBRARIES = kwin_quartz.la
 
-libkwinquartz_la_SOURCES = quartz.cpp
-libkwinquartz_la_LIBADD = ../../kwin.la
-libkwinquartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_quartz_la_SOURCES = quartz.cpp
+kwin_quartz_la_LIBADD = ../../kwin.la
+kwin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = quartz.h
diff --git a/clients/quartz/config/Makefile.am b/clients/quartz/config/Makefile.am
index f0a2c673de..1be4ee8774 100644
--- a/clients/quartz/config/Makefile.am
+++ b/clients/quartz/config/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = libkwinquartz_config.la
+kde_module_LTLIBRARIES = kwin_quartz_config.la
 
-libkwinquartz_config_la_SOURCES = config.cpp
-libkwinquartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkwinquartz_config_la_LIBADD = $(LIB_KDEUI)
+kwin_quartz_config_la_SOURCES = config.cpp
+kwin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+kwin_quartz_config_la_LIBADD = $(LIB_KDEUI)
 
 METASOURCES = AUTO
 noinst_HEADERS = config.h
@@ -12,7 +12,7 @@ noinst_HEADERS = config.h
 lnkdir = $(kde_datadir)/kwin/
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/libkwinquartz_config.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kwin_quartz_config.pot
 
 ###KMAKE-start (don't edit or delete this block)
 
diff --git a/clients/quartz/config/config.cpp b/clients/quartz/config/config.cpp
index 6173516910..495320411b 100644
--- a/clients/quartz/config/config.cpp
+++ b/clients/quartz/config/config.cpp
@@ -35,7 +35,7 @@ QuartzConfig::QuartzConfig( KConfig* conf, QWidget* parent )
 	: QObject( parent )
 {
 	quartzConfig = new KConfig("kwinquartzrc");
-	KGlobal::locale()->insertCatalogue("libkwinquartz_config");
+	KGlobal::locale()->insertCatalogue("kwin_quartz_config");
 	gb = new QGroupBox( 1, Qt::Horizontal, 
 						i18n("Decoration Settings"), parent );
 	cbColorBorder = new QCheckBox( 
diff --git a/clients/quartz/quartz.desktop b/clients/quartz/quartz.desktop
index 544781fb59..644022f44c 100644
--- a/clients/quartz/quartz.desktop
+++ b/clients/quartz/quartz.desktop
@@ -12,6 +12,7 @@ Name[lv]=Kvarcs
 Name[mt]=Kwartz
 Name[pl]=Kwarc
 Name[pt_BR]=Quartzo
+Name[ro]=Cuarţ
 Name[ru]=Кварц
 Name[tr]=Kuartz
 Name[uk]=Кварц
@@ -20,4 +21,4 @@ Name[xx]=xx
 Name[zh_CN]=水晶
 Name[zh_TW]=石英
 Name[zu]=Iminerali embiwa emayini ephethe isilika
-X-KDE-Library=libkwinquartz
+X-KDE-Library=kwin_quartz
diff --git a/clients/redmond/Makefile.am b/clients/redmond/Makefile.am
index 2c85528f41..20f9b197ea 100644
--- a/clients/redmond/Makefile.am
+++ b/clients/redmond/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = libkwinredmond.la
+kde_module_LTLIBRARIES = kwin_redmond.la
 
-libkwinredmond_la_SOURCES = redmond.cpp
-libkwinredmond_la_LIBADD = ../../kwin.la
-libkwinredmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_redmond_la_SOURCES = redmond.cpp
+kwin_redmond_la_LIBADD = ../../kwin.la
+kwin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = redmond.h
diff --git a/clients/redmond/redmond.desktop b/clients/redmond/redmond.desktop
index 64ec506393..07faf7f057 100644
--- a/clients/redmond/redmond.desktop
+++ b/clients/redmond/redmond.desktop
@@ -9,4 +9,4 @@ Name[pt_BR]=Demônio
 Name[xh]=iRedmond
 Name[xx]=xx
 Name[zu]=I Redmond
-X-KDE-Library=libkwinredmond
+X-KDE-Library=kwin_redmond
diff --git a/clients/riscos/Makefile.am b/clients/riscos/Makefile.am
index 09ac0b1d1d..ece1945bd7 100644
--- a/clients/riscos/Makefile.am
+++ b/clients/riscos/Makefile.am
@@ -1,8 +1,8 @@
 INCLUDES = $(all_includes) 
 
-kde_module_LTLIBRARIES = libkwinriscos.la
+kde_module_LTLIBRARIES = kwin_riscos.la
 
-libkwinriscos_la_SOURCES = \
+kwin_riscos_la_SOURCES = \
 Button.cpp \
 CloseButton.cpp \
 IconifyButton.cpp \
@@ -12,8 +12,8 @@ MaximiseButton.cpp \
 StickyButton.cpp \
 HelpButton.cpp \
 Static.cpp
-libkwinriscos_la_LIBADD = ../../kwin.la
-libkwinriscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_riscos_la_LIBADD = ../../kwin.la
+kwin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = \
diff --git a/clients/riscos/riscos.desktop b/clients/riscos/riscos.desktop
index 6821bf6c1d..395324b568 100644
--- a/clients/riscos/riscos.desktop
+++ b/clients/riscos/riscos.desktop
@@ -2,6 +2,7 @@
 Encoding=UTF-8
 Name=RISC OS
 Name[af]=risc os
+Name[be]=RISC АС
 Name[cs]=Risc OS
 Name[da]=Risc OS
 Name[de]=RISC-OS
@@ -13,4 +14,4 @@ Name[uk]=RISC ОС
 Name[xh]=i RISC OS
 Name[xx]=xx
 Name[zu]=IRISC OS
-X-KDE-Library=libkwinriscos
+X-KDE-Library=kwin_riscos
diff --git a/clients/system/Makefile.am b/clients/system/Makefile.am
index 21d3f1e107..ae188fb25e 100644
--- a/clients/system/Makefile.am
+++ b/clients/system/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = libkwinsystem.la
+kde_module_LTLIBRARIES = kwin_system.la
 
-libkwinsystem_la_SOURCES = systemclient.cpp
-libkwinsystem_la_LIBADD = ../../kwin.la
-libkwinsystem_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+kwin_system_la_SOURCES = systemclient.cpp
+kwin_system_la_LIBADD = ../../kwin.la
+kwin_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = systemclient.h
diff --git a/clients/system/system.desktop b/clients/system/system.desktop
index 27e38453ee..1027755a8d 100644
--- a/clients/system/system.desktop
+++ b/clients/system/system.desktop
@@ -23,4 +23,4 @@ Name[tr]=Sistem++
 Name[xh]=Indlela esetyenziswayo++
 Name[xx]=xx
 Name[zu]=Indlela esetshenziswayo++
-X-KDE-Library=libkwinsystem
+X-KDE-Library=kwin_system
diff --git a/clients/web/Makefile.am b/clients/web/Makefile.am
index 64d819207e..fd0b3ea72e 100644
--- a/clients/web/Makefile.am
+++ b/clients/web/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES                  = -I$(top_srcdir) $(all_includes)
-kde_module_LTLIBRARIES    = libkwinweb.la
+kde_module_LTLIBRARIES    = kwin_web.la
 
-libkwinweb_la_SOURCES     = \
+kwin_web_la_SOURCES     = \
   Web.cpp \
   WebButton.cpp \
   WebButtonClose.cpp \
@@ -21,8 +21,8 @@ noinst_HEADERS            = \
   WebButtonMaximize.h \
   WebButtonSticky.h
 
-libkwinweb_la_LIBADD      = ../../kwin.la
-libkwinweb_la_LDFLAGS     = $(all_libraries) $(KDE_PLUGIN)
+kwin_web_la_LIBADD      = ../../kwin.la
+kwin_web_la_LDFLAGS     = $(all_libraries) $(KDE_PLUGIN) -module
 METASOURCES               = AUTO
 
 linkdir                   = $(kde_datadir)/kwin/
diff --git a/clients/web/web.desktop b/clients/web/web.desktop
index 0bd9260db6..06e43494cc 100644
--- a/clients/web/web.desktop
+++ b/clients/web/web.desktop
@@ -18,4 +18,4 @@ Name[uk]=Тенета
 Name[xh]=iWeb
 Name[xx]=xx
 Name[zu]=I Web
-X-KDE-Library=libkwinweb
+X-KDE-Library=kwin_web
diff --git a/kcmkwin/kwindecoration/Makefile.am b/kcmkwin/kwindecoration/Makefile.am
index 331f909dfd..1a6e20bded 100644
--- a/kcmkwin/kwindecoration/Makefile.am
+++ b/kcmkwin/kwindecoration/Makefile.am
@@ -1,14 +1,14 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = libkcm_kwindecoration.la
+kde_module_LTLIBRARIES = kcm_kwindecoration.la
 
-libkcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel
+kcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel
 noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h
 
-libkcm_kwindecoration_la_LDFLAGS = \
+kcm_kwindecoration_la_LDFLAGS = \
   -module -avoid-version $(all_libraries) -no-undefined
 
-libkcm_kwindecoration_la_LIBADD = $(LIB_KDEUI)
+kcm_kwindecoration_la_LIBADD = $(LIB_KDEUI)
 
 METASOURCES = AUTO
 
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index e1e73a77a5..ef5ffdb6c3 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -246,7 +246,7 @@ QString KWinDecorationModule::decorationLibName( const QString& name )
 		}
 
 	if (libName.isEmpty())
-		libName = "libkwindefault";
+		libName = "kwin_default";
 
 	return libName;
 }
@@ -256,8 +256,8 @@ QString KWinDecorationModule::decorationLibName( const QString& name )
 // pluginPage, allowing for dynamic configuration of decorations
 void KWinDecorationModule::resetPlugin( KConfig* conf, const QString* currentDecoName )
 {
-	// Config names are "libkwinicewm_config"
-	// for "libkwinicewm" kwin client
+	// Config names are "kwin_icewm_config"
+	// for "kwin_icewm" kwin client
 
 	QString oldName = oldLibraryName;
 	oldName += "_config";
@@ -330,7 +330,7 @@ void KWinDecorationModule::readConfig( KConfig* conf )
 	// the current plugin library name
 
 	oldLibraryName = currentLibraryName;
-	currentLibraryName = conf->readEntry("PluginLib", "libkwindefault");
+	currentLibraryName = conf->readEntry("PluginLib", "kwin_default");
 	QString decoName = decorationName( currentLibraryName );
 
 	// If we are using the "default" kde client, use the "default" entry.
diff --git a/kcmkwin/kwinoptions/Makefile.am b/kcmkwin/kwinoptions/Makefile.am
index d63cef86a2..d1d144b4bd 100644
--- a/kcmkwin/kwinoptions/Makefile.am
+++ b/kcmkwin/kwinoptions/Makefile.am
@@ -4,11 +4,11 @@
 METASOURCES = AUTO
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = libkcm_kwinoptions.la 
+kde_module_LTLIBRARIES = kcm_kwinoptions.la 
 
-libkcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp
-libkcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-libkcm_kwinoptions_la_LIBADD = $(LIB_KDEUI)
+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_KDEUI)
 
 noinst_HEADERS = windows.h mouse.h main.h
 
diff --git a/plugins.cpp b/plugins.cpp
index a608388a5b..7d2f254c67 100644
--- a/plugins.cpp
+++ b/plugins.cpp
@@ -25,7 +25,7 @@ Copyright (C) 1999, 2000    Daniel M. Duley <mosfet@kde.org>
 
 using namespace KWinInternal;
 
-const char* defaultPlugin = "libkwindefault";
+const char* defaultPlugin = "kwin_default";
 
 
 PluginMgr::PluginMgr()