diff --git a/documentation/yocto-project-qs/yocto-project-qs.xml b/documentation/yocto-project-qs/yocto-project-qs.xml
index fae0db0692..2239cc0ebc 100644
--- a/documentation/yocto-project-qs/yocto-project-qs.xml
+++ b/documentation/yocto-project-qs/yocto-project-qs.xml
@@ -15,7 +15,7 @@
         Welcome to the Yocto Project!  
         The Yocto Project is an open-source collaboration project focused on embedded Linux
         developers.
-        Amongst other things, the Yocto Project uses the Poky build tool to 
+        Amongst other things, the Yocto Project uses the Poky build system to 
         construct complete Linux images.
     </para>
     <para>
@@ -37,7 +37,7 @@
         at <ulink url='https://wiki.yoctoproject.org/wiki/FAQ'>Yocto Project FAQ</ulink> and 
         the FAQ appendix located in the 
         <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
-        Poky Reference Manual</ulink> helpful.
+        Yocto Project Reference Manual</ulink> helpful.
     </para>
     <note>
         Due to production processes, there could be differences between the Yocto Project
@@ -52,7 +52,7 @@
 <section id='yp-intro'>
     <title>Introducing the Yocto Project Development Environment</title>
     <para>
-        The Yocto Project through the Poky build tool provides an open source development 
+        The Yocto Project through the Poky build system provides an open source development 
         environment targeting the ARM, MIPS, PowerPC and x86 architectures for a variety of 
         platforms including x86-64 and emulated ones.
         You can use components from the Yocto Project to design, develop, build, debug, simulate,
@@ -291,13 +291,13 @@
          </para></note>
 
          <note><para>
-             By default, Poky searches for source code using a pre-determined order
+             By default, the Yocto Project searches for source code using a pre-determined order
              through a set of locations.
-             If you encounter problems with Poky finding and downloading source code, see
+             If you encounter problems with the Yocto Project finding and downloading source code, see
              the FAQ entry "How does Poky obtain source code and will it work behind my
              firewall or proxy server?" in the 
              <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
-             Poky Reference Manual</ulink>.
+             Yocto Project Reference Manual</ulink>.
          </para></note>
 
          <para>
@@ -344,7 +344,7 @@
              For information on the <filename>&dash;k</filename> option use the 
              <filename>bitbake --help</filename> command or see
              <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html#usingpoky-components-bitbake'>
-             BitBake</ulink> section in the Poky Reference Manual.
+             BitBake</ulink> section in the Yocto Project Reference Manual.
              <literallayout class='monospaced'>
      $ bitbake -k core-image-sato
              </literallayout>
@@ -352,11 +352,11 @@
                  BitBake requires Python 2.6 or 2.7.  For more information on this requirement, 
                  see the FAQ appendix in the 
                  <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
-                 Poky Reference Manual</ulink>.
+                 Yocto Project Reference Manual</ulink>.
              </para></note>
              The final command runs the image:
              <literallayout class='monospaced'>
-     $ poky-qemu qemux86
+     $ runqemu qemux86
              </literallayout>
              <note><para>
                  Depending on the number of processors and cores, the amount or RAM, the speed of your
@@ -421,8 +421,8 @@
         <section id='installing-the-toolchain'>
         <title>Installing the Toolchain</title>
          <para>
-             You can download the pre-built toolchain, which includes the poky-qemu script and 
-             support files, from 
+             You can download the pre-built toolchain, which includes the <filename>runqemu</filename> 
+             script and support files, from 
              <ulink url='http://yoctoproject.org/downloads/yocto-1.0/toolchain/'></ulink>.  
              Toolchains are available for 32-bit and 64-bit development systems from the 
              <filename>i686</filename> and <filename>x86_64</filename> folders, respectively. 
@@ -552,7 +552,7 @@
          </para>
 
          <literallayout class='monospaced'>
-     $ poky-qemu &lt;<emphasis>qemuarch</emphasis>&gt; &lt;<emphasis>kernel-image</emphasis>&gt; &lt;<emphasis>filesystem-image</emphasis>&gt;
+     $ runqemu &lt;<emphasis>qemuarch</emphasis>&gt; &lt;<emphasis>kernel-image</emphasis>&gt; &lt;<emphasis>filesystem-image</emphasis>&gt;
 
      Where:
          &lt;<emphasis>qemuarch</emphasis>&gt; is a string representing the target architecture: qemux86, qemux86-64, 
@@ -573,7 +573,7 @@
 
          <literallayout class='monospaced'>
      $ source /opt/poky/1.1/environment-setup-i686-poky-linux 
-     $ poky-qemu qemux86 bzImage-3.0-qemux86-1.1.bin \
+     $ runqemu qemux86 bzImage-3.0-qemux86-1.1.bin \
      yocto-image-sato-qemux86-1.1.rootfs.ext3
          </literallayout>