diff --git a/pdk/docs/guide/audio.jd b/pdk/docs/guide/audio.jd
index 0467d89..14e80bb 100755
--- a/pdk/docs/guide/audio.jd
+++ b/pdk/docs/guide/audio.jd
@@ -23,7 +23,7 @@
 
 <a name="androidAudioBuildingDriver"></a><h3>Building an Audio Library</h3>
 
-<p>To implement an audio driver, create a shared library that implements the interface defined in <code>AudioHardwareInterface.h</code>. You must name your shared library <code>libaudio.so</code> so that it will get loaded from <code>/system/lib</code> at runtime.  Place libaudio sources and <code>Android.mk</code> in <code>partner/acme/chipset_or_board/libaudio/</code>.</p>
+<p>To implement an audio driver, create a shared library that implements the interface defined in <code>AudioHardwareInterface.h</code>. You must name your shared library <code>libaudio.so</code> so that it will get loaded from <code>/system/lib</code> at runtime.  Place libaudio sources and <code>Android.mk</code> in <code>vendor/acme/chipset_or_board/libaudio/</code>.</p>
 <p>The following stub <code>Android.mk</code> file ensures that <code>libaudio</code> compiles and links to the appropriate libraries:</p>
 
 <pre class="prettify">
diff --git a/pdk/docs/guide/camera.jd b/pdk/docs/guide/camera.jd
index f4c9c85..083f43a 100755
--- a/pdk/docs/guide/camera.jd
+++ b/pdk/docs/guide/camera.jd
@@ -21,7 +21,7 @@
 
 <a name="androidCameraBuildingDriver"></a><h3>Building a Camera Library</h3>
 
-<p>To implement a camera driver, create a shared library that implements the interface defined in <code>CameraHardwareInterface.h</code>. You must name your shared library <code>libcamera.so</code> so that it will get loaded from <code>/system/lib</code> at runtime.  Place libcamera sources and <code>Android.mk</code> in <code>partner/acme/chipset_or_board/libcamera/</code>.</p>
+<p>To implement a camera driver, create a shared library that implements the interface defined in <code>CameraHardwareInterface.h</code>. You must name your shared library <code>libcamera.so</code> so that it will get loaded from <code>/system/lib</code> at runtime.  Place libcamera sources and <code>Android.mk</code> in <code>vendor/acme/chipset_or_board/libcamera/</code>.</p>
 <p>The following stub <code>Android.mk</code> file ensures that <code>libcamera</code> compiles and links to the appropriate libraries:</p>
 <pre class="prettify">
 LOCAL_PATH := $(call my-dir)
diff --git a/pdk/docs/guide/gps.jd b/pdk/docs/guide/gps.jd
index 3af7d7d..f2ce11c 100755
--- a/pdk/docs/guide/gps.jd
+++ b/pdk/docs/guide/gps.jd
@@ -18,7 +18,7 @@
 
 <a name="androidGPSBuildingDriver"></a><h3>Building a GPS Library</h3>
 
-<p>To implement a GPS driver, create a shared library that implements the interface defined in <code>gps.h</code>. You must name your shared library <code>libgps.so</code> so that it will get loaded from <code>/system/lib</code> at runtime. Place GPS sources and Android.mk in <code>partner/acme/chipset_or_board/gps/</code> (where "acme" is your product name and "chipset_or_board" is your hardware target).</p>
+<p>To implement a GPS driver, create a shared library that implements the interface defined in <code>gps.h</code>. You must name your shared library <code>libgps.so</code> so that it will get loaded from <code>/system/lib</code> at runtime. Place GPS sources and Android.mk in <code>vendor/acme/chipset_or_board/gps/</code> (where "acme" is your organization name and "chipset_or_board" is your hardware target).</p>
 
 <p>The following stub <code>Android.mk</code> file ensures that <code>libgps</code> compiles and links to the appropriate libraries:</p>
 
diff --git a/pdk/docs/guide/intro_source_code.jd b/pdk/docs/guide/intro_source_code.jd
index 100f3ee..d391b0f 100755
--- a/pdk/docs/guide/intro_source_code.jd
+++ b/pdk/docs/guide/intro_source_code.jd
@@ -163,7 +163,7 @@
 
 <p>You can develop Android applications with the same standard tools you use to develop any Java application. The Android core libraries provide the functionality needed to build rich mobile applications and the Android development tools are designed to simplify running, debugging, and testing your applications.</p>
 
-<p>Add project-specific source code to the Android source tree under the <code>partner</code> directory in a directory specific to the application or service you are building. For example, all Google-specific applications would be placed under <code>device/partner/google/</code>.  A Google search application would be placed under <code>device/partner/google/apps/Search</code>.
+<p>Add project-specific source code to the Android source tree under the <code>partner</code> directory in a directory specific to the application or service you are building. For example, all Google-specific applications would be placed under <code>vendor/google/</code>.  A Google search application would be placed under <code>vendor/google/apps/Search</code>.
 <p>See <a href="build_new_device.html">Building Android for a new Mobile Device</a> for detailed instructions.</p>