diff --git a/src/compatibility/index.md b/src/compatibility/index.md
index da38918..3edc47d 100644
--- a/src/compatibility/index.md
+++ b/src/compatibility/index.md
@@ -21,10 +21,10 @@
 platform.
 
 The Android Compatibility Program defines the technical details of Android
-platform and provides tools used by OEMs to ensure that developers’ apps run
+platform and provides tools used by OEMs to ensure that developers' apps run
 on a variety of devices. The Android SDK provides built-in tools that
 Developers use to clearly state the device features their apps require. And
-Android Market shows apps only to those devices that can properly run
+Google Play shows apps only to those devices that can properly run
 them.
 
 These pages describe the Android Compatibility Program and how to get
@@ -73,8 +73,8 @@
 
 # Joining the Ecosystem #
 
-Once you've built a compatible device, you may wish to include Android
-Market to provide your users access to the third-party app ecosystem.
+Once you've built a compatible device, you may wish to include Google
+Play to provide your users access to the third-party app ecosystem.
 Unfortunately, for a variety of legal and business reasons, we aren't able to
-automatically license Android Market to all compatible devices. To inquire
-about access about Android Market, you can [contact us](contact-us.html).
+automatically license Google Play to all compatible devices. To inquire
+about access about Google Play, you can [contact us](contact-us.html).
diff --git a/src/compatibility/overview.md b/src/compatibility/overview.md
index 19e4a94..bd3be2d 100644
--- a/src/compatibility/overview.md
+++ b/src/compatibility/overview.md
@@ -47,7 +47,7 @@
 any other device that is compatible with the same Android platform version.
 Android devices will differ in hardware and software capabilities, so the
 compatibility program also provides the tools needed for distribution systems
-such as Android Market to implement appropriate filtering. This means that
+such as Google Play to implement appropriate filtering. This means that
 users can only see applications which they can actually run.
 
 - *Enable device manufacturers to differentiate while being
diff --git a/src/faqs.md b/src/faqs.md
index df2d126..b272a18 100644
--- a/src/faqs.md
+++ b/src/faqs.md
@@ -181,7 +181,7 @@
 The function of the Android Compatibility Program is to define a baseline
 implementation of Android that is compatible with third-party apps written
 by developers. Devices that are "Android compatible" may participate in the
-Android ecosystem, including Android Market; devices that don't meet the
+Android ecosystem, including Google Play; devices that don't meet the
 compatibility requirements exist outside that ecosystem.
 
 In other words, the Android Compatibility Program is how we separate
@@ -239,9 +239,9 @@
 but if the device isn't compatible, it's not considered part of the Android
 ecosystem.
 
-### What is the role of Android Market in compatibility? ###
+### What is the role of Google Play in compatibility? ###
 
-Devices that are Android compatible may seek to license the Android Market
+Devices that are Android compatible may seek to license the Google Play
 client software. This allows them to become part of the Android app
 ecosystem, by allowing users to download developers' apps from a catalog
 shared by all compatible devices. This option isn't available to devices
@@ -263,22 +263,22 @@
 the 1.6 CDD only allows cell phones, but the 2.1 CDD allows devices to omit
 telephony hardware, allowing for non-phone devices such as tablet-style
 music players to be compatible. As we make these changes, we will also
-augment Android Market to allow developers to retain control over where
+augment Google Play to allow developers to retain control over where
 their apps are available. To continue the telephony example, an app that
-manages SMS text messages would not be useful on a media player, so Android
-Market allows the developer to restrict that app exclusively to phone
+manages SMS text messages would not be useful on a media player, so Google
+Play allows the developer to restrict that app exclusively to phone
 devices.
 
-### If my device is compatible, does it automatically have access to Android Market and branding? ###
+### If my device is compatible, does it automatically have access to Google Play and branding? ###
 
-Android Market is a service operated by Google. Achieving compatibility is
-a prerequisite for obtaining access to the Android Market software and branding.
-Device manufacturers should contact Google to obtain access to Android
-Market.
+Google Play is a service operated by Google. Achieving compatibility is
+a prerequisite for obtaining access to the Google Play software and branding.
+Device manufacturers should contact Google to obtain access to Google
+Play.
 
-### If I am not a manufacturer, how can I get Android Market? ###
+### If I am not a manufacturer, how can I get Google Play? ###
 
-Android Market is only licensed to handset manufacturers shipping devices.
+Google Play is only licensed to handset manufacturers shipping devices.
 For questions about specific cases, contact android-partnerships@google.com.
 
 ### How can I get access to the Google apps for Android, such as Maps? ###
@@ -293,7 +293,7 @@
 No. The Android Compatibility Program is optional. Since the Android source
 code is open, anyone can use it to build any kind of device. However, if a
 manufacturer wishes to use the Android name with their product, or wants
