diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java
index 53a54e018..2e3bb5043 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouteProvider.java
@@ -201,13 +201,13 @@ final class SampleMediaRouteProvider extends MediaRouteProvider {
 
                 Uri uri = intent.getData();
                 int queueBehavior = intent.getIntExtra(
-                        MediaControlIntent.EXTRA_STREAM_QUEUE_BEHAVIOR,
-                        MediaControlIntent.STREAM_QUEUE_BEHAVIOR_PLAY_NOW);
+                        MediaControlIntent.EXTRA_ITEM_QUEUE_BEHAVIOR,
+                        MediaControlIntent.ITEM_QUEUE_BEHAVIOR_PLAY_NOW);
                 int position = intent.getIntExtra(
-                        MediaControlIntent.EXTRA_STREAM_POSITION, 0);
-                Bundle metadata = intent.getBundleExtra(MediaControlIntent.EXTRA_STREAM_METADATA);
+                        MediaControlIntent.EXTRA_ITEM_POSITION, 0);
+                Bundle metadata = intent.getBundleExtra(MediaControlIntent.EXTRA_ITEM_METADATA);
                 Bundle headers = intent.getBundleExtra(
-                        MediaControlIntent.EXTRA_STREAM_HTTP_HEADERS);
+                        MediaControlIntent.EXTRA_ITEM_HTTP_HEADERS);
                 String streamId = generateStreamId();
 
                 Log.d(TAG, mRouteId + ": Received play request, uri=" + uri
@@ -219,7 +219,7 @@ final class SampleMediaRouteProvider extends MediaRouteProvider {
                         Toast.LENGTH_LONG).show();
                 if (callback != null) {
                     Bundle result = new Bundle();
-                    result.putString(MediaControlIntent.EXTRA_STREAM_ID, streamId);
+                    result.putString(MediaControlIntent.EXTRA_ITEM_ID, streamId);
                     callback.onResult(ControlRequestCallback.REQUEST_SUCCEEDED, result);
                 }
                 return true;
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
index 215429402..37b22c906 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
@@ -186,7 +186,7 @@ public class SampleMediaRouterActivity extends Activity {
                     switch (result) {
                         case REQUEST_SUCCEEDED: {
                             String streamId = data != null ? data.getString(
-                                    MediaControlIntent.EXTRA_STREAM_ID) : null;
+                                    MediaControlIntent.EXTRA_ITEM_ID) : null;
 
                             Log.d(TAG, "Play request succeeded: streamId=" + streamId);
                             Toast.makeText(SampleMediaRouterActivity.this,