diff --git a/kiosktool/kiosk_data.xml b/kiosktool/kiosk_data.xml
index 0f25d4e..194df61 100644
--- a/kiosktool/kiosk_data.xml
+++ b/kiosktool/kiosk_data.xml
@@ -7,7 +7,7 @@
       Generic restrictions
     </description>
     <actions>
-       <action type="action restriction" key="action/kwin_rmb">
+       <action type="action restriction" key="action/twin_rmb">
          <caption>Disable Window Manager context menu (Alt-F3)</caption>
          <description>
            The Window Manager context menu is normally shown when Alt-F3 is pressed
@@ -249,7 +249,7 @@
     <preview binary="kdesktop" dcop="kdesktop" options="restart">
     </preview>
 -->
-    <setup binary="kcmshell" args="kde-style.desktop,kde-colors.desktop,kde-fonts.desktop,kde-kwindecoration.desktop">
+    <setup binary="kcmshell" args="kde-style.desktop,kde-colors.desktop,kde-fonts.desktop,kde-twindecoration.desktop">
        <mutable file="kdesktoprc" />
        <mutable file="kdeglobals" />
     </setup>
@@ -272,7 +272,7 @@
            When the Font settings are locked down the user can no longer change them.
          </description>
        </action>
-       <action type="module" key="kde-kwindecoration.desktop">
+       <action type="module" key="kde-twindecoration.desktop">
          <caption>Lock down Window Decoration Settings</caption>
          <description>
            When the Window Decoration settings are locked down the user can no longer change them.
diff --git a/po/lt/kiosktool.po b/po/lt/kiosktool.po
index b80ce25..b5097b7 100644
--- a/po/lt/kiosktool.po
+++ b/po/lt/kiosktool.po
@@ -82,13 +82,13 @@ msgstr ""
 "Donatas Glodenis\n"
 "#-#-#-#-#  ksmserver.po (ksmserver)  #-#-#-#-#\n"
 "Ričardas Čepas, Donatas Glodenis\n"
-"#-#-#-#-#  kwin.po (kwin)  #-#-#-#-#\n"
+"#-#-#-#-#  twin.po (twin)  #-#-#-#-#\n"
 "Ričardas Čepas, Donatas Glodenis\n"
 "#-#-#-#-#  kcmaccessibility.po (kcmaccessibility)  #-#-#-#-#\n"
 "Donatas Glodenis\n"
 "#-#-#-#-#  kdepasswd.po (kdepasswd)  #-#-#-#-#\n"
 "Donatas Glodenis\n"
-"#-#-#-#-#  kcmkwinrules.po (kcmkwinrules)  #-#-#-#-#\n"
+"#-#-#-#-#  kcmtwinrules.po (kcmtwinrules)  #-#-#-#-#\n"
 "Donatas Glodenis\n"
 "#-#-#-#-#  keduca.po (keduca)  #-#-#-#-#\n"
 "Eugenijus Paulauskas\n"
@@ -299,13 +299,13 @@ msgstr ""
 "ziogelis77@takas.lt\n"
 "#-#-#-#-#  ksmserver.po (ksmserver)  #-#-#-#-#\n"
 "rch@richard.eu.org, ziogelis77@takas.lt\n"
-"#-#-#-#-#  kwin.po (kwin)  #-#-#-#-#\n"
+"#-#-#-#-#  twin.po (twin)  #-#-#-#-#\n"
 "rch@richard.eu.org, ziogelis77@takas.lt\n"
 "#-#-#-#-#  kcmaccessibility.po (kcmaccessibility)  #-#-#-#-#\n"
 "ziogelis77@takas.lt\n"
 "#-#-#-#-#  kdepasswd.po (kdepasswd)  #-#-#-#-#\n"
 "ziogelis77@takas.lt\n"
-"#-#-#-#-#  kcmkwinrules.po (kcmkwinrules)  #-#-#-#-#\n"
+"#-#-#-#-#  kcmtwinrules.po (kcmtwinrules)  #-#-#-#-#\n"
 "ziogelis77@takas.lt\n"
 "#-#-#-#-#  keduca.po (keduca)  #-#-#-#-#\n"
 "eugenijus@agvila.lt\n"