diff --git a/src/source/build-numbers.jd b/src/source/build-numbers.jd
index cf33d51..3692c70 100644
--- a/src/source/build-numbers.jd
+++ b/src/source/build-numbers.jd
@@ -125,6 +125,11 @@
 <td>4.2.x</td>
 <td>API level 17</td>
 </tr>
+<tr>
+<td>Jelly Bean</td>
+<td>4.3</td>
+<td>API level 18</td>
+</tr>
 </tbody>
 </table>
 <p>Starting with Cupcake, individual builds are identified with a short
@@ -443,13 +448,19 @@
 <tr>
 <td>JDQ39</td>
 <td>android-4.2.2_r1</td>
+<td>Galaxy Nexus, Nexus 7, Nexus 4, Nexus 10</td>
+</tr>
+
+<tr>
+<td>JWR66N</td>
+<td>android-4.2.3_r1</td>
 <td>latest Jelly Bean version, Galaxy Nexus, Nexus 7, Nexus 4, Nexus 10</td>
 </tr>
 
 </tbody>
 </table>
 <p>The branches froyo, gingerbread, ics-mr0, ics-mr1, jb-dev,
-jb-mr1-dev, jb-mr1.1-dev
+jb-mr1-dev, jb-mr1.1-dev, jb-mr2-dev
 represent development
 branches that do not exactly match configurations that were tested
 by Google. They might contain a variety of changes in addition to
diff --git a/src/source/building-devices.jd b/src/source/building-devices.jd
index bbf49ba..5bb2f2c 100644
--- a/src/source/building-devices.jd
+++ b/src/source/building-devices.jd
@@ -29,7 +29,7 @@
 information that is specific to individual devices.</p>
 
 <p>With the current release, it is possible to build for
-Nexus 4, Nexus 10, Nexus 7, and for some variants of Galaxy Nexus.
+Nexus 4, Nexus 7, and for some variants of Galaxy Nexus.
 The exact level of functionality for each device depends on the availability
 of the relevant proprietary hardware-specific binaries.</p>
 <p>For Nexus 4 "mako" and on Nexus 7 "grouper" (Wi-Fi) and "tilapia" (Mobile),
@@ -37,7 +37,8 @@
 and all the hardware is functional.
 Due to hardware differences, do not use 4.1.1 on a Nexus 7 that
 was originally sold with 4.1.2 or newer.</p>
-<p>All configurations of Nexus 10 "manta" can be used. On those devices, graphics, audio,
+<p>All configurations of Nexus 10 "manta" can be used with 4.2.2.
+On those devices, graphics, audio,
 Wi-Fi, Bluetooth, camera, NFC, GPS and orientation sensors are functional.</p>
 <p>The variants of Galaxy Nexus that can be used are the GSM/HSPA+ configuration
 "maguro" (only if it was originally sold with a "yakju" or "takju" operating
@@ -85,11 +86,11 @@
 </tr>
 <tr>
 <td>grouper</td>
-<td>Press <em>Power</em> for a second, and press <em>Volume Down</em> when the bootloader logo appears</td>
+<td>Press and hold <em>Volume Down</em>, then press and hold <em>Power</em></td>
 </tr>
 <tr>
 <td>tilapia</td>
-<td>Press <em>Power</em> for a second, and press <em>Volume Down</em> when the bootloader logo appears</td>
+<td>Press and hold <em>Volume Down</em>, then press and hold <em>Power</em></td>
 </tr>
 <tr>
 <td>phantasm</td>
@@ -186,43 +187,43 @@
 <tbody>
 <tr>
 <td>manta</td>
-<td>android-4.2.2_r1 or master</td>
+<td>android-4.2.2_r1</td>
 <td>full_manta-userdebug</td>
 </tr>
 <tr>
 <td>mako</td>
-<td>android-4.2.2_r1 or master</td>
-<td>full_mako-userdebug</td>
+<td>android-4.3_r1 or master</td>
+<td>aosp_mako-userdebug</td>
 </tr>
 <tr>
 <td>grouper</td>
-<td>android-4.2.2_r1 or master</td>
-<td>full_grouper-userdebug</td>
+<td>android-4.3_r1 or master</td>
+<td>aosp_grouper-userdebug</td>
 </tr>
 <tr>
 <td>tilapia</td>
-<td>android-4.2.2_r1 or master</td>
-<td>full_grouper-userdebug</td>
+<td>android-4.3_r1 or master</td>
+<td>aosp_grouper-userdebug</td>
 </tr>
 <tr>
 <td>maguro</td>
-<td>android-4.2.2_r1 or master</td>
-<td>full_maguro-userdebug</td>
+<td>android-4.3_r1 or master</td>
+<td>aosp_maguro-userdebug</td>
 </tr>
 <tr>
 <td>toro</td>
-<td>android-4.2.2_r1 or master</td>
-<td>full_toro-userdebug</td>
+<td>android-4.3_r1 or master</td>
+<td>aosp_toro-userdebug</td>
 </tr>
 <tr>
 <td>toroplus</td>
 <td>master</td>
-<td>full_toroplus-userdebug</td>
+<td>aosp_toroplus-userdebug</td>
 </tr>
 <tr>
 <td>panda</td>
 <td>master</td>
-<td>full_panda-userdebug</td>
+<td>aosp_panda-userdebug</td>
 </tr>
 <tr>
 <td>wingray</td>
@@ -270,4 +271,4 @@
 for Nexus S and Nexus S 4G
 are available from
 <a href="https://developers.google.com/android/nexus/images">Google's factory image page</a>.</p>
-<p>Factory images for the Motorola Xoom are distributed directly by Motorola.</p>
\ No newline at end of file
+<p>Factory images for the Motorola Xoom are distributed directly by Motorola.</p>
diff --git a/src/source/building-running.jd b/src/source/building-running.jd
index 3fcd457..ae4116c 100644
--- a/src/source/building-running.jd
+++ b/src/source/building-running.jd
@@ -50,7 +50,7 @@
 <h2 id="choose-a-target">Choose a Target</h2>
 <p>Choose which target to build with <code>lunch</code>.  The exact configuration can be passed as
 an argument, e.g. </p>
-<pre><code>$ lunch full-eng
+<pre><code>$ lunch aosp_arm-eng
 </code></pre>
 <p>The example above refers to a complete build for the emulator, with all debugging enabled.</p>
 <p>If run with no arguments <code>lunch</code> will prompt you to choose a target from the menu. </p>
@@ -66,19 +66,19 @@
 </thead>
 <tbody>
 <tr>
-<td>full</td>
-<td>emulator</td>
-<td>fully configured with all languages, apps, input methods</td>
+<td>aosp_arm</td>
+<td>ARM emulator</td>
+<td>AOSP, fully configured with all languages, apps, input methods</td>
 </tr>
 <tr>
-<td>full_maguro</td>
+<td>aosp_maguro</td>
 <td>maguro</td>
-<td><code>full</code> build running on Galaxy Nexus GSM/HSPA+ ("maguro")</td>
+<td>AOSP, running on Galaxy Nexus GSM/HSPA+ ("maguro")</td>
 </tr>
 <tr>
-<td>full_panda</td>
+<td>aosp_panda</td>
 <td>panda</td>
-<td><code>full</code> build running on PandaBoard ("panda")</td>
+<td>AOSP, running on PandaBoard ("panda")</td>
 </tr>
 </tbody>
 </table>