diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index b17e826539..ab9ac1888f 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -1283,7 +1283,7 @@
                     is found in <filename>poky/meta</filename>
                     directory of the
                     <ulink url='&YOCTO_DOCS_REF_URL;#source-directory'>Source Directory</ulink>
-                    or in the OpenEmbedded Core Layer
+                    or in the OpenEmbedded-Core Layer
                     (<filename>openembedded-core</filename>) at
                     <ulink url='http://git.openembedded.org/openembedded-core/tree/meta'></ulink>.
                     </para>
@@ -1303,7 +1303,7 @@
                     <para>Within any particular
                     <filename>recipes-*</filename> category, the
                     layout should match what is found in the
-                    OpenEmbedded Core Git repository
+                    OpenEmbedded-Core Git repository
                     (<filename>openembedded-core</filename>)
                     or the Source Directory (<filename>poky</filename>).
                     In other words, make sure you place related
@@ -1994,7 +1994,7 @@
                     CPU, and application performance.
                     These features, which are collectively known
                     as "tuning features", exist in the
-                    <ulink url='&YOCTO_DOCS_REF_URL;#oe-core'>OpenEmbedded Core (OE-Core)</ulink>
+                    <ulink url='&YOCTO_DOCS_REF_URL;#oe-core'>OpenEmbedded-Core (OE-Core)</ulink>
                     layer (e.g.
                     <filename>poky/meta/conf/machine/include</filename>).
                     In this example, the default tunning file is
diff --git a/documentation/concepts-manual/concepts-manual-concepts.xml b/documentation/concepts-manual/concepts-manual-concepts.xml
index 7ff9e40be4..285e1678a1 100644
--- a/documentation/concepts-manual/concepts-manual-concepts.xml
+++ b/documentation/concepts-manual/concepts-manual-concepts.xml
@@ -12,7 +12,7 @@
             The
             <ulink url='&YOCTO_DOCS_REF_URL;#bitbake-term'>BitBake</ulink>
             task executor together with various types of configuration files
-            form the OpenEmbedded Core.
+            form the OpenEmbedded-Core.
             This section overviews these components by describing their use and
             how they interact.
         </para>
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index d07b290aa7..093cc37cee 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -6031,7 +6031,7 @@
                         Wic is a completely independent
                         standalone utility that initially provides
                         easier-to-use and more flexible replacements for an
-                        existing functionality in OE Core's
+                        existing functionality in OE-Core's
                         <ulink url='&YOCTO_DOCS_REF_URL;#ref-classes-image-live'><filename>image-live</filename></ulink>
                         class and <filename>mkefidisk.sh</filename> script.
                         The difference between
diff --git a/documentation/getting-started/getting-started-yp-intro.xml b/documentation/getting-started/getting-started-yp-intro.xml
index 96bab66dff..d98aacc6f1 100644
--- a/documentation/getting-started/getting-started-yp-intro.xml
+++ b/documentation/getting-started/getting-started-yp-intro.xml
@@ -687,13 +687,13 @@
                         <ulink url='&YOCTO_DOCS_BB_URL;'>BitBake User Manual</ulink>.
                         </para></listitem>
                     <listitem><para>
-                        <emphasis>Openembedded Core:</emphasis>
-                        OpenEmbedded Core (OE-Core) is a common layer of
+                        <emphasis>OpenEmbedded-Core:</emphasis>
+                        OpenEmbedded-Core (OE-Core) is a common layer of
                         metadata (i.e. recipes, classes, and associated files)
                         used by OpenEmbedded-derived systems, which includes
                         the Yocto Project.
                         The Yocto Project and the OpenEmbedded Project both
-                        maintain the OpenEmbedded Core.
+                        maintain the OpenEmbedded-Core.
                         You can find the OE-Core metadata in the Yocto
                         Project
                         <ulink url='&YOCTO_DOCS_GS_URL;#source-repositories'>Source Repositories</ulink>
