diff --git a/docs/html/preview/behavior-changes.jd b/docs/html/preview/behavior-changes.jd
index 6be7f5d..1f8a74f 100644
--- a/docs/html/preview/behavior-changes.jd
+++ b/docs/html/preview/behavior-changes.jd
@@ -33,7 +33,7 @@
 <h2>See Also</h2>
 <ol>
   <li><a href="{@docRoot}preview/api-overview.html">
-    N Developer Preview API Overview</a></li>
+    Android N API Overview</a></li>
 </ol>
 
 </div>
@@ -41,7 +41,7 @@
 
 
 <p>
-  Along with new features and capabilities, the Android N Developer Preview
+  Along with new features and capabilities, Android N
   includes a variety of system and API behavior changes. This document
   highlights some of the key changes that you should understand and account for
   in your apps.
@@ -56,7 +56,7 @@
 <h2 id="perf">Performance Improvements</h2>
 
 <p>
-  The Preview contains system behavior changes aimed at improving the battery
+  Android N contains system behavior changes aimed at improving the battery
   life of devices, RAM usage, and app performance. These changes can impact the
   availability of system resources and system notifications to your app. You
   should review these changes and evaluate how your app may need to adjust to
@@ -68,7 +68,7 @@
 <p>
   Introduced in Android 6.0 (API level 23), Doze improves battery life by
   deferring CPU and network activities when a user leaves a device unplugged,
-  stationary, and with the screen turned off. This Preview brings further
+  stationary, and with the screen turned off. Android N brings further
   enhancements to Doze by applying a subset of CPU and network restrictions
   while the device is unplugged with the screen turned off, but not necessarily
   stationary, for example, when a handset is traveling in a user’s pocket.
@@ -118,7 +118,7 @@
 <h3 id="bg-opt">Project Svelte: Background Optimizations</h3>
 
 <p>
-  The Preview removes three implicit broadcasts in order to help optimize both
+  Android N removes three implicit broadcasts in order to help optimize both
   memory use and power consumption. This change is necessary because implicit
   broadcasts frequently start apps that have registered to listen for them in
   the background. Removing these broadcasts can substantially benefit device
@@ -143,12 +143,12 @@
 </p>
 
 <p>
-  To alleviate these issues, the Preview applies the following
+  To alleviate these issues, Android N applies the following
   optimizations:
 </p>
 
 <ul>
