diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 63bd9cc8..a3b4b30c 100644
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -77,7 +77,9 @@ The rest of this man page describes configuration options.
 	be used with labwc the preferred mode of the monitor is used instead.
 	Default is no.
 
-*<core><windowSwitcher show="" preview="" outlines="" />*
+## WINDOW SWITCHER
+
+*<windowSwitcher show="" preview="" outlines="">*
 	*show* [yes|no] Draw the OnScreenDisplay when switching between
 	windows. Default is yes.
 
diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 0ff8a88e..9a04ede9 100644
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -12,7 +12,6 @@
     <gap>0</gap>
     <adaptiveSync>no</adaptiveSync>
     <reuseOutputMode>no</reuseOutputMode>
-    <windowSwitcher show="yes" preview="yes" outlines="yes" />
   </core>
 
   <!-- <font><theme> can be defined without an attribute to set all places -->
@@ -39,6 +38,8 @@
     </font>
   </theme>
 
+  <windowSwitcher show="yes" preview="yes" outlines="yes" />
+
   <!-- edge strength is in pixels -->
   <resistance>
     <screenEdgeStrength>20</screenEdgeStrength>
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 176b5737..82f7f1e2 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -437,13 +437,17 @@ entry(xmlNode *node, char *nodename, char *content)
 		rc.snap_top_maximize = get_bool(content);
 
 	/* <windowSwitcher show="" preview="" outlines="" /> */
-	} else if (!strcasecmp(nodename, "show.windowSwitcher.core")) {
+	} else if (!strcasecmp(nodename, "show.windowSwitcher")) {
 		rc.cycle_view_osd = get_bool(content);
-	} else if (!strcasecmp(nodename, "preview.windowSwitcher.core")) {
+	} else if (!strcasecmp(nodename, "preview.windowSwitcher")) {
 		rc.cycle_preview_contents = get_bool(content);
-	} else if (!strcasecmp(nodename, "outlines.windowSwitcher.core")) {
+	} else if (!strcasecmp(nodename, "outlines.windowSwitcher")) {
 		rc.cycle_preview_outlines = get_bool(content);
 
+	/* Remove this long term - just a friendly warning for now */
+	} else if (strstr(nodename, "windowswitcher.core")) {
+		wlr_log(WLR_ERROR, "<windowSwitcher> should not be child of <core>");
+
 	/* The following three are for backward compatibility only */
 	} else if (!strcasecmp(nodename, "cycleViewOSD.core")) {
 		rc.cycle_view_osd = get_bool(content);