diff --git a/doc/windowbehaviour/index.docbook b/doc/windowbehaviour/index.docbook
--- a/doc/windowbehaviour/index.docbook
+++ b/doc/windowbehaviour/index.docbook
@@ -656,11 +656,11 @@
 <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
+on the desktop.  <guilabel>Avoid Overlapping</guilabel> will try to achieve a minimum
 overlap of windows, <guilabel>Cascade</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>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
--- a/doc/windowspecific/index.docbook
+++ b/doc/windowspecific/index.docbook
@@ -338,8 +338,8 @@
 <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>Avoid Overlapping</guilabel> - place where no other window exists.</para></listitem>
+<listitem><para><guilabel>Maximized</guilabel> - start the window maximized.</para></listitem>
 <listitem><para><guilabel>Cascade</guilabel> - staircase-by-title.</para></listitem>
 <listitem><para><guilabel>Centered</guilabel> - center of the desktop.</para></listitem>
 <listitem><para><guilabel>Random</guilabel></para></listitem>
diff --git a/kcmkwin/kwinoptions/advanced.ui b/kcmkwin/kwinoptions/advanced.ui
--- a/kcmkwin/kwinoptions/advanced.ui
+++ b/kcmkwin/kwinoptions/advanced.ui
@@ -111,23 +111,23 @@
         </property>
         <property name="whatsThis">
          <string>The placement policy determines where a new window will appear on the desktop.&lt;br&gt;&lt;ul&gt;
-&lt;li&gt;&lt;em&gt;Smart&lt;/em&gt; will try to achieve a minimum overlap of windows&lt;/li&gt;
-&lt;li&gt;&lt;em&gt;Maximizing&lt;/em&gt; will try to maximize every window to fill the whole screen. It might be useful to selectively affect placement of some windows using the window-specific settings.&lt;/li&gt;
+&lt;li&gt;&lt;em&gt;Avoid Overlapping&lt;/em&gt; will try to achieve a minimum overlap of windows&lt;/li&gt;
+&lt;li&gt;&lt;em&gt;Maximized&lt;/em&gt; will try to maximize every window to fill the whole screen. It might be useful to selectively affect placement of some windows using the window-specific settings.&lt;/li&gt;
 &lt;li&gt;&lt;em&gt;Cascade&lt;/em&gt; will cascade the windows&lt;/li&gt;
 &lt;li&gt;&lt;em&gt;Random&lt;/em&gt; will use a random position&lt;/li&gt;
 &lt;li&gt;&lt;em&gt;Centered&lt;/em&gt; will place the window centered&lt;/li&gt;
-&lt;li&gt;&lt;em&gt;Zero-Cornered&lt;/em&gt; will place the window in the top-left corner&lt;/li&gt;
+&lt;li&gt;&lt;em&gt;Top-Left Corner&lt;/em&gt; will place the window in the top-left corner&lt;/li&gt;
 &lt;li&gt;&lt;em&gt;Under Mouse&lt;/em&gt; will place the window under the pointer&lt;/li&gt;
 &lt;/ul&gt;</string>
         </property>
         <item>
          <property name="text">
-          <string>Smart</string>
+          <string>Avoid Overlapping</string>
          </property>
         </item>
         <item>
          <property name="text">
-          <string>Maximizing</string>
+          <string>Maximized</string>
          </property>
         </item>
         <item>
@@ -147,7 +147,7 @@
         </item>
         <item>
          <property name="text">
-          <string>Zero-Cornered</string>
+          <string>Top-Left Corner</string>
          </property>
         </item>
         <item>
diff --git a/kcmkwin/kwinrules/ruleswidgetbase.ui b/kcmkwin/kwinrules/ruleswidgetbase.ui
--- a/kcmkwin/kwinrules/ruleswidgetbase.ui
+++ b/kcmkwin/kwinrules/ruleswidgetbase.ui
@@ -1063,12 +1063,12 @@
          </item>
          <item>
           <property name="text">
-           <string>Smart</string>
+           <string>Avoid Overlapping</string>
           </property>
          </item>
          <item>
           <property name="text">
-           <string>Maximizing</string>
+           <string>Maximized</string>
           </property>
          </item>
          <item>