diff --git a/doc/windowbehaviour/index.docbook b/doc/windowbehaviour/index.docbook
index ed94ca8a20..75060404f7 100644
--- a/doc/windowbehaviour/index.docbook
+++ b/doc/windowbehaviour/index.docbook
@@ -642,11 +642,11 @@ the spinbox to configure the delay un-shading.
 <varlistentry>
 <term><guilabel>Placement</guilabel></term>
 <listitem><para>The placement policy determines where a new window will appear
-on the desktop.  <guilabel>Smart</guilabel> will try to achieve a minimum
-overlap of windows, <guilabel>Cascade</guilabel> will cascade the
+on the desktop.  <guilabel>Minimal Overlapping</guilabel> will try to achieve a minimum
+overlap of windows, <guilabel>Cascaded</guilabel> will cascade the
 windows, and <guilabel>Random</guilabel> will use a random
 position.  <guilabel>Centered</guilabel> will open all new windows in
-the center of the screen, and <guilabel>Zero-Cornered</guilabel> will
+the center of the screen, and <guilabel>In Top-Left Corner</guilabel> will
 open all windows with their top left corner in the top left corner of
 the screen.</para></listitem>
 </varlistentry>
diff --git a/doc/windowspecific/index.docbook b/doc/windowspecific/index.docbook
index ed117f92db..dac04f5854 100644
--- a/doc/windowspecific/index.docbook
+++ b/doc/windowspecific/index.docbook
@@ -338,12 +338,12 @@ and <guibutton>Move Down</guibutton> buttons effects on how they are applied.</p
 <itemizedlist>
 <listitem><para><guilabel>Default</guilabel> - use the global window placement strategy.</para></listitem>
 <listitem><para><guilabel>No Placement</guilabel> - top-left corner.</para></listitem>
-<listitem><para><guilabel>Smart</guilabel> - place where no other window exists.</para></listitem>
-<listitem><para><guilabel>Maximizing</guilabel> - start the window maximized.</para></listitem>
-<listitem><para><guilabel>Cascade</guilabel> - staircase-by-title.</para></listitem>
+<listitem><para><guilabel>Minimal Overlapping</guilabel> - place where no other window exists.</para></listitem>
+<listitem><para><guilabel>Maximized</guilabel> - start the window maximized.</para></listitem>
+<listitem><para><guilabel>Cascaded</guilabel> - staircase-by-title.</para></listitem>
 <listitem><para><guilabel>Centered</guilabel> - center of the desktop.</para></listitem>
 <listitem><para><guilabel>Random</guilabel></para></listitem>
-<listitem><para><guilabel>Top-Left Corner</guilabel></para></listitem>
+<listitem><para><guilabel>In Top-Left Corner</guilabel></para></listitem>
 <listitem><para><guilabel>Under Mouse</guilabel></para></listitem>
 <listitem><para><guilabel>On Main Window</guilabel> - restrict placement of a child window to the boundaries of the parent window.</para></listitem>
 </itemizedlist>
diff --git a/kcmkwin/kwinoptions/advanced.ui b/kcmkwin/kwinoptions/advanced.ui
index 200b36d5b1..9d9211084b 100644
--- a/kcmkwin/kwinoptions/advanced.ui
+++ b/kcmkwin/kwinoptions/advanced.ui
@@ -77,17 +77,17 @@
      </property>
      <item>
       <property name="text">
-       <string>Smart</string>
+       <string>Minimal Overlapping</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>Maximizing</string>
+       <string>Maximized</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>Cascade</string>
+       <string>Cascaded</string>
       </property>
      </item>
      <item>
@@ -102,7 +102,7 @@
      </item>
      <item>
       <property name="text">
-       <string>Zero-cornered</string>
+       <string>In Top-Left Corner</string>
       </property>
      </item>
      <item>
diff --git a/kcmkwin/kwinrules/ruleswidgetbase.ui b/kcmkwin/kwinrules/ruleswidgetbase.ui
index 689b3701bd..e7670a925a 100644
--- a/kcmkwin/kwinrules/ruleswidgetbase.ui
+++ b/kcmkwin/kwinrules/ruleswidgetbase.ui
@@ -1063,17 +1063,17 @@
          </item>
          <item>
           <property name="text">
-           <string>Smart</string>
+           <string>Minimal Overlapping</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Maximizing</string>
+           <string>Maximized</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Cascade</string>
+           <string>Cascaded</string>
           </property>
          </item>
          <item>
@@ -1088,7 +1088,7 @@
          </item>
          <item>
           <property name="text">
-           <string>Top-Left Corner</string>
+           <string>In Top-Left Corner</string>
           </property>
          </item>
          <item>