@@ -961,7 +961,7 @@
             <ulink url='&YOCTO_DOCS_REF_URL;#build-system-term'>OpenEmbedded Build System</ulink>
             build system
             (<ulink url='&YOCTO_DOCS_REF_URL;#bitbake-term'>BitBake</ulink> and
-            <ulink url='&YOCTO_DOCS_REF_URL;#oe-core'>OpenEmbedded Core</ulink>)
+            <ulink url='&YOCTO_DOCS_REF_URL;#oe-core'>OpenEmbedded-Core</ulink>)
             as well as a set of
             <ulink url='&YOCTO_DOCS_REF_URL;#metadata'>metadata</ulink> to get
             you started building your own distro.
@@ -1219,7 +1219,7 @@
                     software itself (patches or auxiliary files) that
                     are used to fix bugs or customize the software for use
                     in a particular situation.
-                    OpenEmbedded Core is an important set of validated
+                    OpenEmbedded-Core is an important set of validated
                     metadata.
                     </para></listitem>
                 <listitem><para id='gs-term-openembedded-build-system'>
diff --git a/documentation/ref-manual/ref-structure.xml b/documentation/ref-manual/ref-structure.xml
index 5d30987956..56f786c21e 100644
--- a/documentation/ref-manual/ref-structure.xml
+++ b/documentation/ref-manual/ref-structure.xml
@@ -114,7 +114,7 @@
         <title><filename>meta/</filename></title>
 
         <para>
-            This directory contains the OpenEmbedded Core metadata.
+            This directory contains the OpenEmbedded-Core metadata.
             The directory holds recipes, common classes, and machine
             configuration for emulated targets (<filename>qemux86</filename>,
             <filename>qemuarm</filename>, and so forth.)
@@ -350,7 +350,7 @@
             which defaults to <filename>meta-poky/conf</filename>
             when you are building from the Yocto Project development
             environment and defaults to <filename>meta/conf</filename> when
-            you are building from the OpenEmbedded Core environment.
+            you are building from the OpenEmbedded-Core environment.
             Because the script variable points to the source of the
             <filename>local.conf.sample</filename> file, this implies that
             you can configure your build environment from any layer by setting
@@ -402,7 +402,7 @@
             which defaults to <filename>meta-poky/conf</filename>
             when you are building from the Yocto Project development
             environment and defaults to <filename>meta/conf</filename> when
-            you are building from the OpenEmbedded Core environment.
+            you are building from the OpenEmbedded-Core environment.
             Because the script variable points to the source of the
             <filename>bblayers.conf.sample</filename> file, this implies that
             you can base your build from any layer by setting the variable in
diff --git a/documentation/ref-manual/ref-terms.xml b/documentation/ref-manual/ref-terms.xml
index 31bd1b5d0d..c2a23e8bf1 100644
--- a/documentation/ref-manual/ref-terms.xml
+++ b/documentation/ref-manual/ref-terms.xml
@@ -273,7 +273,7 @@
                 software itself (patches or auxiliary files) that
                 are used to fix bugs or customize the software for use
                 in a particular situation.
-                OpenEmbedded Core is an important set of validated
+                OpenEmbedded-Core is an important set of validated
                 metadata.</para>
 
                 <para>In the context of the kernel ("kernel Metadata"), the
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 468fa4dfde..76194d450b 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -355,7 +355,7 @@
                 </para>
 
                 <para>
-                    In OpenEmbedded Core, <filename>ASSUME_PROVIDED</filename>
+                    In OpenEmbedded-Core, <filename>ASSUME_PROVIDED</filename>
                     mostly specifies native tools that should not be built.
                     An example is <filename>git-native</filename>, which when
                     specified, allows for the Git binary from the host to be
@@ -2806,13 +2806,13 @@
 
         <glossentry id='var-COREBASE'><glossterm>COREBASE</glossterm>
             <info>
-                COREBASE[doc] = "Specifies the parent directory of the OpenEmbedded Core Metadata layer (i.e. meta)."
+                COREBASE[doc] = "Specifies the parent directory of the OpenEmbedded-Core Metadata layer (i.e. meta)."
             </info>
             <glossdef>
                 <para role="glossdeffirst">
 <!--                <para role="glossdeffirst"><imagedata fileref="figures/define-generic.png" /> -->
-                    Specifies the parent directory of the OpenEmbedded
-                    Core Metadata layer (i.e. <filename>meta</filename>).
+                    Specifies the parent directory of the OpenEmbedded-Core
+                    Metadata layer (i.e. <filename>meta</filename>).
                 </para>
 
                 <para>