7 files changed, 26 insertions, 26 deletions

diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index 36715f33b7..c65901252b 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -588,7 +588,7 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}"
                 </para>
 
                 <programlisting>
-                  $ BSPKEY_&lt;keydomain&gt;=&lt;key&gt; bitbake poky-image-sato
+                  $ BSPKEY_&lt;keydomain&gt;=&lt;key&gt; bitbake core-image-sato
                 </programlisting>
 
                 <para>
diff --git a/documentation/kernel-manual/kernel-how-to.xml b/documentation/kernel-manual/kernel-how-to.xml
index 96325fe2a5..0cb715404b 100644
--- a/documentation/kernel-manual/kernel-how-to.xml
+++ b/documentation/kernel-manual/kernel-how-to.xml
@@ -1126,7 +1126,7 @@ That's it. Configure and build.
                 <para>
                     You should now be able to build and boot an image with the new kernel:
                     <literallayout class='monospaced'>
-     $ bitbake poky-image-sato-live
+     $ bitbake core-image-sato-live
                     </literallayout>
                 </para></listitem>
 
diff --git a/documentation/poky-ref-manual/development.xml b/documentation/poky-ref-manual/development.xml
index 45df028f86..cee865a4a4 100644
--- a/documentation/poky-ref-manual/development.xml
+++ b/documentation/poky-ref-manual/development.xml
@@ -384,7 +384,7 @@
                         <listitem><para>Kernel: Use the file chooser to select the kernel used with QEMU.</para></listitem>
                         <listitem><para>Root filesystem: Use the file chooser to select the root 
                         filesystem directory.  This directory is where you use "poky-extract-sdk" to extract the 
-                        poky-image-sdk tarball.</para></listitem>
+                        core-image-sdk tarball.</para></listitem>
                      </itemizedlist>
                 </para>
                 </section>
@@ -738,7 +738,7 @@ tmp/sysroots/&lt;host-arch&gt;/usr/bin/&lt;target-abi&gt;-gdb
             <para>
                 Perhaps the easiest is to have an 'sdk' image that corresponds to the plain
                 image installed on the device. 
-                In the case of 'poky-image-sato', 'poky-image-sdk' would contain suitable symbols. 
+                In the case of 'core-image-sato', 'core-image-sdk' would contain suitable symbols. 
                 Because the sdk images already have the debugging symbols installed it is just a 
                 question of expanding the archive to some location and then informing GDB. 
             </para>
@@ -764,17 +764,17 @@ tmp/sysroots/&lt;host-arch&gt;/usr/bin/&lt;target-abi&gt;-gdb
                 <filename>tmp/rootfs</filename>:
                 <programlisting>
 tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf -o \
+tmp/work/&lt;target-abi&gt;/core-image-sato-1.0-r0/temp/opkg.conf -o \
 tmp/rootfs/ update
                 </programlisting></para></listitem>
                 <listitem><para>Install the debugging information:
                 <programlisting>
 tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \
+tmp/work/&lt;target-abi&gt;/core-image-sato-1.0-r0/temp/opkg.conf \
 -o tmp/rootfs install foo
 
 tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \
+tmp/work/&lt;target-abi&gt;/core-image-sato-1.0-r0/temp/opkg.conf \
 -o tmp/rootfs install foo-dbg
                 </programlisting></para></listitem>
             </orderedlist>
diff --git a/documentation/poky-ref-manual/extendpoky.xml b/documentation/poky-ref-manual/extendpoky.xml
index 6a5e1a5d8a..69ff4e2a52 100644
--- a/documentation/poky-ref-manual/extendpoky.xml
+++ b/documentation/poky-ref-manual/extendpoky.xml
@@ -269,7 +269,7 @@ fi
                 The following example shows the form for the two lines you need:
             </para>
             <programlisting>
-IMAGE_INSTALL = "task-poky-x11-base package1 package2"
+IMAGE_INSTALL = "task-core-x11-base package1 package2"
 
 inherit poky-image
             </programlisting>
@@ -283,11 +283,11 @@ inherit poky-image
             </para>
             <para>
                 The other method for creating a custom image is to modify an existing image. 
-                For example, if a developer wants to add "strace" into "poky-image-sato", they can use 
+                For example, if a developer wants to add "strace" into "core-image-sato", they can use 
                 the following recipe:
             </para>
             <programlisting>
-require poky-image-sato.bb
+require core-image-sato.bb
 
 IMAGE_INSTALL += "strace"
             </programlisting>