-  <li>Apps targeting the Preview do not receive {@link
+  <li>Apps targeting Android N do not receive {@link
   android.net.ConnectivityManager#CONNECTIVITY_ACTION} broadcasts, even if they
   have manifest entries to request notification of these events. Apps running
   in the foreground can still listen for {@code CONNECTIVITY_CHANGE} on their
@@ -158,7 +158,7 @@
 
   <li>Apps cannot send or receive {@code NEW_PICTURE} or {@code NEW_VIDEO}
   broadcasts. This optimization affects all apps, not only those
-  targeting the Preview.
+  targeting Android N.
   </li>
 </ul>
 
@@ -189,7 +189,7 @@
 <h2 id="perm">Permissions Changes</h2>
 
 <p>
-  The Preview includes changes to permissions that may affect your app,
+  Android N includes changes to permissions that may affect your app,
   including user accounts permissions and a new permission for writing to
   external storage. Here is a summary of the permissions that have changed in
   the preview:
@@ -199,7 +199,7 @@
   <li>{@code GET_ACCOUNTS} (Deprecated)
     <p>
       The GET_ACCOUNTS permission is now deprecated. The system ignores this
-      permission for apps that target the N Developer Preview.
+      permission for apps that target Android N.
     </p>
   </li>
 
@@ -227,7 +227,7 @@
 <h2 id="accessibility">Accessibility Improvements</h2>
 
 <p>
-  This Preview includes changes intended to improve the usability of the
+  Android N includes changes intended to improve the usability of the
   platform for users with low or impaired vision. These changes should
   generally not require code changes in your app, however you should review
   these feature and test them with your app to assess potential impacts to user
@@ -238,7 +238,7 @@
 <h3 id="screen-zoom">Screen Zoom</h3>
 
 <p>
-  The Preview enables users to set <strong>Display size</strong>which magnifies
+  Android N enables users to set <strong>Display size</strong>which magnifies
   or shrinks all elements on the screen, thereby improving device accessibility
   for users with low vision. Users cannot zoom the screen past a minimum screen
   width of <a href=
@@ -258,7 +258,7 @@
 </div> <!-- end cols -->
 <p class="img-caption">
   <strong>Figure 3.</strong> The screen on the right shows the effect of
-  increasing the Display size of a device running an N Preview system image.
+  increasing the Display size of a device running an Android N system image.
 </p>
 
 
@@ -278,7 +278,7 @@
   Runtime Changes</a>, just as if the device's orientation had changed.
   </li>
 
-  <li>If an app targets the N Developer Preview, all of its processes
+  <li>If an app targets Android N, all of its processes
   (foreground and background) are notified of the configuration change as
   described in <a href=
   "{@docRoot}guide/topics/resources/runtime-changes.html">Handling
@@ -296,7 +296,7 @@
 <h3 id="vision-settings">Vision Settings in Setup Wizard</h3>
 
 <p>
-  The Preview includes Vision Settings on the Welcome screen, where users can
+  Android N includes Vision Settings on the Welcome screen, where users can
   set up the following accessibility settings on a new device:
   <strong>Magnification gesture</strong>, <strong>Font size</strong>,
   <strong>Display size</strong> and <strong>TalkBack</strong>. This change
@@ -310,7 +310,7 @@
 <h2 id="open-jdk">Platform Migration toward OpenJDK 8</h2>
 
 <p>
-  The Preview moves Android’s Java language libraries to an OpenJDK-based
+  Android N moves Android’s Java language libraries to an OpenJDK-based
   approach, creating a common code base for developers to build apps and
   services. If your app depends on a private implementation of Java or
   unspecified behavior, you should be aware of these known issues:
@@ -357,14 +357,14 @@
 <h2 id="ndk">NDK Apps Linking to Platform Libraries</h2>
 
 <p>
-  The Preview includes namespace changes to prevent loading of non-public APIs.
+  Android N includes namespace changes to prevent loading of non-public APIs.
   If you use the NDK, you should only be using public APIs from the Android
   platform. Using non-public APIs in the next official release of Android
   can cause your app to crash.
 </p>
 
 <p>
-  In order to alert you to use of non-public APIs, apps running on a Preview
+  In order to alert you to use of non-public APIs, apps running on an Android N
   device generate an error in logcat output when an app calls a non-public API.
   This error is also displayed on the device screen as a message to help
   raise awareness of this situation. You should review your app code to
@@ -399,8 +399,7 @@
 
 <p>
   To help you diagnose these types problems here are some example Java and NDK
-  errors you might encounter when attempting to build your app with the N
-  Developer Preview:
+  errors you might encounter when attempting to build your app with Android N:
 </p>
 
 <p>Example Java error:</p>
@@ -445,7 +444,7 @@
 
 <h2 id="afw">Android for Work</h2>
 <p>
-  The Preview contains changes for apps that target Android for Work, including
+  Android N contains changes for apps that target Android for Work, including
   changes to certificate installation, password resetting, secondary user
   management, and access to device identifiers. If you are building apps for
   Android for Work environments, you should review these changes and modify
diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd
index 456f7c8..ac70b3e 100644
--- a/docs/html/preview/download.jd
+++ b/docs/html/preview/download.jd
@@ -170,7 +170,7 @@
   <div id="qv">
     <h2>In this document</h2>
       <ol>
-        <li><a href="#device-preview">Getting Preview on Devices</a>
+        <li><a href="#device-preview">Getting Android N on Devices</a>
           <ol>
             <li><a href="#ota">Over the air updates</a></li>
             <li><a href="#flash">Installing system images</a></li>
@@ -185,19 +185,19 @@
 <p>
   The Android N Developer Preview includes device system images to help you
   test your app and the new APIs coming in the next release of the platform.
-  This document describes how to get Preview system images on a device for
+  This document describes how to get Android N system images on a device for
   testing.
 </p>
 
-<h2 id="device-preview">Getting Preview on Devices</h2>
+<h2 id="device-preview">Getting Android N on Devices</h2>
 
 <p>
-  In order to effectively test your apps with the Preview, use
-  a Preview emulator provided with the Preview SDK or configure a device
-  with a Preview system image. The N Developer Preview allows you to update
-  devices for use in testing the functionality of the Preview APIs and system
-  behaviors with your apps. You can get the Preview on a device by opting a
-  device into the Android Beta Program or by downloading a preview system
+  In order to effectively test your apps with Android N, use
+  an Android N emulator provided with the N Preview SDK or configure a device
+  with an Android N system image. Android N allows you to update
+  devices for use in testing the functionality of the Android N APIs and system
+  behaviors with your apps. You can get Android N on a device by opting a
+  device into the Android Beta Program or by downloading an Android N system
   image and installing it on a device.
 </p>
 
@@ -212,7 +212,7 @@
 </p>
 
 <p>
-  You can create emulators containing the Preview within the Preview SDK.
+  You can create emulators containing Android N within the Preview SDK.
   For more information about getting the Preview SDK, see
   <a href="{@docRoot}preview/setup-sdk.html">Set Up the SDK</a>.
 </p>
@@ -221,9 +221,9 @@
 <h3 id="ota">Over the air updates</h3>
 
 <p>
-  You can receive Preview versions of Android on compatible devices by
+  You can receive preview versions of Android on compatible devices by
   enrolling them in the Android Beta Program. Once you enroll a device in
-  this program, it receives Preview versions of Android over-the-air (OTA).
+  this program, it receives preview versions of Android over-the-air (OTA).
   These updates are automatically downloaded and can installed just like
   official updates.
 </p>
diff --git a/docs/html/preview/features/afw.jd b/docs/html/preview/features/afw.jd
index a67a1c8..7fd29dd 100644
--- a/docs/html/preview/features/afw.jd
+++ b/docs/html/preview/features/afw.jd
@@ -1,5 +1,5 @@
 page.title=Android for Work Updates
-page.metaDescription=New Android for Work APIs and features in the N Developer Preview.
+page.metaDescription=New Android for Work APIs and features in Android N.
 page.keywords="android for work", "android N", "enterprise", "QR code"
 
 @jd:body
@@ -84,8 +84,8 @@
   </div>
 </div>
 
-<p>This document describes the new Android for Work features provided in the
-N Developer Preview.</p>
+<p>This document describes the new Android for Work features provided in
+Android N.</p>
 
 <h2 id="qr">QR Code Provisioning</h2>
 
@@ -310,7 +310,7 @@
 </p>
 
 <p>
-  The Preview includes the following API additions to support this feature. For
+  Android N includes the following API additions to support this feature. For
   details, see the <a href="{@docRoot}preview/download.html#docs">N Preview SDK
   Reference</a>.
 </p>
diff --git a/docs/html/preview/features/background-optimization.jd b/docs/html/preview/features/background-optimization.jd
index 1422db5..5c73655 100644
--- a/docs/html/preview/features/background-optimization.jd
+++ b/docs/html/preview/features/background-optimization.jd
@@ -57,12 +57,12 @@
 </p>
 
 <p>
-  To alleviate this issue, the N Developer Preview applies the following
+  To alleviate this issue, Android N applies the following
   restrictions:
 </p>
 
 <ul>
-  <li>Apps targeting the N Developer Preview will not receive {@link
+  <li>Apps targeting Android N will not receive {@link
   android.net.ConnectivityManager#CONNECTIVITY_ACTION} broadcasts if they
   register to receive them in their manifest. Apps running in the foreground
   can still listen for {@code CONNECTIVITY_CHANGE} on their main thread with a
@@ -100,7 +100,7 @@
 </h2>
 
 <p>
-  Apps targeting the N Developer Preview do not receive {@link
+  Apps targeting Android N do not receive {@link
   android.net.ConnectivityManager#CONNECTIVITY_ACTION} broadcasts, even if they
   register to receive them in their manifest. This could pose a problem for
   apps that want to listen for network changes or perform bulk network
@@ -225,10 +225,10 @@
 </h2>
 
 <p>
-  In the N Developer Preview, apps are not able to send or receive {@code
+  In Android N, apps are not able to send or receive {@code
   NEW_PICTURE} or {@code NEW_VIDEO} broadcasts. This restriction helps
   alleviate the performance and user experience impacts when several apps must
-  wake up in order to process them. The N Developer Preview extends {@link
+  wake up in order to process them. Android N extends {@link
   android.app.job.JobInfo} and {@link android.app.job.JobParameters} to provide
   an alternative solution.
 </p>
@@ -238,7 +238,7 @@
 </h3>
 
 <p>
-  To help trigger jobs on content URI changes, the N Developer Preview extends
+  To help trigger jobs on content URI changes, Android N extends
   the {@link android.app.job.JobInfo} API with the following methods:
 </p>
 
@@ -313,7 +313,7 @@
 </h3>
 
 <p>
-  The N Developer Preview also extends {@link android.app.job.JobParameters} to
+  Android N also extends {@link android.app.job.JobParameters} to
   allow your app to receive useful information about what content authorities
   and URIs triggered the job:
 </p>
@@ -386,14 +386,14 @@
   Optimizing your apps to run on low-memory devices, or in low-memory
   conditions, can improve performance and user experience. Eliminating the use
   of implicit broadcasts and background services is a great way to make sure
-  your app runs well on such devices. Although the N Developer Preview takes
+  your app runs well on such devices. Although Android N takes
   steps to limit the use of certain implicit broadcasts, consider optimizing
   your app to run without the use of implicit broadcasts and background
   services, entirely.</p>
 
 <p>
-  To help you test how your app behaves without those background processes, The
-  N Developer Preview introduces some additional <a href=
+  To help you test how your app behaves without those background processes,
+  Android N introduces some additional <a href=
   "{@docRoot}tools/help/adb.html">Android Debug Bridge (ADB)</a> commands:
 </p>
 
diff --git a/docs/html/preview/features/data-saver.jd b/docs/html/preview/features/data-saver.jd
index 17e78eb..50025431 100644
--- a/docs/html/preview/features/data-saver.jd
+++ b/docs/html/preview/features/data-saver.jd
@@ -24,7 +24,7 @@
 
 <p>
   Over the life of a smartphone, the cost of a cellular data plan can easily
-  exceed the cost of the device itself. In the N Developer Preview, users can
+  exceed the cost of the device itself. In Android N, users can
   enable Data Saver in order to use less data, whether roaming, near the end of
   the billing cycle, or on a small prepaid data pack.
 </p>
@@ -38,7 +38,7 @@
 </p>
 
 <p>
-  The N Developer Preview extends the {@link android.net.ConnectivityManager}
+  Android N extends the {@link android.net.ConnectivityManager}
   API to provide apps a way to <a href="#status">retrieve the user’s Data Saver
   preferences</a> and <a href="#monitor-changes">monitor preference
   changes</a>. It is considered good practice for apps to check whether the
@@ -51,7 +51,7 @@
 </h1>
 
 <p>
-  In the N Developer Preview, apps can use the {@link
+  In Android N, apps can use the {@link
   android.net.ConnectivityManager} API to determine what data usage
   restrictions are being applied. The {@code getRestrictBackgroundStatus()}
   method returns one of the following values:
diff --git a/docs/html/preview/features/direct-boot.jd b/docs/html/preview/features/direct-boot.jd
index 4153d40..207a56c 100644
--- a/docs/html/preview/features/direct-boot.jd
+++ b/docs/html/preview/features/direct-boot.jd
@@ -17,7 +17,7 @@
 </div>
 </div>
 
-<p>Android N Developer Preview runs in a secure, <i>Direct Boot</i> mode
+<p>Android N runs in a secure, <i>Direct Boot</i> mode
 when the device has been powered on but the user has not unlocked the
 device. To support this, the system provides two storage locations for data:</p>
 
@@ -143,7 +143,7 @@
 <p class="caution"><strong>Caution:</strong> Enabling Direct Boot
 wipes all user data on the device.</p>
 
-<p>On supported devices with Android N Developer Preview installed, enable
+<p>On supported devices with Android N installed, enable
 Direct Boot by doing one of the following:</p>
 
 <ul>
diff --git a/docs/html/preview/features/icu4j-framework.jd b/docs/html/preview/features/icu4j-framework.jd
index cef1950..edc7759 100644
--- a/docs/html/preview/features/icu4j-framework.jd
+++ b/docs/html/preview/features/icu4j-framework.jd
@@ -29,15 +29,15 @@
 
 <p>
   ICU4J is an open-source, widely used set of Java libraries providing Unicode
-  and globalization support for software applications. The N Developer Preview
+  and globalization support for software applications. Android N
   exposes a subset of the ICU4J APIs in the Android framework for app developers
   to use under the {@code android.icu} package. These APIs use
   localization data present on the device. As a result, you can reduce your APK
   footprint by not compiling the ICU4J libraries into your APK; instead, you can
   simply call out to them in the framework. (In this case, you may want to provide
   <a href="{@docRoot}google/play/publishing/multiple-apks.html">multiple versions
-  of your APK</a>, so users running versions of Android lower than the N Developer
-  Preview can download a version of the app that contains the ICU4J libraries.)
+  of your APK</a>, so users running versions of Android lower than Android N
+  can download a version of the app that contains the ICU4J libraries.)
 </p>
 
 <p>
@@ -50,17 +50,17 @@
 <h2 id="relation">Relationship to ICU4J</h2>
 
 <p>
-  The Preview exposes a subset of the ICU4J APIs via the
+  Android N exposes a subset of the ICU4J APIs via the
   <code>android.icu</code> package, rather than <code>com.ibm.icu</code>. The
   Android framework may choose not to
-  expose ICU4J APIs for various reasons; for example, the N Preview does not expose
+  expose ICU4J APIs for various reasons; for example, Android N does not expose
   some deprecated APIs or those that the ICU team have not yet declared as
   stable. As the ICU team deprecates APIs in the future, Android will also mark
   them as deprecated but will continue to include them.
 </p>
 
 <p class="table-caption"><strong>Table 1.</strong> ICU and CLDR versions used
-  in the Preview.</p>
+  in Android N.</p>
 <table>
 <tr>
 <th>Android API level</th>
@@ -68,7 +68,7 @@
 <th>CLDR version</th>
 </tr>
 <tr>
-<td>N Developer Preview</td>
+<td>Android N</td>
 <td>56</td>
 <td>28</td>
 </tr>
diff --git a/docs/html/preview/features/multi-window.jd b/docs/html/preview/features/multi-window.jd
index 0f68c82..17475b4 100644
--- a/docs/html/preview/features/multi-window.jd
+++ b/docs/html/preview/features/multi-window.jd
@@ -1,5 +1,5 @@
 page.title=Multi-Window Support
-page.metaDescription=New support in the N Developer Preview for showing more than one app at a time.
+page.metaDescription=New support in Android N for showing more than one app at a time.
 page.keywords="multi-window", "android N", "split screen", "free-form"
 
 @jd:body
@@ -25,7 +25,7 @@
 </div>
 
 <p>
-  The N Developer Preview adds support for displaying more than one app at the
+  Android N adds support for displaying more than one app at the
   same time. On handheld devices, two apps can run side-by-side or
   one-above-the-other in <em>split-screen</em> mode. On TV devices, apps can
   use <em>picture-in-picture</em> mode to continue video playback while users
@@ -43,20 +43,20 @@
 <h2 id="overview">Overview</h2>
 
 <p>
-  The N Developer Preview allows several apps to share the screen at once. For
+  Android N allows several apps to share the screen at once. For
   example, a user could split the screen, viewing a web page on the left side
   while composing an email on the right side. The user experience depends on
   the device:
 </p>
 
 <ul>
-  <li>Handheld devices running the N Developer Preview offer split-screen
+  <li>Handheld devices running Android N offer split-screen
   mode. In this mode, the system fills the screen with two apps, showing them
   either side-by-side or one-above-the-other. The user can drag the dividing
   line separating the two to make one app larger and the other smaller.
   </li>
 
-  <li>On Nexus Player running the N Developer Preview, apps can put themselves
+  <li>On Nexus Player running Android N, apps can put themselves
   in <a href="picture-in-picture.html">picture-in-picture mode</a>, allowing
   them to continue showing content while the user browses or interacts with
   other apps.
@@ -160,7 +160,7 @@
 <h2 id="configuring">Configuring Your App for Multi-Window Mode</h2>
 
 <p>
-  If your app targets the N Developer Preview, you can configure how and
+  If your app targets Android N, you can configure how and
   whether your app's activities support multi-window display. You can set
   attributes in your manifest to control both size and layout.
   A root activity's attribute settings apply to all activities
@@ -169,7 +169,7 @@
 
 <p class="note">
   <strong>Note:</strong> If you build a multi-orientation app with a version of the
-  SDK earlier than the N Developer Preview, and the user uses the app in
+  SDK lower than Android N, and the user uses the app in
   multi-window mode, the system forcibly resizes the app. The system presents a
   dialog box warning the user that the app may behave unexpectedly. The system
   does <em>not</em> resize fixed-orientation apps; if
@@ -197,7 +197,7 @@
 </p>
 
 <p>
-  If your app targets the N Developer Preview, but you do not specify a value
+  If your app targets Android N, but you do not specify a value
   for this attribute, the attribute's value defaults to true.
 </p>
 
@@ -216,7 +216,7 @@
 <h3 id="layout">Layout attributes</h3>
 
 <p>
-  With the N Developer Preview, the <code>&lt;layout&gt;</code> manifest element
+  With Android N, the <code>&lt;layout&gt;</code> manifest element
   supports several attributes that affect how an activity behaves in
   multi-window mode:
 </p>
@@ -277,7 +277,7 @@
 <h2 id="running">Running Your App in Multi-Window Mode</h2>
 
 <p>
-  The N Developer Preview offers new functionality to support apps that can run
+  Android N offers new functionality to support apps that can run
   in multi-window mode.
 </p>
 
@@ -476,15 +476,15 @@
 <h2 id="testing">Testing Your App's Multi-Window Support</h2>
 
 <p>
-  Whether or not you update your app for the N Developer Preview, you should
+  Whether or not you update your app for Android N, you should
   verify how it behaves in multi-window mode in case a user tries to launch it
-  in multiwindow mode on a device running the N Developer Preview.
+  in multiwindow mode on a device running Android N.
 </p>
 
 <h3 id="configuring">Configuring a Test Device</h3>
 
 <p>
-  If you install the N Developer Preview on a device, split-screen mode is
+  If you install Android N on a device, split-screen mode is
   automatically supported.
 </p>
 
@@ -498,7 +498,7 @@
 
 <p>
   If your app does not declare a fixed orientation, you should launch your app
-  on a device running the N Developer Preview and attempt to put the app in
+  on a device running Android N and attempt to put the app in
   split-screen mode. Verify that the user experience is
   acceptable when the app is forcibly resized.
 </p>
@@ -586,7 +586,7 @@
 <p>
   If you disabled multi-window support by setting
   <code>android:resizableActivity="false"</code>, you should launch your app on
-  a device running the N Developer Preview and attempt to put the app in
+  a device running Android N and attempt to put the app in
   freeform and split-screen modes. Verify that when you do so, the app remains
   in full-screen mode.
 </p>
diff --git a/docs/html/preview/features/multilingual-support.jd b/docs/html/preview/features/multilingual-support.jd
index aadc940..855f93e 100644
--- a/docs/html/preview/features/multilingual-support.jd
+++ b/docs/html/preview/features/multilingual-support.jd
@@ -15,8 +15,8 @@
 </div>
 </div>
 
-<p>Android N Developer Preview provides enhanced support for multilingual users,
-allowing them to select multiple locales in settings. The  Preview
+<p>Android N provides enhanced support for multilingual users,
+allowing them to select multiple locales in settings. Android N
 provides this capability by greatly expanding the number of locales supported
 and changing the way the system resolves resources. The new method of resolving
 resources is more robust and designed to be compatible with existing APKs, but
@@ -27,13 +27,13 @@
 languages that you didn't explicitly design it to support.</p>
 
 <p>This document starts by explaining the resource resolution strategy prior to
-the Preview. Next, it describes the Preview's improved
+Android N. Next, it describes Android N's improved
 resource-resolution strategy. Last, it explains how to take advantage of
 the expanded number of locales to support more multilingual users.</p>
 
 <h2 id="preN">Challenges in Resolving Language Resources</h2>
 
-<p>Prior to this Preview, Android could not always successfully
+<p>Prior to Android N, Android could not always successfully
  match app and system locales. For example, suppose that your app's default language
   is US English, but that it also has Spanish strings localized in {@code es_ES}
   resource files.</p>
@@ -81,11 +81,11 @@
 
 <p>In this example, the system displays English strings without
 knowing whether the user can understand English. This behavior is pretty common
-today. The Preview should substantially reduce the frequency
+today. Android N should substantially reduce the frequency
 of outcomes like this one.</p>
 
 <h2 id="postN">Improvements to Resource-Resolution Strategy</h2>
-<p>The Preview brings more robust resource resolution, and
+<p>Android N brings more robust resource resolution, and
 finds better fallbacks automatically. However, to speed up resolution and improve
  maintainability, you should store resources in the most common parent dialect.
  For example, if you were storing Spanish resources in the {@code es-US} directory
@@ -98,7 +98,7 @@
 
 <h3>Resource resolution examples</h3>
 
-<p>With this Preview, the case described in <strong>Table 1</strong> is resolved
+<p>With Android N, the case described in <strong>Table 1</strong> is resolved
 differently:</p>
 
 <p class="table-caption" id="t-improved-res">
@@ -184,7 +184,7 @@
 <h2 id="design">Designing your App to Support Additional Locales</h2>
 <h3>LocaleList API</h3>
 
-<p>The Preview adds a new API {@code LocaleList.GetDefault()}
+<p>Android N adds a new API {@code LocaleList.GetDefault()}
 that lets apps directly query the list of languages a user has specified. This API
 allows you to create more sophisticated
  app behavior and better-optimized display of content. For example, Search
@@ -205,7 +205,7 @@
 confusing experience for end users.  Therefore, when developing for Android N
 make sure to use formatters instead of hard coding numbers and date strings.</p>
 
-<p>A prime example is Arabic, whose support the Android N expands from
+<p>A prime example is Arabic, whose support Android N expands from
 one {@code ar_EG} to 27 Arabic locales. These locales can share most resources,
 but some prefer ASCII digits, while others prefer native digits. For example,
 when you want to create a sentence with a digit variable, such as
diff --git a/docs/html/preview/features/notification-updates.jd b/docs/html/preview/features/notification-updates.jd
index cf114ba..a10b556 100644
--- a/docs/html/preview/features/notification-updates.jd
+++ b/docs/html/preview/features/notification-updates.jd
@@ -20,24 +20,23 @@
 </div>
 </div>
 
-<p>The Android N Developer Preview introduces several new APIs that allow apps to post
+<p>Android N introduces several new APIs that allow apps to post
 notifications that are highly visible and interactive.</p>
 
-<p>The Preview extends the existing {@link android.support.v4.app.RemoteInput}
+<p>Android N extends the existing {@link android.support.v4.app.RemoteInput}
 notification API to support inline replies on handsets. This feature allows users
  to quickly respond from the notification shade without visiting your app.</p>
 
 <p>
-  The Preview also allows you to bundle similar notifications to
-  appear as a single notification. To make this possible, the
-  Preview uses the existing {@link
+  Android N also allows you to bundle similar notifications to
+  appear as a single notification. To make this possible, Android N uses the existing {@link
   android.support.v4.app.NotificationCompat.Builder#setGroup
   NotificationCompat.Builder.setGroup()} method. Users can expand each of the
   notifications, and perform actions such as reply and dismiss on each of the
   notifications, individually from the notification shade.
 </p>
 
-<p>Last, the Preview also adds two new custom view style APIs that
+<p>Last, Android N also adds two new custom view style APIs that
 allow you to leverage system decorations in your app’s customized notification
 views.</p>
 
@@ -46,7 +45,7 @@
 
 <h2 id="direct">Direct Reply</h2>
 
-<p>With the Direct Reply feature in the Preview, users can quickly
+<p>With the Direct Reply feature in Android N, users can quickly
 respond to text messages or update task lists directly within the notification
 interface. On a handheld, the inline reply action appears as an additional button
  attached to the notification. When a user replies via keyboard, the system attaches
@@ -57,7 +56,7 @@
 
 <img id="fig-reply-button" src="{@docRoot}preview/images/inline-reply.png">
 <p class="img-caption">
-  <strong>Figure 1.</strong> The Preview adds the <strong>Reply</strong>
+  <strong>Figure 1.</strong> Android N adds the <strong>Reply</strong>
   action button.
 </p>
 
@@ -184,7 +183,7 @@
 
 <h2 id="bundle">Bundled Notifications</h2>
 
-<p>The Preview provides developers with a new way to represent
+<p>Android N provides developers with a new way to represent
  a queue of notifications: <em>bundled notifications</em>. This is similar to the
   <a href="{@docRoot}/training/wearables/notifications/stacks.html">Notification
   Stacks</a> feature in Android Wear. For example, if your app creates notifications
@@ -257,9 +256,9 @@
 </p>
 
 <p class="note">
-  <strong>Note:</strong> This version of the N Developer Preview does not yet
+  <strong>Note:</strong> This version of Android N does not yet
   suppress the summary for notification groups containing a single child. This
-  functionality will be added in a later version of the N Developer Preview.
+  functionality will be added in a later version of Android N.
 </p>
 
 <h3>Peeking notifications</h3>
@@ -274,9 +273,9 @@
 
 <h3>Backwards compatibility</h3>
 
-<p>On handhelds, notification groups are available beginning from this
-Preview. However, on tablets, the notification groups API has been available since
-Android Android 5.0 (API level 21). </p>
+<p>On handhelds, notification groups are available beginning from
+Android N. However, on tablets, the notification groups API has been available since
+Android 5.0 (API level 21). </p>
 
 <p>All Android Wear devices have this feature, regardless of API level.
  The only action a Wear developer must take is to verify that the app behavior
@@ -291,7 +290,7 @@
  </p>
 
 <h2 id="custom"> Custom Views</h2>
-<p>Starting from this Preview, you can customize notification views and
+<p>Starting from Android N, you can customize notification views and
 still obtain system decorations like notification headers, actions, and expandable
 layouts.</p>
 
diff --git a/docs/html/preview/features/picture-in-picture.jd b/docs/html/preview/features/picture-in-picture.jd
index b5a0762..1cd8f61 100644
--- a/docs/html/preview/features/picture-in-picture.jd
+++ b/docs/html/preview/features/picture-in-picture.jd
@@ -29,7 +29,7 @@
 </div>
 </div>
 
-<p>In the Android N Developer Preview, Android TV users can now watch a video
+<p>In Android N, Android TV users can now watch a video
 in a pinned window in a corner of the screen when navigating within
 apps. Picture-in-picture (PIP) mode lets apps run a video
 activity in the pinned window while another activity continues in the
@@ -62,7 +62,7 @@
 video visible in a corner of the screen while the user browses content
 on the main screen.</p>
 
-<p>PIP leverages the multi-window APIs available in the N Developer Preview to
+<p>PIP leverages the multi-window APIs available in Android N to
 provide the pinned video overlay window. To add PIP to your app, you need to
 register your activities that support PIP, switch your activity to PIP mode as
 needed, and make sure UI elements are hidden and video playback continues when
@@ -118,7 +118,7 @@
 <p class="img-caption"><strong>Figure 1.</strong> A Picture-in-picture
 button on a media control bar.</p>
 
-<p>The N Developer Preview includes a new
+<p>Android N includes a new
 <code>PlaybackControlsRow.PictureInPictureAction</code> class which defines
 control bar PIP actions and uses the PIP icon.</p>
 
diff --git a/docs/html/preview/features/scoped-folder-access.jd b/docs/html/preview/features/scoped-folder-access.jd
index f625978..92c7966 100644
--- a/docs/html/preview/features/scoped-folder-access.jd
+++ b/docs/html/preview/features/scoped-folder-access.jd
@@ -32,7 +32,7 @@
 external directory.</li>
 </ul>
 
-<p>The Android N Developer Preview provides a new simplified API to access
+<p>Android N provides a new simplified API to access
 common external storage directories. </p>
 
 <h2 id="accessing">Accessing an External Storage Directory</h2>
diff --git a/docs/html/preview/features/security-config.jd b/docs/html/preview/features/security-config.jd
index d7aef2d..1e9a90e 100644
--- a/docs/html/preview/features/security-config.jd
+++ b/docs/html/preview/features/security-config.jd
@@ -27,7 +27,7 @@
 
 
 <p>
-  The Android N Developer Preview includes a Network Security Configuration
+  Android N includes a Network Security Configuration
   feature that lets apps customize their network security settings in a safe,
   declarative configuration file without modifying app code. These settings can
   be configured for specific domains and for a specific app. The key
diff --git a/docs/html/preview/features/tv-recording-api.jd b/docs/html/preview/features/tv-recording-api.jd
index 83baf94..6b49fbc 100644
--- a/docs/html/preview/features/tv-recording-api.jd
+++ b/docs/html/preview/features/tv-recording-api.jd
@@ -18,7 +18,7 @@
 </div>
 
 <p>TV input services let the user pause and resume channel playback via
-time-shifting APIs. The Android N Developer Preview expands on time-shifting
+time-shifting APIs. Android N expands on time-shifting
 by letting the user save multiple recorded sessions.</p>
 
 <p>Users can schedule recordings in advance, or start a recording as they watch
diff --git a/docs/html/preview/guide.jd b/docs/html/preview/guide.jd
index e768ba0..28c0fe9 100644
--- a/docs/html/preview/guide.jd
+++ b/docs/html/preview/guide.jd
@@ -17,7 +17,7 @@
 </div>
 
 <p>
-  The Android M Developer Preview gives you an opportunity to ensure your apps work with the next
+  Android N gives you an opportunity to ensure your apps work with the next
   version of the platform. This preview includes a number of APIs and behavior changes that can
   impact your app, as described in the <a href="{@docRoot}preview/api-overview.html">API
   Overview</a> and <a href="{@docRoot}preview/behavior-changes.html">Behavior Changes</a>. In testing
@@ -41,7 +41,8 @@
 
 <p>
   For more information about how to set up devices or virtual devices with a preview system image
-  for testing, see <a href="{@docRoot}preview/setup-sdk.html">Set up the Preview SDK</a>.
+  for testing, see <a href="{@docRoot}preview/setup-sdk.html">Set up
+the Android N SDK</a>.
 </p>
 
 
@@ -105,7 +106,8 @@
   paths that use the permission-protected services. You can do this through a combination of
   testing on the new platform and code analysis. In testing, you should focus on opting in to
   runtime permissions by changing the app’s {@code targetSdkVersion} to the preview version. For
-  more information, see <a href="{@docRoot}preview/setup-sdk.html#">Set up the Preview SDK</a>.
+  more information, see <a href="{@docRoot}preview/setup-sdk.html#">Set up
+the Android N SDK</a>.
 </p>
 
 <p>
@@ -138,7 +140,7 @@
 <p>To test Doze with your app:</p>
 
 <ol>
-<li>Configure a hardware device or virtual device with a M Preview system image.</li>
+<li>Configure a hardware device or virtual device with an Android N system image.</li>
 <li>Connect the device to your development machine and install your app.</li>
 <li>Run your app and leave it active.</li>
 <li>Simulate the device going into Doze mode by running the following commands:
@@ -160,7 +162,7 @@
 <p>To test the App Standby mode with your app:</p>
 
 <ol>
-  <li>Configure a hardware device or virtual device with a M Preview system image.</li>
+  <li>Configure a hardware device or virtual device with an Android N system image.</li>
   <li>Connect the device to your development machine and install your app.</li>
   <li>Run your app and leave it active.</li>
   <li>Simulate the app going into standby mode by running the following commands:
diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd
index 778487d..337f6d7 100644
--- a/docs/html/preview/index.jd
+++ b/docs/html/preview/index.jd
@@ -37,7 +37,7 @@
         </a><!--<br>
         <a class="dac-hero-cta" href="{@docRoot}preview/support.html">
           <span class="dac-sprite dac-auto-chevron"></span>
-          Update to Developer Preview (final SDK)
+          Update to Android N (final SDK)
         </a><br>-->
       </div>
       <div class="col-9of16 col-pull-7of16 dac-hero-figure" style="margin-top:1.5em;padding-right:1.5em;">
diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd
index bb056f7..4e210b9 100644
--- a/docs/html/preview/overview.jd
+++ b/docs/html/preview/overview.jd
@@ -333,7 +333,8 @@
 </p>
 
 <ul>
-  <li> <a href="{@docRoot}preview/setup-sdk.html">Setting Up the SDK</a> has
+  <li> <a href="{@docRoot}preview/setup-sdk.html">Set Up to Develop for
+Android N</a> has
   step-by-step instructions for getting started.</li>
   <li> <a href="{@docRoot}preview/testing/guide.html">Testing Guide</a>
   and <a href="{@docRoot}preview/behavior-changes.html">Behavior
@@ -447,10 +448,10 @@
   href="{@docRoot}preview/setup-sdk.html">Setting up the Preview SDK</a>
   and configuring test devices.</li>
   <li> Follow the <a href="https://developers.google.com/android/nexus/images">flashing
-  instructions</a> to flash the latest N Developer Preview system image for Nexus 5X,
+  instructions</a> to flash the latest Android N system image for Nexus 5X,
   6, 6P, 9, Pixel C, and Player. </li>
   <li> Review the <a href="{@docRoot}reference/packages.html">API Reference</a>
-  and <a href="{@docRoot}preview/samples.html">M Preview samples</a> to gain more
+  and <a href="{@docRoot}preview/samples.html">Android N samples</a> to gain more
   insight into new API features and how to use them in your app.
   <li> Join the <a href="https://developer.android.com/preview/dev-community">Android N
   Developer Community</a> to get the latest news and connect with other
@@ -459,4 +460,4 @@
 
 <p>
   Thank you for your participation in the Android N Developer Preview program!
-</p>
\ No newline at end of file
+</p>
diff --git a/docs/html/preview/run-app.jd b/docs/html/preview/run-app.jd
index 226183c..25ab7aa 100644
--- a/docs/html/preview/run-app.jd
+++ b/docs/html/preview/run-app.jd
@@ -1,4 +1,4 @@
-page.title=Run Your App on the N Preview
+page.title=Run Your App on Android N
 meta.keywords="preview", "android"
 page.tags="preview", "developer preview"
 page.image=images/cards/card-n-sdk_2x.png
@@ -14,29 +14,28 @@
   </div>
 </div>
 
-<p>If you have an existing Android app and you simply want to run it on the N
-Preview system image, then you need either a virtual device or a supported
-hardware device configured with N Preview system image.</p>
+<p>If you have an existing Android app and you simply want to run it on the
+Android N system image, then you need either a virtual device or a supported
+hardware device configured with an Android N system image.</p>
 
-<p>Simply installing your app onto the N Preview this way does not require
+<p>Simply installing your app onto Android N this way does not require
 any changes to your app source code. If, however, you want to update your
-app to use new APIs in the N Preview and new language features of Java 8,
+app to use new APIs in Android N and new language features of Java 8,
 then you need to download Android Studio 2.1 (preview) as described in
-<a href="{@docRoot}preview/setup-sdk.html">Set Up to Develop for the
-N Preview</a>.
+<a href="{@docRoot}preview/setup-sdk.html">Set Up to Develop for Android N</a>.
 
-<p>So, although Android Studio 2.1 is required for development with N Preview
+<p>So, although Android Studio 2.1 is required for development with Android N
 APIs, you can use Android Studio 1.5 or higher if you simply want to run your
 app in the emulator or a connected device.</p>
 
 
 <h2 id="setupAVD">Set up a Virtual Device</h2>
 
-<p>To use the Android Emulator to run the N Preview you need to download
+<p>To use the Android Emulator to run Android N you need to download
 the Android N Preview SDK and create a virtual device for the emulator.
 </p>
 
-<p>First, downloaded the Android N Preview SDK as follows (if you
+<p>First, download the Android N Preview SDK as follows (if you
 already got it while <a href="{@docRoot}preview/setup-sdk.html">setting up
 Android Studio 2.1</a>, you can skip this part):
 
@@ -62,7 +61,7 @@
 </ol>
 
 
-<p>Now create a virtual device with the N Preview system image:</p>
+<p>Now create a virtual device with the Android N system image:</p>
 
 <ol>
   <li>Open the AVD Manager by selecting <strong>Tools > Android >
@@ -87,7 +86,7 @@
 <h2 id="setup-device">Set Up a Hardware Device</h2>
 
 <p>If you have a Nexus 5X, Nexus 6P, Nexus 9, Pixel C, or Nexus Player, you can
-install the N Preview for testing your app.</p>
+install Android N for testing your app.</p>
 
 <p class="caution">
   <strong>Important:</strong> Installing a preview image on a device
diff --git a/docs/html/preview/samples.jd b/docs/html/preview/samples.jd
index 1222095..ad43dc0 100644
--- a/docs/html/preview/samples.jd
+++ b/docs/html/preview/samples.jd
@@ -4,7 +4,7 @@
 @jd:body
 
 <p>
-  The following code samples are provided for the N Developer Preview. To
+  The following code samples are provided for Android N. To
   download the samples in Android Studio, select the <b>File &gt; Import
   Samples</b> menu option.
 </p>
@@ -29,7 +29,7 @@
 <h3 id="notifications">Notifications</h3>
 <p>
   This sample is updated to demonstrates how to take advantage of new
-  notifications features available in the N Developer Preview.
+  notifications features available in Android N.
 </p>
 <p>
   <a href="https://github.com/googlesamples/android-Notifications">
diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd
index 7c6d251..710c8d6 100644
--- a/docs/html/preview/setup-sdk.jd
+++ b/docs/html/preview/setup-sdk.jd
@@ -1,4 +1,4 @@
-page.title=Set Up to Develop for the N Preview
+page.title=Set Up to Develop for Android N
 meta.keywords="preview", "android"
 page.tags="preview", "developer preview"
 page.image=images/cards/card-n-sdk_2x.png
@@ -10,7 +10,7 @@
   <div id="qv">
 <ol>
   <li><a href="#get-as13">Get Android Studio 2.1</a></li>
-  <li><a href="#get-sdk">Get the N Preview SDK</a></li>
+  <li><a href="#get-sdk">Get the Android N SDK</a></li>
   <li><a href="#java8">Get the Java 8 JDK and JRE</a></li>
   <li><a href="#create-update">Update or Create a Project</a></li>
   <li><a href="#next">Next Steps</a></li>
@@ -19,18 +19,18 @@
 </div>
 
 <p>
-To develop apps for Android using new APIs in the N Preview and new language
+To develop apps for Android using new APIs in Android N and new language
 features of Java 8, you need to set up Android Studio 2.1 (preview) as described
 on this page.</p>
 
 <p>If you instead want to simply test your app's forward-compatibility on the
-Android N Preview system image, you can instead follow the guide to <a
-href="{@docRoot}preview/run-app.html">Run Your App on the N Preview</a>.</p>
+Android N system image, you can instead follow the guide to <a
+href="{@docRoot}preview/run-app.html">Run Your App on Android N</a>.</p>
 
 
 <h2 id="get-as13">Get Android Studio 2.1 (preview)</h2>
 
-<p>Developing for the Android N Preview platform requires Java 8 and a new
+<p>Developing for the Android N platform requires Java 8 and a new
 compiler toolchain called JACK, which is currently supported only in
 Android Studio 2.1.
 </p>
@@ -39,7 +39,7 @@
 release channel&mdash;it is still in development. If you already
 have Android Studio and don't want to update to the canary channel, you can
 download Android Studio 2.1 as a separate installation and use it
-for use with the N Preview, leaving your primary Android Studio environment
+with Android N, leaving your primary Android Studio environment
 unaffected.</p>
 
 <p>To download Android Studio 2.1 as a separate installation, follow these
@@ -104,7 +104,7 @@
 <p>In addition to these preview components, you should download the
 N Preview developer docs from the following table. This is an offline version
 of the developer.android.com web site, except it includes the updated
-API reference for the N Preview APIs and an API difference report.</p>
+API reference for the Android N APIs and an API difference report.</p>
 
 <table id="docs-dl">
   <tr>
@@ -127,8 +127,8 @@
 <h2 id="java8">Get the Java 8 JDK and JRE</h2>
 
 <p>
-  The Java 8 Development Kit (JDK) is required to develop apps with the Android
-  N Preview, and the Java 8 Runtime Environment (JRE) is required to run some
+  The Java 8 Development Kit (JDK) is required to develop apps with Android
+  N, and the Java 8 Runtime Environment (JRE) is required to run some
   tools included in Android Studio 2.1.
 </p>
 <p>So, if you don't have the latest version of each already,
@@ -153,7 +153,7 @@
 <h2 id="create-update">Update or Create a Project</h2>
 
 <p>
-  To use the N Preview APIs, your project must be configured appropriately.
+  To use the Android N APIs, your project must be configured appropriately.
 </p>
 
 
@@ -200,8 +200,8 @@
 
 <p>Now that you've set up Android Studio 2.1 (preview), follow the guide
 to <a
-href="{@docRoot}preview/run-app.html">Run Your App on the N Preview</a>.
-And learn more about the Android N Preview platform with 
+href="{@docRoot}preview/run-app.html">Run Your App on Android N</a>.
+And learn more about the Android N platform with 
 <a href="{@docRoot}preview/behavior-changes.html">Behavior Changes</a>
 and <a href="{@docRoot}preview/api-overview.html">Android N APIs
 and Features</a>.</p>
diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
index 66d3877..f776e44 100644
--- a/docs/html/preview/support.jd
+++ b/docs/html/preview/support.jd
@@ -8,8 +8,8 @@
 
 <p>
   Two primary support channels are available to you when developing and testing
-  with the Android N Developer Preview. If you've encountered bugs or have
-  feedback about the N Developer Preview, you can <a href=
+  with Android N. If you've encountered bugs or have
+  feedback about Android N, you can <a href=
   "https://code.google.com/p/android-developer-preview/">create an issue</a>
   <strong>***NEED LINK***</strong> on
   our issue tracker. We'll triage the issue for further review and provide
@@ -69,7 +69,7 @@
 
   <li>Android for Work:
     <ul>
-      <li>After migrating to (or creation on) N Developer Preview, work
+      <li>After migrating to (or creation on) Android N, work
       profiles can't create keys in keystore until the pattern/PIN/password is
       changed or a Work Challenge is set up.
       </li>
@@ -116,11 +116,11 @@
 </p>
 
 <h3 id="preview1-get">
-  Get the N Developer Preview
+  Get Android N
 </h3>
 
 <p>
-  You can download the N Developer Preview platform and emulator images from
+  You can download Android N platform and emulator images from
   the SDK Manager. <strong>***Is this true?***</strong>
 </p>