diff --git a/Messages.sh b/Messages.sh
index 7e396daa78..19e414cade 100644
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,3 +1,3 @@
 #! /usr/bin/env bash
 $EXTRACTRC *.kcfg >> rc.cpp
-$XGETTEXT *.h *.cpp effects/*.cpp killer/*.cpp lib/*.cpp tabbox/*.cpp -o $podir/kwin.pot
+$XGETTEXT *.h *.cpp killer/*.cpp tabbox/*.cpp -o $podir/kwin.pot
diff --git a/libkdecorations/Messages.sh b/libkdecorations/Messages.sh
index 76249869c3..000f524ad5 100644
--- a/libkdecorations/Messages.sh
+++ b/libkdecorations/Messages.sh
@@ -1,2 +1,2 @@
 #! /usr/bin/env bash
-$XGETTEXT `find . -name \*.cpp` -o $podir/kwin_lib.pot
+$XGETTEXT `find . -name \*.cpp` -o $podir/libkdecorations.pot
diff --git a/libkdecorations/kdecoration_plugins_p.cpp b/libkdecorations/kdecoration_plugins_p.cpp
index 80c8187106..bd9e70b4fe 100644
--- a/libkdecorations/kdecoration_plugins_p.cpp
+++ b/libkdecorations/kdecoration_plugins_p.cpp
@@ -181,7 +181,7 @@ trydefaultlib:
     catalog.replace("kwin3_", "kwin_");
     KGlobal::locale()->insertCatalog(catalog);
     // For KCommonDecoration based clients
-    KGlobal::locale()->insertCatalog("kwin_lib");
+    KGlobal::locale()->insertCatalog("libkdecorations");
     // For clients in kdebase
     KGlobal::locale()->insertCatalog("kwin_clients");
     // For clients in kdeartwork
diff --git a/libkwineffects/Messages.sh b/libkwineffects/Messages.sh
index 76249869c3..48a4e6352d 100644
--- a/libkwineffects/Messages.sh
+++ b/libkwineffects/Messages.sh
@@ -1,2 +1,2 @@
 #! /usr/bin/env bash
-$XGETTEXT `find . -name \*.cpp` -o $podir/kwin_lib.pot
+$XGETTEXT `find . -name \*.cpp` -o $podir/libkwineffects.pot