diff --git a/documentation/Makefile b/documentation/Makefile
index c95725ef24..4423807580 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -99,10 +99,10 @@ STYLESHEET = $(DOC)/*.css
 
 endif
 
-ifeq ($(DOC),getting-started)
+ifeq ($(DOC),overview-manual)
 XSLTOPTS = --xinclude
 ALLPREQ = html eclipse tarball
-TARFILES = getting-started-style.css getting-started.html figures/getting-started-title.png \
+TARFILES = overview-manual-style.css overview-manual.html figures/overview-manual-title.png \
            figures/git-workflow.png figures/source-repos.png figures/index-downloads.png \
            figures/yp-download.png figures/YP-flow-diagram.png figures/key-dev-elements.png \
            figures/poky-reference-distribution.png \
@@ -269,7 +269,7 @@ TARFILES = mega-manual.html mega-style.css \
 	figures/sdk-devtool-add-flow.png figures/sdk-installed-extensible-sdk-directory.png \
 	figures/sdk-devtool-modify-flow.png figures/sdk-eclipse-dev-flow.png \
 	figures/sdk-devtool-upgrade-flow.png figures/bitbake-build-flow.png figures/bypqs-title.png \
-	figures/getting-started-title.png
+	figures/overview-manual-title.png
 	endif
 
 MANUALS = $(DOC)/$(DOC).html
@@ -418,11 +418,11 @@ eclipse: eclipse-generate eclipse-resolve-links
 .PHONY : eclipse-generate eclipse-resolve-links
 
 eclipse-generate:
-ifeq ($(filter $(DOC), getting-started sdk-manual bsp-guide dev-manual kernel-dev profile-manual ref-manual brief-yoctoprojectqs),)
+ifeq ($(filter $(DOC), overview-manual sdk-manual bsp-guide dev-manual kernel-dev profile-manual ref-manual brief-yoctoprojectqs),)
 	@echo " "
 	@echo "ERROR: You can only create eclipse documentation"
 	@echo "       of the following documentation parts:"
-	@echo "       - getting-started"
+	@echo "       - overview-manual"
 	@echo "       - sdk-manual"
 	@echo "       - bsp-guide"
 	@echo "       - dev-manual"
diff --git a/documentation/getting-started/figures/getting-started-title.png b/documentation/getting-started/figures/getting-started-title.png
deleted file mode 100644
index f38b078ab7..0000000000
Binary files a/documentation/getting-started/figures/getting-started-title.png and /dev/null differ
diff --git a/documentation/mega-manual/figures/getting-started-title.png b/documentation/mega-manual/figures/getting-started-title.png
deleted file mode 100644
index f38b078ab7..0000000000
Binary files a/documentation/mega-manual/figures/getting-started-title.png and /dev/null differ
diff --git a/documentation/mega-manual/figures/overview-manual-title.png b/documentation/mega-manual/figures/overview-manual-title.png
new file mode 100644
index 0000000000..698f0f3d11
Binary files /dev/null and b/documentation/mega-manual/figures/overview-manual-title.png differ
diff --git a/documentation/mega-manual/mega-manual.xml b/documentation/mega-manual/mega-manual.xml
index fae6af6ab5..21e773072d 100644
--- a/documentation/mega-manual/mega-manual.xml
+++ b/documentation/mega-manual/mega-manual.xml
@@ -141,23 +141,23 @@
     <xi:include
         xmlns:xi="http://www.w3.org/2003/XInclude" href="../brief-yoctoprojectqs/brief-yoctoprojectqs.xml"/>
 
-<!-- Includes getting-started title image and then getting-started chapters -->
+<!-- Includes overview-manual title image and then overview-manual chapters -->
 
     <para>
-        <imagedata fileref="figures/getting-started-title.png" width="100%" align="left" scalefit="1" />
+        <imagedata fileref="figures/overview-manual-title.png" width="100%" align="left" scalefit="1" />
     </para>
 
     <xi:include
-        xmlns:xi="http://www.w3.org/2003/XInclude" href="../getting-started/getting-started-intro.xml"/>
+        xmlns:xi="http://www.w3.org/2003/XInclude" href="../overview-manual/overview-manual-intro.xml"/>
 
     <xi:include
-        xmlns:xi="http://www.w3.org/2003/XInclude" href="../getting-started/getting-started-yp-intro.xml"/>
+        xmlns:xi="http://www.w3.org/2003/XInclude" href="../overview-manual/overview-manual-yp-intro.xml"/>
 
     <xi:include
-        xmlns:xi="http://www.w3.org/2003/XInclude" href="../getting-started/getting-started-development-environment.xml"/>
+        xmlns:xi="http://www.w3.org/2003/XInclude" href="../overview-manual/overview-manual-development-environment.xml"/>
 
     <xi:include
-        xmlns:xi="http://www.w3.org/2003/XInclude" href="../getting-started/getting-started-concepts.xml"/>
+        xmlns:xi="http://www.w3.org/2003/XInclude" href="../overview-manual/overview-manual-concepts.xml"/>
 
 <!-- Includes dev-manual title image and then dev-manual chapters -->
 
diff --git a/documentation/getting-started/figures/YP-flow-diagram.png b/documentation/overview-manual/figures/YP-flow-diagram.png
similarity index 100%
rename from documentation/getting-started/figures/YP-flow-diagram.png
rename to documentation/overview-manual/figures/YP-flow-diagram.png
diff --git a/documentation/getting-started/figures/analysis-for-package-splitting.png b/documentation/overview-manual/figures/analysis-for-package-splitting.png
similarity index 100%
rename from documentation/getting-started/figures/analysis-for-package-splitting.png
rename to documentation/overview-manual/figures/analysis-for-package-splitting.png
diff --git a/documentation/getting-started/figures/configuration-compile-autoreconf.png b/documentation/overview-manual/figures/configuration-compile-autoreconf.png
similarity index 100%
rename from documentation/getting-started/figures/configuration-compile-autoreconf.png
rename to documentation/overview-manual/figures/configuration-compile-autoreconf.png
diff --git a/documentation/getting-started/figures/cross-development-toolchains.png b/documentation/overview-manual/figures/cross-development-toolchains.png
similarity index 100%
rename from documentation/getting-started/figures/cross-development-toolchains.png
rename to documentation/overview-manual/figures/cross-development-toolchains.png
diff --git a/documentation/getting-started/figures/git-workflow.png b/documentation/overview-manual/figures/git-workflow.png
similarity index 100%
rename from documentation/getting-started/figures/git-workflow.png
rename to documentation/overview-manual/figures/git-workflow.png
diff --git a/documentation/getting-started/figures/image-generation.png b/documentation/overview-manual/figures/image-generation.png
similarity index 100%
rename from documentation/getting-started/figures/image-generation.png
rename to documentation/overview-manual/figures/image-generation.png
diff --git a/documentation/getting-started/figures/images.png b/documentation/overview-manual/figures/images.png
similarity index 100%
rename from documentation/getting-started/figures/images.png
rename to documentation/overview-manual/figures/images.png
diff --git a/documentation/getting-started/figures/index-downloads.png b/documentation/overview-manual/figures/index-downloads.png
similarity index 100%
rename from documentation/getting-started/figures/index-downloads.png
rename to documentation/overview-manual/figures/index-downloads.png
diff --git a/documentation/getting-started/figures/key-dev-elements.png b/documentation/overview-manual/figures/key-dev-elements.png
similarity index 100%
rename from documentation/getting-started/figures/key-dev-elements.png
rename to documentation/overview-manual/figures/key-dev-elements.png
diff --git a/documentation/getting-started/figures/layer-input.png b/documentation/overview-manual/figures/layer-input.png
similarity index 100%
rename from documentation/getting-started/figures/layer-input.png
rename to documentation/overview-manual/figures/layer-input.png
diff --git a/documentation/overview-manual/figures/overview-manual-title.png b/documentation/overview-manual/figures/overview-manual-title.png
new file mode 100644
index 0000000000..698f0f3d11
Binary files /dev/null and b/documentation/overview-manual/figures/overview-manual-title.png differ
diff --git a/documentation/getting-started/figures/package-feeds.png b/documentation/overview-manual/figures/package-feeds.png
similarity index 100%
rename from documentation/getting-started/figures/package-feeds.png
rename to documentation/overview-manual/figures/package-feeds.png
diff --git a/documentation/getting-started/figures/patching.png b/documentation/overview-manual/figures/patching.png
similarity index 100%
rename from documentation/getting-started/figures/patching.png
rename to documentation/overview-manual/figures/patching.png
diff --git a/documentation/getting-started/figures/poky-reference-distribution.png b/documentation/overview-manual/figures/poky-reference-distribution.png
similarity index 100%
rename from documentation/getting-started/figures/poky-reference-distribution.png
rename to documentation/overview-manual/figures/poky-reference-distribution.png
diff --git a/documentation/getting-started/figures/sdk-generation.png b/documentation/overview-manual/figures/sdk-generation.png
similarity index 100%
rename from documentation/getting-started/figures/sdk-generation.png
rename to documentation/overview-manual/figures/sdk-generation.png
diff --git a/documentation/getting-started/figures/sdk.png b/documentation/overview-manual/figures/sdk.png
similarity index 100%
rename from documentation/getting-started/figures/sdk.png
rename to documentation/overview-manual/figures/sdk.png
diff --git a/documentation/getting-started/figures/source-fetching.png b/documentation/overview-manual/figures/source-fetching.png
similarity index 100%
rename from documentation/getting-started/figures/source-fetching.png
rename to documentation/overview-manual/figures/source-fetching.png
diff --git a/documentation/getting-started/figures/source-input.png b/documentation/overview-manual/figures/source-input.png
similarity index 100%
rename from documentation/getting-started/figures/source-input.png
rename to documentation/overview-manual/figures/source-input.png
diff --git a/documentation/getting-started/figures/source-repos.png b/documentation/overview-manual/figures/source-repos.png
similarity index 100%
rename from documentation/getting-started/figures/source-repos.png
rename to documentation/overview-manual/figures/source-repos.png
diff --git a/documentation/getting-started/figures/user-configuration.png b/documentation/overview-manual/figures/user-configuration.png
similarity index 100%
rename from documentation/getting-started/figures/user-configuration.png
rename to documentation/overview-manual/figures/user-configuration.png
diff --git a/documentation/getting-started/figures/yocto-environment-ref.png b/documentation/overview-manual/figures/yocto-environment-ref.png
similarity index 100%
rename from documentation/getting-started/figures/yocto-environment-ref.png
rename to documentation/overview-manual/figures/yocto-environment-ref.png
diff --git a/documentation/getting-started/figures/yp-download.png b/documentation/overview-manual/figures/yp-download.png
similarity index 100%
rename from documentation/getting-started/figures/yp-download.png
rename to documentation/overview-manual/figures/yp-download.png
diff --git a/documentation/getting-started/getting-started-concepts.xml b/documentation/overview-manual/overview-manual-concepts.xml
similarity index 99%
rename from documentation/getting-started/getting-started-concepts.xml
rename to documentation/overview-manual/overview-manual-concepts.xml
index b7b31b33d9..123cf15d19 100644
--- a/documentation/getting-started/getting-started-concepts.xml
+++ b/documentation/overview-manual/overview-manual-concepts.xml
@@ -2,7 +2,7 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 [<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
 
-<chapter id=' getting-started-concepts'>
+<chapter id=' overview-manual-concepts'>
 <title>Yocto Project Concepts</title>
 
     <section id='yocto-project-components'>
diff --git a/documentation/getting-started/getting-started-customization.xsl b/documentation/overview-manual/overview-manual-customization.xsl
similarity index 94%
rename from documentation/getting-started/getting-started-customization.xsl
rename to documentation/overview-manual/overview-manual-customization.xsl
index 9733bf87b2..22360e7bab 100644
--- a/documentation/getting-started/getting-started-customization.xsl
+++ b/documentation/overview-manual/overview-manual-customization.xsl
@@ -17,7 +17,7 @@
   <xsl:include href="../template/division.title.xsl"/>
   <xsl:include href="../template/formal.object.heading.xsl"/>
 
-  <xsl:param name="html.stylesheet" select="'getting-started-style.css'" />
+  <xsl:param name="html.stylesheet" select="'overview-manual-style.css'" />
   <xsl:param name="chapter.autolabel" select="1" />
   <xsl:param name="appendix.autolabel" select="A" />
   <xsl:param name="section.autolabel" select="1" />
diff --git a/documentation/getting-started/getting-started-development-environment.xml b/documentation/overview-manual/overview-manual-development-environment.xml
similarity index 100%
rename from documentation/getting-started/getting-started-development-environment.xml
rename to documentation/overview-manual/overview-manual-development-environment.xml
diff --git a/documentation/getting-started/getting-started-eclipse-customization.xsl b/documentation/overview-manual/overview-manual-eclipse-customization.xsl
similarity index 95%
rename from documentation/getting-started/getting-started-eclipse-customization.xsl
rename to documentation/overview-manual/overview-manual-eclipse-customization.xsl
index 17fff727f9..aaf99ea1ba 100644
--- a/documentation/getting-started/getting-started-eclipse-customization.xsl
+++ b/documentation/overview-manual/overview-manual-eclipse-customization.xsl
@@ -22,7 +22,7 @@
   <xsl:param name="chunk.section.depth" select="10"/>
   <xsl:param name="use.id.as.filename" select="1"/>
   <xsl:param name="ulink.target" select="'_self'" />
-  <xsl:param name="base.dir" select="'html/getting-started/'"/>
+  <xsl:param name="base.dir" select="'html/overview-manual/'"/>
   <xsl:param name="html.stylesheet" select="'../book.css'"/>
   <xsl:param name="eclipse.manifest" select="0"/>
   <xsl:param name="create.plugin.xml" select="0"/>
diff --git a/documentation/getting-started/getting-started-intro.xml b/documentation/overview-manual/overview-manual-intro.xml
similarity index 98%
rename from documentation/getting-started/getting-started-intro.xml
rename to documentation/overview-manual/overview-manual-intro.xml
index dcda2ab6db..2976f7c1b6 100644
--- a/documentation/getting-started/getting-started-intro.xml
+++ b/documentation/overview-manual/overview-manual-intro.xml
@@ -5,7 +5,7 @@
 <chapter id='overview-manual-intro'>
 
 <title>The Yocto Project Overview and Concepts Manual</title>
-    <section id='getting-started-welcome'>
+    <section id='overview-manual-welcome'>
         <title>Welcome</title>
 
         <para>
@@ -80,7 +80,7 @@
         </para>
     </section>
 
-    <section id='getting-started-overview-other-information'>
+    <section id='overview-manual-other-information'>
         <title>Other Information</title>
 
         <para>
diff --git a/documentation/getting-started/getting-started-style.css b/documentation/overview-manual/overview-manual-style.css
similarity index 99%
rename from documentation/getting-started/getting-started-style.css
rename to documentation/overview-manual/overview-manual-style.css
index a03f7dc0c1..97a364b125 100644
--- a/documentation/getting-started/getting-started-style.css
+++ b/documentation/overview-manual/overview-manual-style.css
@@ -118,7 +118,7 @@ h6 {
   background-color: transparent;
   background-repeat: no-repeat;
   padding-top: 256px;
-  background-image: url("figures/getting-started-title.png");
+  background-image: url("figures/overview-manual-title.png");
   background-position: left top;
   margin-top: -256px;
   padding-right: 50px;
diff --git a/documentation/getting-started/getting-started-yp-intro.xml b/documentation/overview-manual/overview-manual-yp-intro.xml
similarity index 100%
rename from documentation/getting-started/getting-started-yp-intro.xml
rename to documentation/overview-manual/overview-manual-yp-intro.xml
diff --git a/documentation/getting-started/getting-started.xml b/documentation/overview-manual/overview-manual.xml
similarity index 92%
rename from documentation/getting-started/getting-started.xml
rename to documentation/overview-manual/overview-manual.xml
index cb5d0f5662..f04fbaf3bd 100644
--- a/documentation/getting-started/getting-started.xml
+++ b/documentation/overview-manual/overview-manual.xml
@@ -2,7 +2,7 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
 [<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
 
-<book id='getting-started-manual' lang='en'
+<book id='overview-manual' lang='en'
       xmlns:xi="http://www.w3.org/2003/XInclude"
       xmlns="http://docbook.org/ns/docbook"
       >
@@ -10,7 +10,7 @@
 
         <mediaobject>
             <imageobject>
-                <imagedata fileref='figures/getting-started-title.png'
+                <imagedata fileref='figures/overview-manual-title.png'
                     format='SVG'
                     align='left' scalefit='1' width='100%'/>
             </imageobject>
@@ -94,13 +94,13 @@
 
     </bookinfo>
 
-    <xi:include href="getting-started-intro.xml"/>
+    <xi:include href="overview-manual-intro.xml"/>
 
-    <xi:include href="getting-started-yp-intro.xml"/>
+    <xi:include href="overview-manual-yp-intro.xml"/>
 
-    <xi:include href="getting-started-development-environment.xml"/>
+    <xi:include href="overview-manual-development-environment.xml"/>
 
-    <xi:include href="getting-started-concepts.xml" />
+    <xi:include href="overview-manual-concepts.xml" />
 
 </book>
 <!--
diff --git a/documentation/poky.ent b/documentation/poky.ent
index c7a691ef46..469d80f3de 100644
--- a/documentation/poky.ent
+++ b/documentation/poky.ent
@@ -62,7 +62,7 @@
 <!ENTITY YOCTO_DOCS_BB_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/bitbake-user-manual/bitbake-user-manual.html">
 <!ENTITY YOCTO_DOCS_TOAST_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/toaster-manual/toaster-manual.html">
 <!ENTITY YOCTO_DOCS_SDK_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/sdk-manual/sdk-manual.html">
-<!ENTITY YOCTO_DOCS_GS_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/getting-started/getting-started.html">
+<!ENTITY YOCTO_DOCS_OM_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/overview-manual/overview-manual.html">
 <!ENTITY YOCTO_DOCS_BRIEF_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/brief-yoctoprojectqs/brief-yoctoprojectqs.html">
 <!ENTITY YOCTO_ADTPATH_DIR "/opt/poky/&DISTRO;">
 <!ENTITY YOCTO_POKY_TARBALL "&YOCTO_POKY;.tar.bz2">
diff --git a/documentation/tools/mega-manual.sed b/documentation/tools/mega-manual.sed
index f93adba725..e1dc98ad42 100644
--- a/documentation/tools/mega-manual.sed
+++ b/documentation/tools/mega-manual.sed
@@ -16,7 +16,7 @@ s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/poky-ref-manual\/poky-
 s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/sdk-manual\/sdk-manual.html#/"link" href="#/g
 s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/bsp-guide\/bsp-guide.html#/"link" href="#/g
 s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/dev-manual\/dev-manual.html#/"link" href="#/g
-s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/getting-started\/getting-started.html#/"link" href="#/g
+s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/overview-manual\/overview-manual.html#/"link" href="#/g
 s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/brief-yoctoprojectqs\/brief-yoctoprojectqs.html#/"link" href="#/g
 s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/kernel-dev\/kernel-dev.html#/"link" href="#/g
 s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/profile-manual\/profile-manual.html#/"link" href="#/g
@@ -27,7 +27,7 @@ s/"ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/toaster-manual\/toaste
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/brief-yoctoprojectqs\/brief-yoctoprojectqs.html" target="_top">Yocto Project Quick Build<\/a>/Yocto Project Quick Build/g
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/yocto-project-qs\/yocto-project-qs.html" target="_top">Yocto Project Quick Start<\/a>/Yocto Project Quick Start/g
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/dev-manual\/dev-manual.html" target="_top">Yocto Project Development Tasks Manual<\/a>/Yocto Project Development Tasks Manual/g
-s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/getting-started\/getting-started.html" target="_top">Yocto Project Overview and Concepts Manual<\/a>/Yocto project Overview and Concepts Manual/g
+s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/overview-manual\/overview-manual.html" target="_top">Yocto Project Overview and Concepts Manual<\/a>/Yocto project Overview and Concepts Manual/g
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/sdk-manual\/sdk-manual.html" target="_top">Yocto Project Application Development and the Extensible Software Development Kit (eSDK)<\/a>/Yocto Project Application Development and the Extensible Software Development Kit (eSDK)/g
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/bsp-guide\/bsp-guide.html" target="_top">Yocto Project Board Support Package (BSP) Developer's Guide<\/a>/Yocto Project Board Support Package (BSP) Developer's Guide/g
 s/<a class="ulink" href="http:\/\/www.yoctoproject.org\/docs\/2.5\/profile-manual\/profile-manual.html" target="_top">Yocto Project Profiling and Tracing Manual<\/a>/Yocto Project Profiling and Tracing Manual/g