@@ -368,8 +368,8 @@ RRECOMMENDS_task-custom-tools = "\
                 Poky ships with two SSH servers you can use in your images: Dropbear and OpenSSH. 
                 Dropbear is a minimal SSH server appropriate for resource-constrained environments,
                 while OpenSSH is a well-known standard SSH server implementation.
-                By default, poky-image-sato is configured to use Dropbear.
-                The poky-image-basic and poky-image-lsb images both include OpenSSH.
+                By default, core-image-sato is configured to use Dropbear.
+                The core-image-basic and core-image-lsb images both include OpenSSH.
                 To change these defaults, edit the <filename>IMAGE_FEATURES</filename> variable
                 so that it sets the image you are working with to include ssh-server-dropbear 
                 or ssh-server-openssh.
@@ -412,7 +412,7 @@ DISTRO_EXTRA_RDEPENDS += "strace"
             </para>
             <programlisting>
 $ bitbake -c clean task-boot task-base task-poky
-$ bitbake poky-image-sato
+$ bitbake core-image-sato
             </programlisting>
         </section>
 
diff --git a/documentation/poky-ref-manual/ref-bitbake.xml b/documentation/poky-ref-manual/ref-bitbake.xml
index 75b3bf5e54..df8432c91b 100644
--- a/documentation/poky-ref-manual/ref-bitbake.xml
+++ b/documentation/poky-ref-manual/ref-bitbake.xml
@@ -9,7 +9,7 @@
         BitBake is a program written in Python that interprets the metadata that makes up Poky. 
         At some point, people wonder what actually happens when you enter:
     <literallayout class='monospaced'>
-     $ bitbake poky-image-sato
+     $ bitbake core-image-sato
     </literallayout>
     </para>
    
@@ -111,11 +111,11 @@
 
         <para>
             Once all the <filename>.bb</filename> files have been 
-            parsed, BitBake starts to build the target (poky-image-sato in the previous section's 
+            parsed, BitBake starts to build the target (core-image-sato in the previous section's 
             example) and looks for providers of that target.
             Once a provider is selected, BitBake resolves all the dependencies for  
             the target. 
-            In the case of "poky-image-sato", it would lead to <filename>task-base.bb</filename>,  
+            In the case of "core-image-sato", it would lead to <filename>task-base.bb</filename>,  
             which in turn leads to packages like <application>Contacts</application>, 
             <application>Dates</application> and <application>BusyBox</application>.
             These packages in turn depend on glibc and the toolchain.
diff --git a/documentation/poky-ref-manual/ref-images.xml b/documentation/poky-ref-manual/ref-images.xml
index 03cc624504..955fae59b5 100644
--- a/documentation/poky-ref-manual/ref-images.xml
+++ b/documentation/poky-ref-manual/ref-images.xml
@@ -28,41 +28,41 @@
     <itemizedlist>
             <listitem>
                 <para>
-                    <emphasis>poky-image-minimal</emphasis> - A small image just capable 
+                    <emphasis>core-image-minimal</emphasis> - A small image just capable 
                     of allowing a device to boot.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-base</emphasis> - A console-only image that fully 
+                    <emphasis>core-image-base</emphasis> - A console-only image that fully 
                     supports the target device hardware. 
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-core</emphasis> - An X11 image with simple 
+                    <emphasis>core-image-core</emphasis> - An X11 image with simple 
                     applications such as terminal, editor, and file manager.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-sato</emphasis> - An X11 image with Sato theme and
+                    <emphasis>core-image-sato</emphasis> - An X11 image with Sato theme and
                     Pimlico applications. 
                     The image also contains terminal, editor, and file manager.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-sato-dev</emphasis> - An X11 image similar to 
-                    poky-image-sato but
+                    <emphasis>core-image-sato-dev</emphasis> - An X11 image similar to 
+                    core-image-sato but
                     also includes a native toolchain and libraries needed to build applications 
                     on the device itself. The image also includes testing and profiling tools 
-                    as well as debug symbols.  This image was formerly poky-image-sdk.
+                    as well as debug symbols.  This image was formerly core-image-sdk.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-lsb</emphasis> - An image suitable for implementations 
+                    <emphasis>core-image-lsb</emphasis> - An image suitable for implementations 
                     that conform to Linux Standard Base (LSB).
                 </para>
             </listitem>
diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index 9e930cbe09..9297236356 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -289,9 +289,9 @@
          </para>
          <para>
              Continue with the following command to build an OS image for the target, which is 
-             <filename>poky-image-sato</filename> in this example.
+             <filename>core-image-sato</filename> in this example.
              <literallayout class='monospaced'>
-     $ bitbake poky-image-sato
+     $ bitbake core-image-sato
              </literallayout>
              <note><para>
                  BitBake requires Python 2.6.  For more information on this requirement,