-access to Android Market, they must first demonstrate that the device is
+access to Google Play, they must first demonstrate that the device is
 compatible.
 
 ### How much does compatibility certification cost? ###
@@ -319,7 +319,7 @@
 
 Since Android's code is open-source, we can't prevent someone from using an
 old version to launch a device. Instead, Google chooses not to license the
-Android Market client software for use on versions that are considered
+Google Play client software for use on versions that are considered
 obsolete. This allows anyone to continue to ship old versions of Android,
 but those devices won't use the Android name and will exist outside the
 Android apps ecosystem, just as if they were non-compatible.
@@ -346,13 +346,13 @@
 ### How are device manufacturers' compatibility claims validated? ###
 
 There is no validation process for Android device compatibility. However,
-if the device is to include Android Market, Google will typically validate
-the device for compatibility before agreeing to license the Market client
+if the device is to include Google Play, Google will typically validate
+the device for compatibility before agreeing to license the Google Play client
 software.
 
 ### What happens if a device that claims compatibility is later found to have compatibility problems? ###
 
-Typically, Google's relationships with Android Market licensees allow us to
+Typically, Google's relationships with Google Play licensees allow us to
 ask them to release updated system images that fix the problems.
 
 ## Compatibility Test Suite ##
diff --git a/src/source/life-of-a-bug.md b/src/source/life-of-a-bug.md
index 1dd7d59..4dd9384 100644
--- a/src/source/life-of-a-bug.md
+++ b/src/source/life-of-a-bug.md
@@ -28,8 +28,8 @@
 Android (such as Gmail and so on), we have components set up for their
 convenience. However, these apps are not part of Android, and any issues
 reported on these components are not guaranteed to to receive attention.
-Most notably, to report issues related to Android Market, you should visit the
-[Android Market Support Forum](http://www.google.com/support/forum/p/Android+Market?hl=en).
+Most notably, to report issues related to Google Play, you should visit the
+[Google Play Support Forum](https://support.google.com/googleplay/).
 
 Here's the life of a bug, in a nutshell:
 
diff --git a/src/tech/security/index.md b/src/tech/security/index.md
index 054a70b..dc25907 100644
--- a/src/tech/security/index.md
+++ b/src/tech/security/index.md
@@ -73,16 +73,16 @@
 specific device.
 
 + **User-Installed Applications**: Android provides an open development
-environment supporting any third-party application. The Android Market offers
+environment supporting any third-party application. Google Play offers
 users hundreds of thousands of applications.
 
 Google provides a set of cloud-based services that are available to any
 compatible Android device.  The primary services are:
 
-+ **Android Market**: The Android Market is a collection of services that
++ **Google Play**: Google Play is a collection of services that
 allow users to discover, install, and purchase applications from their Android
-device or the web.  The Market makes it easy for developers to reach Android
-users and potential customers.   The Market also provides community review,
+device or the web.  Google Play makes it easy for developers to reach Android
+users and potential customers.   Google Play also provides community review,
 application [license
 verification](http://developer.android.com/guide/publishing/licensing.html),
 and other security services.
@@ -132,7 +132,7 @@
 + **Open Source and Community Review**: The Android Open Source Project enables
 broad security review by any interested party. Android also uses open source
 technologies that have undergone significant external security review,
-such as the Linux kernel.  The Android Market provides a forum for users and companies
+such as the Linux kernel.  Google Play provides a forum for users and companies
 to provide information about specific applications directly to users.
 + **Incident Response**: Even with all of these precautions, security issues
 may occur after shipping, which is why the Android project has created a
@@ -142,8 +142,8 @@
 issues, the Android team has a response process that enables the rapid
 mitigation of vulnerabilities to ensure that potential risk to all Android
 users is minimized.  These cloud-supported responses can include updating the
-Android platform (over-the-air updates), removing applications from the Android
-Market, and removing applications from devices in the field.
+Android platform (over-the-air updates), removing applications from Google
+Play, and removing applications from devices in the field.
 
 ##Android Platform Security Architecture
 
@@ -526,7 +526,7 @@
 information about applications easily accessible to a wide range of users.  For
 example, unexpected permissions requests can prompt more sophisticated users to
 ask critical questions about application functionality and share their concerns
-in places such as the [Android Market](https://market.android.com) where they
+in places such as [Google Play](htts://play.google.com) where they
 are visible to all users.
 
 <table>
@@ -674,10 +674,10 @@
 update their application without creating complicated interfaces and
 permissions. Every application that is run on the Android platform must be
 signed by the developer.  Applications that attempt to install without being
-signed will rejected by either the Android Market or the package installer on
+signed will rejected by either Google Play or the package installer on
 the Android device.
 
-On Android Market, application signing bridges the trust Google has with the
+On Google Play, application signing bridges the trust Google has with the
 developer and the trust the developer has with their application.  Developers
 know their application is provided, unmodified to the Android device; and
 developers can be held accountable for behavior of their application.