From d3af58bdab5b25acd62cd816363becc7003d3e5a Mon Sep 17 00:00:00 2001
From: magjed <magjed@webrtc.org>
Date: Thu, 22 Sep 2016 09:12:30 -0700
Subject: [PATCH] Rename AppRTCDemo on Android and iOS to AppRTCMobile

The purpose is to make it clearer it is a mobile application.

BUG=webrtc:6359
NOPRESUBMIT=true

Review-Url: https://codereview.webrtc.org/2343403002
Cr-Commit-Position: refs/heads/master@{#14356}
---
 webrtc/BUILD.gn                               |   2 +-
 webrtc/examples/BUILD.gn                      | 190 +++++++++---------
 webrtc/examples/androidapp/README             |   4 +-
 webrtc/examples/androidapp/build.xml          |   2 +-
 .../androidapp/res/values-v21/styles.xml      |   2 +-
 .../org/appspot/apprtc/ConnectActivity.java   |   2 +-
 .../apprtc/UnhandledExceptionHandler.java     |   2 +-
 webrtc/examples/androidjunit/README           |   2 +-
 webrtc/examples/androidtests/README           |  12 +-
 webrtc/examples/androidtests/build.xml        |   2 +-
 .../ARDAppClient+Internal.h                   |   0
 .../ARDAppClient.h                            |   0
 .../ARDAppClient.m                            |   0
 .../ARDAppEngineClient.h                      |   0
 .../ARDAppEngineClient.m                      |   0
 .../ARDBitrateTracker.h                       |   0
 .../ARDBitrateTracker.m                       |   0
 .../ARDCEODTURNClient.h                       |   0
 .../ARDCEODTURNClient.m                       |   0
 .../ARDJoinResponse+Internal.h                |   0
 .../ARDJoinResponse.h                         |   0
 .../ARDJoinResponse.m                         |   0
 .../ARDMessageResponse+Internal.h             |   0
 .../ARDMessageResponse.h                      |   0
 .../ARDMessageResponse.m                      |   0
 .../ARDRoomServerClient.h                     |   0
 .../ARDSDPUtils.h                             |   0
 .../ARDSDPUtils.m                             |   0
 .../ARDSignalingChannel.h                     |   0
 .../ARDSignalingMessage.h                     |   0
 .../ARDSignalingMessage.m                     |   0
 .../ARDStatsBuilder.h                         |   0
 .../ARDStatsBuilder.m                         |   0
 .../ARDTURNClient.h                           |   0
 .../ARDWebSocketChannel.h                     |   0
 .../ARDWebSocketChannel.m                     |   0
 .../RTCIceCandidate+JSON.h                    |   0
 .../RTCIceCandidate+JSON.m                    |   0
 .../RTCIceServer+JSON.h                       |   0
 .../RTCIceServer+JSON.m                       |   0
 .../RTCMediaConstraints+JSON.h                |   0
 .../RTCMediaConstraints+JSON.m                |   0
 .../RTCSessionDescription+JSON.h              |   0
 .../RTCSessionDescription+JSON.m              |   0
 .../common/ARDUtilities.h                     |   0
 .../common/ARDUtilities.m                     |   0
 .../ios/ARDAppDelegate.h                      |   2 +-
 .../ios/ARDAppDelegate.m                      |   0
 .../ios/ARDMainView.h                         |   2 +-
 .../ios/ARDMainView.m                         |   2 +-
 .../ios/ARDMainViewController.h               |   0
 .../ios/ARDMainViewController.m               |   0
 .../ios/ARDStatsView.h                        |   0
 .../ios/ARDStatsView.m                        |   0
 .../ios/ARDVideoCallView.h                    |   0
 .../ios/ARDVideoCallView.m                    |   0
 .../ios/ARDVideoCallViewController.h          |   0
 .../ios/ARDVideoCallViewController.m          |   0
 .../ios/AppRTCMobile-Prefix.pch}              |   4 +-
 .../ios/Info.plist                            |   8 +-
 .../ios/UIImage+ARDUtilities.h                |   0
 .../ios/UIImage+ARDUtilities.m                |   0
 .../{AppRTCDemo => AppRTCMobile}/ios/main.m   |   0
 .../ios/resources/Roboto-Regular.ttf          | Bin
 .../ios/resources/iPhone5@2x.png              | Bin
 .../ios/resources/iPhone6@2x.png              | Bin
 .../ios/resources/iPhone6p@3x.png             | Bin
 .../ios/resources/ic_call_end_black_24dp.png  | Bin
 .../resources/ic_call_end_black_24dp@2x.png   | Bin
 .../ios/resources/ic_clear_black_24dp.png     | Bin
 .../ios/resources/ic_clear_black_24dp@2x.png  | Bin
 .../ic_surround_sound_black_24dp.png          | Bin
 .../ic_surround_sound_black_24dp@2x.png       | Bin
 .../resources/ic_switch_video_black_24dp.png  | Bin
 .../ic_switch_video_black_24dp@2x.png         | Bin
 .../ios/resources/mozart.mp3                  | Bin
 .../mac/APPRTCAppDelegate.h                   |   0
 .../mac/APPRTCAppDelegate.m                   |   0
 .../mac/APPRTCViewController.h                |   0
 .../mac/APPRTCViewController.m                |   0
 .../mac/Info.plist                            |   0
 .../{AppRTCDemo => AppRTCMobile}/mac/main.m   |   0
 .../tests/ARDAppClientTest.mm                 |   0
 .../third_party/SocketRocket/LICENSE          |   0
 .../third_party/SocketRocket/SRWebSocket.h    |   0
 .../third_party/SocketRocket/SRWebSocket.m    |   0
 webrtc/webrtc_examples.gyp                    | 188 ++++++++---------
 87 files changed, 213 insertions(+), 213 deletions(-)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDAppClient+Internal.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDAppClient.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDAppClient.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDAppEngineClient.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDAppEngineClient.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDBitrateTracker.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDBitrateTracker.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDCEODTURNClient.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDCEODTURNClient.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDJoinResponse+Internal.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDJoinResponse.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDJoinResponse.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDMessageResponse+Internal.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDMessageResponse.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDMessageResponse.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDRoomServerClient.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDSDPUtils.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDSDPUtils.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDSignalingChannel.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDSignalingMessage.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDSignalingMessage.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDStatsBuilder.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDStatsBuilder.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDTURNClient.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDWebSocketChannel.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ARDWebSocketChannel.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/RTCIceCandidate+JSON.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/RTCIceCandidate+JSON.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/RTCIceServer+JSON.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/RTCIceServer+JSON.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/RTCMediaConstraints+JSON.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/RTCMediaConstraints+JSON.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/RTCSessionDescription+JSON.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/RTCSessionDescription+JSON.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/common/ARDUtilities.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/common/ARDUtilities.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDAppDelegate.h (89%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDAppDelegate.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDMainView.h (93%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDMainView.m (99%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDMainViewController.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDMainViewController.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDStatsView.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDStatsView.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDVideoCallView.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDVideoCallView.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDVideoCallViewController.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/ARDVideoCallViewController.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo/ios/AppRTCDemo-Prefix.pch => AppRTCMobile/ios/AppRTCMobile-Prefix.pch} (86%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/Info.plist (94%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/UIImage+ARDUtilities.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/UIImage+ARDUtilities.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/main.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/Roboto-Regular.ttf (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/iPhone5@2x.png (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/iPhone6@2x.png (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/iPhone6p@3x.png (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/ic_call_end_black_24dp.png (100%)
 mode change 100755 => 100644
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/ic_call_end_black_24dp@2x.png (100%)
 mode change 100755 => 100644
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/ic_clear_black_24dp.png (100%)
 mode change 100755 => 100644
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/ic_clear_black_24dp@2x.png (100%)
 mode change 100755 => 100644
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/ic_surround_sound_black_24dp.png (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/ic_surround_sound_black_24dp@2x.png (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/ic_switch_video_black_24dp.png (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/ic_switch_video_black_24dp@2x.png (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/ios/resources/mozart.mp3 (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/mac/APPRTCAppDelegate.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/mac/APPRTCAppDelegate.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/mac/APPRTCViewController.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/mac/APPRTCViewController.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/mac/Info.plist (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/mac/main.m (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/tests/ARDAppClientTest.mm (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/third_party/SocketRocket/LICENSE (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/third_party/SocketRocket/SRWebSocket.h (100%)
 rename webrtc/examples/objc/{AppRTCDemo => AppRTCMobile}/third_party/SocketRocket/SRWebSocket.m (100%)

diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 47b757a237..ae751d5093 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -847,7 +847,7 @@ if (rtc_include_tests) {
       deps = [
         "//webrtc/api:libjingle_peerconnection_java",
         "//webrtc/api:libjingle_peerconnection_jni",
-        "//webrtc/examples:AppRTCDemo_javalib",
+        "//webrtc/examples:AppRTCMobile_javalib",
       ]
     }
   }
diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn
index ce995221e1..2b7135b148 100644
--- a/webrtc/examples/BUILD.gn
+++ b/webrtc/examples/BUILD.gn
@@ -23,7 +23,7 @@ group("examples") {
   public_deps = []
 
   if (is_android) {
-    public_deps += [ ":AppRTCDemo" ]
+    public_deps += [ ":AppRTCMobile" ]
   }
   if (is_linux) {
     public_deps += [
@@ -37,13 +37,13 @@ group("examples") {
 }
 
 if (is_android) {
-  android_apk("AppRTCDemo") {
-    apk_name = "AppRTCDemo"
+  android_apk("AppRTCMobile") {
+    apk_name = "AppRTCMobile"
     android_manifest = "androidapp/AndroidManifest.xml"
 
     deps = [
-      ":AppRTCDemo_javalib",
-      ":AppRTCDemo_resources",
+      ":AppRTCMobile_javalib",
+      ":AppRTCMobile_resources",
       "//base:base_java",
       "//webrtc/base:base_java",
     ]
@@ -51,7 +51,7 @@ if (is_android) {
     shared_libraries = [ "//webrtc/api:libjingle_peerconnection_so" ]
   }
 
-  android_library("AppRTCDemo_javalib") {
+  android_library("AppRTCMobile_javalib") {
     java_files = [
       "androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java",
       "androidapp/src/org/appspot/apprtc/AppRTCClient.java",
@@ -77,28 +77,28 @@ if (is_android) {
     ]
 
     deps = [
-      ":AppRTCDemo_resources",
+      ":AppRTCMobile_resources",
       "//webrtc/api:libjingle_peerconnection_java",
       "//webrtc/base:base_java",
       "//webrtc/examples/androidapp/third_party/autobanh:autobanh_java",
     ]
   }
 
-  android_resources("AppRTCDemo_resources") {
+  android_resources("AppRTCMobile_resources") {
     resource_dirs = [ "androidapp/res" ]
     custom_package = "org.appspot.apprtc"
   }
 
-  instrumentation_test_apk("AppRTCDemoTest") {
-    apk_name = "AppRTCDemoTest"
+  instrumentation_test_apk("AppRTCMobileTest") {
+    apk_name = "AppRTCMobileTest"
     android_manifest = "androidtests/AndroidManifest.xml"
 
     java_files = [ "androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java" ]
 
-    apk_under_test = ":AppRTCDemo"
+    apk_under_test = ":AppRTCMobile"
 
     deps = [
-      ":AppRTCDemo_javalib",
+      ":AppRTCMobile_javalib",
       "//webrtc/api:libjingle_peerconnection_java",
     ]
   }
@@ -118,13 +118,13 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
   }
 
   config("apprtc_common_config") {
-    include_dirs = [ "objc/AppRTCDemo/common" ]
+    include_dirs = [ "objc/AppRTCMobile/common" ]
   }
 
   rtc_source_set("apprtc_common") {
     sources = [
-      "objc/AppRTCDemo/common/ARDUtilities.h",
-      "objc/AppRTCDemo/common/ARDUtilities.m",
+      "objc/AppRTCMobile/common/ARDUtilities.h",
+      "objc/AppRTCMobile/common/ARDUtilities.m",
     ]
     configs += [
       ":warnings_config",
@@ -140,7 +140,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
   }
 
   config("apprtc_signaling_config") {
-    include_dirs = [ "objc/AppRTCDemo" ]
+    include_dirs = [ "objc/AppRTCMobile" ]
 
     # GN orders flags on a target before flags from configs. The default config
     # adds these flags so to cancel them out they need to come from a config and
@@ -156,40 +156,40 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
 
   rtc_source_set("apprtc_signaling") {
     sources = [
-      "objc/AppRTCDemo/ARDAppClient+Internal.h",
-      "objc/AppRTCDemo/ARDAppClient.h",
-      "objc/AppRTCDemo/ARDAppClient.m",
-      "objc/AppRTCDemo/ARDAppEngineClient.h",
-      "objc/AppRTCDemo/ARDAppEngineClient.m",
-      "objc/AppRTCDemo/ARDBitrateTracker.h",
-      "objc/AppRTCDemo/ARDBitrateTracker.m",
-      "objc/AppRTCDemo/ARDCEODTURNClient.h",
-      "objc/AppRTCDemo/ARDCEODTURNClient.m",
-      "objc/AppRTCDemo/ARDJoinResponse+Internal.h",
-      "objc/AppRTCDemo/ARDJoinResponse.h",
-      "objc/AppRTCDemo/ARDJoinResponse.m",
-      "objc/AppRTCDemo/ARDMessageResponse+Internal.h",
-      "objc/AppRTCDemo/ARDMessageResponse.h",
-      "objc/AppRTCDemo/ARDMessageResponse.m",
-      "objc/AppRTCDemo/ARDRoomServerClient.h",
-      "objc/AppRTCDemo/ARDSDPUtils.h",
-      "objc/AppRTCDemo/ARDSDPUtils.m",
-      "objc/AppRTCDemo/ARDSignalingChannel.h",
-      "objc/AppRTCDemo/ARDSignalingMessage.h",
-      "objc/AppRTCDemo/ARDSignalingMessage.m",
-      "objc/AppRTCDemo/ARDStatsBuilder.h",
-      "objc/AppRTCDemo/ARDStatsBuilder.m",
-      "objc/AppRTCDemo/ARDTURNClient.h",
-      "objc/AppRTCDemo/ARDWebSocketChannel.h",
-      "objc/AppRTCDemo/ARDWebSocketChannel.m",
-      "objc/AppRTCDemo/RTCIceCandidate+JSON.h",
-      "objc/AppRTCDemo/RTCIceCandidate+JSON.m",
-      "objc/AppRTCDemo/RTCIceServer+JSON.h",
-      "objc/AppRTCDemo/RTCIceServer+JSON.m",
-      "objc/AppRTCDemo/RTCMediaConstraints+JSON.h",
-      "objc/AppRTCDemo/RTCMediaConstraints+JSON.m",
-      "objc/AppRTCDemo/RTCSessionDescription+JSON.h",
-      "objc/AppRTCDemo/RTCSessionDescription+JSON.m",
+      "objc/AppRTCMobile/ARDAppClient+Internal.h",
+      "objc/AppRTCMobile/ARDAppClient.h",
+      "objc/AppRTCMobile/ARDAppClient.m",
+      "objc/AppRTCMobile/ARDAppEngineClient.h",
+      "objc/AppRTCMobile/ARDAppEngineClient.m",
+      "objc/AppRTCMobile/ARDBitrateTracker.h",
+      "objc/AppRTCMobile/ARDBitrateTracker.m",
+      "objc/AppRTCMobile/ARDCEODTURNClient.h",
+      "objc/AppRTCMobile/ARDCEODTURNClient.m",
+      "objc/AppRTCMobile/ARDJoinResponse+Internal.h",
+      "objc/AppRTCMobile/ARDJoinResponse.h",
+      "objc/AppRTCMobile/ARDJoinResponse.m",
+      "objc/AppRTCMobile/ARDMessageResponse+Internal.h",
+      "objc/AppRTCMobile/ARDMessageResponse.h",
+      "objc/AppRTCMobile/ARDMessageResponse.m",
+      "objc/AppRTCMobile/ARDRoomServerClient.h",
+      "objc/AppRTCMobile/ARDSDPUtils.h",
+      "objc/AppRTCMobile/ARDSDPUtils.m",
+      "objc/AppRTCMobile/ARDSignalingChannel.h",
+      "objc/AppRTCMobile/ARDSignalingMessage.h",
+      "objc/AppRTCMobile/ARDSignalingMessage.m",
+      "objc/AppRTCMobile/ARDStatsBuilder.h",
+      "objc/AppRTCMobile/ARDStatsBuilder.m",
+      "objc/AppRTCMobile/ARDTURNClient.h",
+      "objc/AppRTCMobile/ARDWebSocketChannel.h",
+      "objc/AppRTCMobile/ARDWebSocketChannel.m",
+      "objc/AppRTCMobile/RTCIceCandidate+JSON.h",
+      "objc/AppRTCMobile/RTCIceCandidate+JSON.m",
+      "objc/AppRTCMobile/RTCIceServer+JSON.h",
+      "objc/AppRTCMobile/RTCIceServer+JSON.m",
+      "objc/AppRTCMobile/RTCMediaConstraints+JSON.h",
+      "objc/AppRTCMobile/RTCMediaConstraints+JSON.m",
+      "objc/AppRTCMobile/RTCSessionDescription+JSON.h",
+      "objc/AppRTCMobile/RTCSessionDescription+JSON.m",
     ]
     configs += [
       "//build/config/compiler:enable_arc",
@@ -207,26 +207,26 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
   }
 
   if (is_ios) {
-    ios_app_bundle("AppRTCDemo") {
+    ios_app_bundle("AppRTCMobile") {
       sources = [
-        "objc/AppRTCDemo/ios/ARDAppDelegate.m",
-        "objc/AppRTCDemo/ios/ARDMainView.h",
-        "objc/AppRTCDemo/ios/ARDMainView.m",
-        "objc/AppRTCDemo/ios/ARDMainViewController.h",
-        "objc/AppRTCDemo/ios/ARDMainViewController.m",
-        "objc/AppRTCDemo/ios/ARDStatsView.h",
-        "objc/AppRTCDemo/ios/ARDStatsView.m",
-        "objc/AppRTCDemo/ios/ARDVideoCallView.h",
-        "objc/AppRTCDemo/ios/ARDVideoCallView.m",
-        "objc/AppRTCDemo/ios/ARDVideoCallViewController.h",
-        "objc/AppRTCDemo/ios/ARDVideoCallViewController.m",
-        "objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch",
-        "objc/AppRTCDemo/ios/UIImage+ARDUtilities.h",
-        "objc/AppRTCDemo/ios/UIImage+ARDUtilities.m",
-        "objc/AppRTCDemo/ios/main.m",
+        "objc/AppRTCMobile/ios/ARDAppDelegate.m",
+        "objc/AppRTCMobile/ios/ARDMainView.h",
+        "objc/AppRTCMobile/ios/ARDMainView.m",
+        "objc/AppRTCMobile/ios/ARDMainViewController.h",
+        "objc/AppRTCMobile/ios/ARDMainViewController.m",
+        "objc/AppRTCMobile/ios/ARDStatsView.h",
+        "objc/AppRTCMobile/ios/ARDStatsView.m",
+        "objc/AppRTCMobile/ios/ARDVideoCallView.h",
+        "objc/AppRTCMobile/ios/ARDVideoCallView.m",
+        "objc/AppRTCMobile/ios/ARDVideoCallViewController.h",
+        "objc/AppRTCMobile/ios/ARDVideoCallViewController.m",
+        "objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch",
+        "objc/AppRTCMobile/ios/UIImage+ARDUtilities.h",
+        "objc/AppRTCMobile/ios/UIImage+ARDUtilities.m",
+        "objc/AppRTCMobile/ios/main.m",
       ]
 
-      info_plist = "objc/AppRTCDemo/ios/Info.plist"
+      info_plist = "objc/AppRTCMobile/ios/Info.plist"
 
       configs += [
         "..:common_config",
@@ -236,7 +236,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
       public_configs = [ "..:common_inherited_config" ]
 
       deps = [
-        ":AppRTCDemo_ios_bundle_data",
+        ":AppRTCMobile_ios_bundle_data",
         ":apprtc_common",
         ":apprtc_signaling",
       ]
@@ -246,21 +246,21 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
       }
     }
 
-    bundle_data("AppRTCDemo_ios_bundle_data") {
+    bundle_data("AppRTCMobile_ios_bundle_data") {
       sources = [
-        "objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf",
-        "objc/AppRTCDemo/ios/resources/iPhone5@2x.png",
-        "objc/AppRTCDemo/ios/resources/iPhone6@2x.png",
-        "objc/AppRTCDemo/ios/resources/iPhone6p@3x.png",
-        "objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png",
-        "objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2x.png",
-        "objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png",
-        "objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.png",
-        "objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp.png",
-        "objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp@2x.png",
-        "objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp.png",
-        "objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp@2x.png",
-        "objc/AppRTCDemo/ios/resources/mozart.mp3",
+        "objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf",
+        "objc/AppRTCMobile/ios/resources/iPhone5@2x.png",
+        "objc/AppRTCMobile/ios/resources/iPhone6@2x.png",
+        "objc/AppRTCMobile/ios/resources/iPhone6p@3x.png",
+        "objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png",
+        "objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png",
+        "objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png",
+        "objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png",
+        "objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png",
+        "objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png",
+        "objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png",
+        "objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png",
+        "objc/AppRTCMobile/ios/resources/mozart.mp3",
         "objc/Icon.png",
       ]
       outputs = [
@@ -270,12 +270,12 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
   }
 
   if (is_mac) {
-    rtc_source_set("AppRTCDemo_app") {
+    rtc_source_set("AppRTCMobile_app") {
       sources = [
-        "objc/AppRTCDemo/mac/APPRTCAppDelegate.h",
-        "objc/AppRTCDemo/mac/APPRTCAppDelegate.m",
-        "objc/AppRTCDemo/mac/APPRTCViewController.h",
-        "objc/AppRTCDemo/mac/APPRTCViewController.m",
+        "objc/AppRTCMobile/mac/APPRTCAppDelegate.h",
+        "objc/AppRTCMobile/mac/APPRTCAppDelegate.m",
+        "objc/AppRTCMobile/mac/APPRTCViewController.h",
+        "objc/AppRTCMobile/mac/APPRTCViewController.m",
       ]
       configs += [
         "..:common_objc",
@@ -287,29 +287,29 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
       ]
     }
 
-    mac_app_bundle("AppRTCDemo") {
-      output_name = "AppRTCDemo"
+    mac_app_bundle("AppRTCMobile") {
+      output_name = "AppRTCMobile"
 
       extra_substitutions = [ "MACOSX_DEPLOYMENT_TARGET=10.8" ]
 
       sources = [
-        "objc/AppRTCDemo/mac/main.m",
+        "objc/AppRTCMobile/mac/main.m",
       ]
 
       public_configs = [ "..:common_inherited_config" ]
 
-      info_plist = "objc/AppRTCDemo/mac/Info.plist"
+      info_plist = "objc/AppRTCMobile/mac/Info.plist"
 
       libs = [ "AppKit.framework" ]
 
       deps = [
-        ":AppRTCDemo_app",
+        ":AppRTCMobile_app",
       ]
     }
   }
 
   config("socketrocket_include_config") {
-    include_dirs = [ "objc/AppRTCDemo/third_party/SocketRocket" ]
+    include_dirs = [ "objc/AppRTCMobile/third_party/SocketRocket" ]
   }
 
   config("socketrocket_warning_config") {
@@ -340,8 +340,8 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
 
   rtc_source_set("socketrocket") {
     sources = [
-      "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h",
-      "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m",
+      "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h",
+      "objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m",
     ]
     configs += [
       "//build/config/compiler:enable_arc",
diff --git a/webrtc/examples/androidapp/README b/webrtc/examples/androidapp/README
index 55459c2f3b..97e609117c 100644
--- a/webrtc/examples/androidapp/README
+++ b/webrtc/examples/androidapp/README
@@ -7,8 +7,8 @@ Prerequisites:
 Example of building & using the app:
 
 cd <path/to/webrtc>/src
-ninja -C out/Default AppRTCDemo
-adb install -r out/Default/apks/AppRTCDemo.apk
+ninja -C out/Default AppRTCMobile
+adb install -r out/Default/apks/AppRTCMobile.apk
 
 In desktop chrome, navigate to https://appr.tc and note the r=<NNN> room
 this redirects to or navigate directly to https://appr.tc/r/<NNN> with
diff --git a/webrtc/examples/androidapp/build.xml b/webrtc/examples/androidapp/build.xml
index ae06794893..aa1db6db79 100644
--- a/webrtc/examples/androidapp/build.xml
+++ b/webrtc/examples/androidapp/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="AppRTCDemo" default="help">
+<project name="AppRTCMobile" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
diff --git a/webrtc/examples/androidapp/res/values-v21/styles.xml b/webrtc/examples/androidapp/res/values-v21/styles.xml
index 95f1ac68a3..a051a23309 100644
--- a/webrtc/examples/androidapp/res/values-v21/styles.xml
+++ b/webrtc/examples/androidapp/res/values-v21/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <style name="AppRTCDemoActivityTheme" parent="android:Theme.Material">
+  <style name="AppRTCMobileActivityTheme" parent="android:Theme.Material">
     <item name="android:windowActionBar">false</item>
     <item name="android:windowFullscreen">true</item>
     <item name="android:windowNoTitle">true</item>
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
index 56d915f00a..a55901be8f 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
@@ -382,7 +382,7 @@ public class ConnectActivity extends Activity {
     boolean tracing = sharedPref.getBoolean(
             keyprefTracing, Boolean.valueOf(getString(R.string.pref_tracing_default)));
 
-    // Start AppRTCDemo activity.
+    // Start AppRTCMobile activity.
     Log.d(TAG, "Connecting to room " + roomId + " at URL " + roomUrl);
     if (validateUrl(roomUrl)) {
       Uri uri = Uri.parse(roomUrl);
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java
index a9a136bf9e..18f5dc50c7 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java
@@ -31,7 +31,7 @@ import java.io.StringWriter;
  */
 public class UnhandledExceptionHandler
     implements Thread.UncaughtExceptionHandler {
-  private static final String TAG = "AppRTCDemoActivity";
+  private static final String TAG = "AppRTCMobileActivity";
   private final Activity activity;
 
   public UnhandledExceptionHandler(final Activity activity) {
diff --git a/webrtc/examples/androidjunit/README b/webrtc/examples/androidjunit/README
index f110cedcb0..1753f50a13 100644
--- a/webrtc/examples/androidjunit/README
+++ b/webrtc/examples/androidjunit/README
@@ -1,4 +1,4 @@
-This directory contains example JUnit tests for Android AppRTCDemo.
+This directory contains example JUnit tests for Android AppRTCMobile.
 Many of these test utilize Robolectric to mock Android classes.
 
 To compile:
diff --git a/webrtc/examples/androidtests/README b/webrtc/examples/androidtests/README
index d32fb560a2..49ae6c81d6 100644
--- a/webrtc/examples/androidtests/README
+++ b/webrtc/examples/androidtests/README
@@ -1,14 +1,14 @@
-This directory contains an example unit test for Android AppRTCDemo.
+This directory contains an example unit test for Android AppRTCMobile.
 
 Example of building & using the app:
 
-- Build Android AppRTCDemo and AppRTCDemo unit test:
+- Build Android AppRTCMobile and AppRTCMobile unit test:
 cd <path/to/webrtc>/src
-ninja -C out/Debug AppRTCDemoTest
+ninja -C out/Debug AppRTCMobileTest
 
-- Install AppRTCDemo and AppRTCDemoTest:
-adb install -r out/Debug/apks/AppRTCDemo.apk
-adb install -r out/Debug/apks/AppRTCDemoTest.apk
+- Install AppRTCMobile and AppRTCMobileTest:
+adb install -r out/Debug/apks/AppRTCMobile.apk
+adb install -r out/Debug/apks/AppRTCMobileTest.apk
 
 - Run unit tests:
 adb shell am instrument -w org.appspot.apprtc.test/android.test.InstrumentationTestRunner
\ No newline at end of file
diff --git a/webrtc/examples/androidtests/build.xml b/webrtc/examples/androidtests/build.xml
index 036759bd96..95847b74c2 100644
--- a/webrtc/examples/androidtests/build.xml
+++ b/webrtc/examples/androidtests/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="AppRTCDemoTest" default="help">
+<project name="AppRTCMobileTest" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDAppClient+Internal.h b/webrtc/examples/objc/AppRTCMobile/ARDAppClient+Internal.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDAppClient+Internal.h
rename to webrtc/examples/objc/AppRTCMobile/ARDAppClient+Internal.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDAppClient.h b/webrtc/examples/objc/AppRTCMobile/ARDAppClient.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDAppClient.h
rename to webrtc/examples/objc/AppRTCMobile/ARDAppClient.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDAppClient.m b/webrtc/examples/objc/AppRTCMobile/ARDAppClient.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDAppClient.m
rename to webrtc/examples/objc/AppRTCMobile/ARDAppClient.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDAppEngineClient.h b/webrtc/examples/objc/AppRTCMobile/ARDAppEngineClient.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDAppEngineClient.h
rename to webrtc/examples/objc/AppRTCMobile/ARDAppEngineClient.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDAppEngineClient.m b/webrtc/examples/objc/AppRTCMobile/ARDAppEngineClient.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDAppEngineClient.m
rename to webrtc/examples/objc/AppRTCMobile/ARDAppEngineClient.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDBitrateTracker.h b/webrtc/examples/objc/AppRTCMobile/ARDBitrateTracker.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDBitrateTracker.h
rename to webrtc/examples/objc/AppRTCMobile/ARDBitrateTracker.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDBitrateTracker.m b/webrtc/examples/objc/AppRTCMobile/ARDBitrateTracker.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDBitrateTracker.m
rename to webrtc/examples/objc/AppRTCMobile/ARDBitrateTracker.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDCEODTURNClient.h b/webrtc/examples/objc/AppRTCMobile/ARDCEODTURNClient.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDCEODTURNClient.h
rename to webrtc/examples/objc/AppRTCMobile/ARDCEODTURNClient.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDCEODTURNClient.m b/webrtc/examples/objc/AppRTCMobile/ARDCEODTURNClient.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDCEODTURNClient.m
rename to webrtc/examples/objc/AppRTCMobile/ARDCEODTURNClient.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDJoinResponse+Internal.h b/webrtc/examples/objc/AppRTCMobile/ARDJoinResponse+Internal.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDJoinResponse+Internal.h
rename to webrtc/examples/objc/AppRTCMobile/ARDJoinResponse+Internal.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDJoinResponse.h b/webrtc/examples/objc/AppRTCMobile/ARDJoinResponse.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDJoinResponse.h
rename to webrtc/examples/objc/AppRTCMobile/ARDJoinResponse.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDJoinResponse.m b/webrtc/examples/objc/AppRTCMobile/ARDJoinResponse.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDJoinResponse.m
rename to webrtc/examples/objc/AppRTCMobile/ARDJoinResponse.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDMessageResponse+Internal.h b/webrtc/examples/objc/AppRTCMobile/ARDMessageResponse+Internal.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDMessageResponse+Internal.h
rename to webrtc/examples/objc/AppRTCMobile/ARDMessageResponse+Internal.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDMessageResponse.h b/webrtc/examples/objc/AppRTCMobile/ARDMessageResponse.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDMessageResponse.h
rename to webrtc/examples/objc/AppRTCMobile/ARDMessageResponse.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDMessageResponse.m b/webrtc/examples/objc/AppRTCMobile/ARDMessageResponse.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDMessageResponse.m
rename to webrtc/examples/objc/AppRTCMobile/ARDMessageResponse.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDRoomServerClient.h b/webrtc/examples/objc/AppRTCMobile/ARDRoomServerClient.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDRoomServerClient.h
rename to webrtc/examples/objc/AppRTCMobile/ARDRoomServerClient.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDSDPUtils.h b/webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDSDPUtils.h
rename to webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDSDPUtils.m b/webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDSDPUtils.m
rename to webrtc/examples/objc/AppRTCMobile/ARDSDPUtils.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDSignalingChannel.h b/webrtc/examples/objc/AppRTCMobile/ARDSignalingChannel.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDSignalingChannel.h
rename to webrtc/examples/objc/AppRTCMobile/ARDSignalingChannel.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDSignalingMessage.h b/webrtc/examples/objc/AppRTCMobile/ARDSignalingMessage.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDSignalingMessage.h
rename to webrtc/examples/objc/AppRTCMobile/ARDSignalingMessage.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDSignalingMessage.m b/webrtc/examples/objc/AppRTCMobile/ARDSignalingMessage.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDSignalingMessage.m
rename to webrtc/examples/objc/AppRTCMobile/ARDSignalingMessage.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.h b/webrtc/examples/objc/AppRTCMobile/ARDStatsBuilder.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.h
rename to webrtc/examples/objc/AppRTCMobile/ARDStatsBuilder.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.m b/webrtc/examples/objc/AppRTCMobile/ARDStatsBuilder.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDStatsBuilder.m
rename to webrtc/examples/objc/AppRTCMobile/ARDStatsBuilder.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDTURNClient.h b/webrtc/examples/objc/AppRTCMobile/ARDTURNClient.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDTURNClient.h
rename to webrtc/examples/objc/AppRTCMobile/ARDTURNClient.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDWebSocketChannel.h b/webrtc/examples/objc/AppRTCMobile/ARDWebSocketChannel.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDWebSocketChannel.h
rename to webrtc/examples/objc/AppRTCMobile/ARDWebSocketChannel.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ARDWebSocketChannel.m b/webrtc/examples/objc/AppRTCMobile/ARDWebSocketChannel.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ARDWebSocketChannel.m
rename to webrtc/examples/objc/AppRTCMobile/ARDWebSocketChannel.m
diff --git a/webrtc/examples/objc/AppRTCDemo/RTCIceCandidate+JSON.h b/webrtc/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/RTCIceCandidate+JSON.h
rename to webrtc/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h
diff --git a/webrtc/examples/objc/AppRTCDemo/RTCIceCandidate+JSON.m b/webrtc/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/RTCIceCandidate+JSON.m
rename to webrtc/examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m
diff --git a/webrtc/examples/objc/AppRTCDemo/RTCIceServer+JSON.h b/webrtc/examples/objc/AppRTCMobile/RTCIceServer+JSON.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/RTCIceServer+JSON.h
rename to webrtc/examples/objc/AppRTCMobile/RTCIceServer+JSON.h
diff --git a/webrtc/examples/objc/AppRTCDemo/RTCIceServer+JSON.m b/webrtc/examples/objc/AppRTCMobile/RTCIceServer+JSON.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/RTCIceServer+JSON.m
rename to webrtc/examples/objc/AppRTCMobile/RTCIceServer+JSON.m
diff --git a/webrtc/examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.h b/webrtc/examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.h
rename to webrtc/examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.h
diff --git a/webrtc/examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.m b/webrtc/examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.m
rename to webrtc/examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.m
diff --git a/webrtc/examples/objc/AppRTCDemo/RTCSessionDescription+JSON.h b/webrtc/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/RTCSessionDescription+JSON.h
rename to webrtc/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h
diff --git a/webrtc/examples/objc/AppRTCDemo/RTCSessionDescription+JSON.m b/webrtc/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/RTCSessionDescription+JSON.m
rename to webrtc/examples/objc/AppRTCMobile/RTCSessionDescription+JSON.m
diff --git a/webrtc/examples/objc/AppRTCDemo/common/ARDUtilities.h b/webrtc/examples/objc/AppRTCMobile/common/ARDUtilities.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/common/ARDUtilities.h
rename to webrtc/examples/objc/AppRTCMobile/common/ARDUtilities.h
diff --git a/webrtc/examples/objc/AppRTCDemo/common/ARDUtilities.m b/webrtc/examples/objc/AppRTCMobile/common/ARDUtilities.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/common/ARDUtilities.m
rename to webrtc/examples/objc/AppRTCMobile/common/ARDUtilities.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDAppDelegate.h b/webrtc/examples/objc/AppRTCMobile/ios/ARDAppDelegate.h
similarity index 89%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDAppDelegate.h
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDAppDelegate.h
index 64b06a30ed..7eafff8ebc 100644
--- a/webrtc/examples/objc/AppRTCDemo/ios/ARDAppDelegate.h
+++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDAppDelegate.h
@@ -10,7 +10,7 @@
 
 #import <UIKit/UIKit.h>
 
-// The main application class of the AppRTCDemo iOS app demonstrating
+// The main application class of the AppRTCMobile iOS app demonstrating
 // interoperability between the Objective C implementation of PeerConnection
 // and the appr.tc demo webapp.
 @interface ARDAppDelegate : NSObject <UIApplicationDelegate>
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDAppDelegate.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDAppDelegate.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDAppDelegate.m
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDAppDelegate.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.h b/webrtc/examples/objc/AppRTCMobile/ios/ARDMainView.h
similarity index 93%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.h
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDMainView.h
index 81f9d007f6..1f2497a1e2 100644
--- a/webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.h
+++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDMainView.h
@@ -26,7 +26,7 @@
 
 @end
 
-// The main view of AppRTCDemo. It contains an input field for entering a room
+// The main view of AppRTCMobile. It contains an input field for entering a room
 // name on apprtc to connect to.
 @interface ARDMainView : UIView
 
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDMainView.m
similarity index 99%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.m
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDMainView.m
index d9522045ae..9ebee5c099 100644
--- a/webrtc/examples/objc/AppRTCDemo/ios/ARDMainView.m
+++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDMainView.m
@@ -137,7 +137,7 @@ static CGFloat const kCallControlMargin = 8;
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
     _appLabel = [[UILabel alloc] initWithFrame:CGRectZero];
-    _appLabel.text = @"AppRTCDemo";
+    _appLabel.text = @"AppRTCMobile";
     _appLabel.font = [UIFont fontWithName:@"Roboto" size:34];
     _appLabel.textColor = [UIColor colorWithWhite:0 alpha:.2];
     [_appLabel sizeToFit];
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDMainViewController.h b/webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDMainViewController.h
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDMainViewController.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDMainViewController.m
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDStatsView.h b/webrtc/examples/objc/AppRTCMobile/ios/ARDStatsView.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDStatsView.h
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDStatsView.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDStatsView.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDStatsView.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDStatsView.m
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDStatsView.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallView.h b/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallView.h
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallView.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallView.m
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallView.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.h b/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.h
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch b/webrtc/examples/objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch
similarity index 86%
rename from webrtc/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch
rename to webrtc/examples/objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch
index 6a5c3757de..ca0db90b36 100644
--- a/webrtc/examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch
+++ b/webrtc/examples/objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch
@@ -9,8 +9,8 @@
  */
 
 //
-// Prefix header for all source files of the 'AppRTCDemo' target in the
-// 'AppRTCDemo' project
+// Prefix header for all source files of the 'AppRTCMobile' target in the
+// 'AppRTCMobile' project
 //
 
 #import <Availability.h>
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/Info.plist b/webrtc/examples/objc/AppRTCMobile/ios/Info.plist
similarity index 94%
rename from webrtc/examples/objc/AppRTCDemo/ios/Info.plist
rename to webrtc/examples/objc/AppRTCMobile/ios/Info.plist
index 5cde6f52c4..e46d0e679b 100644
--- a/webrtc/examples/objc/AppRTCDemo/ios/Info.plist
+++ b/webrtc/examples/objc/AppRTCMobile/ios/Info.plist
@@ -7,9 +7,9 @@
   <key>CFBundleDevelopmentRegion</key>
   <string>en</string>
   <key>CFBundleDisplayName</key>
-  <string>AppRTCDemo</string>
+  <string>AppRTCMobile</string>
   <key>CFBundleExecutable</key>
-  <string>AppRTCDemo</string>
+  <string>AppRTCMobile</string>
   <key>CFBundleIcons</key>
   <dict>
     <key>CFBundlePrimaryIcon</key>
@@ -21,11 +21,11 @@
     </dict>
   </dict>
   <key>CFBundleIdentifier</key>
-  <string>com.google.AppRTCDemo</string>
+  <string>com.google.AppRTCMobile</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleName</key>
-  <string>AppRTCDemo</string>
+  <string>AppRTCMobile</string>
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.h b/webrtc/examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.h
rename to webrtc/examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.h
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.m b/webrtc/examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.m
rename to webrtc/examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/main.m b/webrtc/examples/objc/AppRTCMobile/ios/main.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/main.m
rename to webrtc/examples/objc/AppRTCMobile/ios/main.m
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf b/webrtc/examples/objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/iPhone5@2x.png b/webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone5@2x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/iPhone5@2x.png
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone5@2x.png
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/iPhone6@2x.png b/webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone6@2x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/iPhone6@2x.png
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone6@2x.png
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/iPhone6p@3x.png b/webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone6p@3x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/iPhone6p@3x.png
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/iPhone6p@3x.png
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png b/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png
old mode 100755
new mode 100644
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2x.png b/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png
old mode 100755
new mode 100644
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2x.png
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png b/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png
old mode 100755
new mode 100644
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.png b/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png
old mode 100755
new mode 100644
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.png
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp.png b/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp.png
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp@2x.png b/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp@2x.png
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp.png b/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp.png
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp@2x.png b/webrtc/examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp@2x.png
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png
diff --git a/webrtc/examples/objc/AppRTCDemo/ios/resources/mozart.mp3 b/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/ios/resources/mozart.mp3
rename to webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3
diff --git a/webrtc/examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.h b/webrtc/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.h
rename to webrtc/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.h
diff --git a/webrtc/examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.m b/webrtc/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.m
rename to webrtc/examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m
diff --git a/webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.h b/webrtc/examples/objc/AppRTCMobile/mac/APPRTCViewController.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.h
rename to webrtc/examples/objc/AppRTCMobile/mac/APPRTCViewController.h
diff --git a/webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.m b/webrtc/examples/objc/AppRTCMobile/mac/APPRTCViewController.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/mac/APPRTCViewController.m
rename to webrtc/examples/objc/AppRTCMobile/mac/APPRTCViewController.m
diff --git a/webrtc/examples/objc/AppRTCDemo/mac/Info.plist b/webrtc/examples/objc/AppRTCMobile/mac/Info.plist
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/mac/Info.plist
rename to webrtc/examples/objc/AppRTCMobile/mac/Info.plist
diff --git a/webrtc/examples/objc/AppRTCDemo/mac/main.m b/webrtc/examples/objc/AppRTCMobile/mac/main.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/mac/main.m
rename to webrtc/examples/objc/AppRTCMobile/mac/main.m
diff --git a/webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm b/webrtc/examples/objc/AppRTCMobile/tests/ARDAppClientTest.mm
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm
rename to webrtc/examples/objc/AppRTCMobile/tests/ARDAppClientTest.mm
diff --git a/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE b/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE
rename to webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE
diff --git a/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h b/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h
rename to webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h
diff --git a/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m b/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m
similarity index 100%
rename from webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m
rename to webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m
diff --git a/webrtc/webrtc_examples.gyp b/webrtc/webrtc_examples.gyp
index cea4969437..701164ce05 100755
--- a/webrtc/webrtc_examples.gyp
+++ b/webrtc/webrtc_examples.gyp
@@ -156,15 +156,15 @@
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
           ],
           'sources': [
-            'examples/objc/AppRTCDemo/common/ARDUtilities.h',
-            'examples/objc/AppRTCDemo/common/ARDUtilities.m',
+            'examples/objc/AppRTCMobile/common/ARDUtilities.h',
+            'examples/objc/AppRTCMobile/common/ARDUtilities.m',
           ],
           'include_dirs': [
-            'examples/objc/AppRTCDemo/common',
+            'examples/objc/AppRTCMobile/common',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              'examples/objc/AppRTCDemo/common',
+              'examples/objc/AppRTCMobile/common',
             ],
           },
           'conditions': [
@@ -204,47 +204,47 @@
             'socketrocket',
           ],
           'sources': [
-            'examples/objc/AppRTCDemo/ARDAppClient.h',
-            'examples/objc/AppRTCDemo/ARDAppClient.m',
-            'examples/objc/AppRTCDemo/ARDAppClient+Internal.h',
-            'examples/objc/AppRTCDemo/ARDAppEngineClient.h',
-            'examples/objc/AppRTCDemo/ARDAppEngineClient.m',
-            'examples/objc/AppRTCDemo/ARDBitrateTracker.h',
-            'examples/objc/AppRTCDemo/ARDBitrateTracker.m',
-            'examples/objc/AppRTCDemo/ARDCEODTURNClient.h',
-            'examples/objc/AppRTCDemo/ARDCEODTURNClient.m',
-            'examples/objc/AppRTCDemo/ARDJoinResponse.h',
-            'examples/objc/AppRTCDemo/ARDJoinResponse.m',
-            'examples/objc/AppRTCDemo/ARDJoinResponse+Internal.h',
-            'examples/objc/AppRTCDemo/ARDMessageResponse.h',
-            'examples/objc/AppRTCDemo/ARDMessageResponse.m',
-            'examples/objc/AppRTCDemo/ARDMessageResponse+Internal.h',
-            'examples/objc/AppRTCDemo/ARDRoomServerClient.h',
-            'examples/objc/AppRTCDemo/ARDSDPUtils.h',
-            'examples/objc/AppRTCDemo/ARDSDPUtils.m',
-            'examples/objc/AppRTCDemo/ARDSignalingChannel.h',
-            'examples/objc/AppRTCDemo/ARDSignalingMessage.h',
-            'examples/objc/AppRTCDemo/ARDSignalingMessage.m',
-            'examples/objc/AppRTCDemo/ARDStatsBuilder.h',
-            'examples/objc/AppRTCDemo/ARDStatsBuilder.m',
-            'examples/objc/AppRTCDemo/ARDTURNClient.h',
-            'examples/objc/AppRTCDemo/ARDWebSocketChannel.h',
-            'examples/objc/AppRTCDemo/ARDWebSocketChannel.m',
-            'examples/objc/AppRTCDemo/RTCIceCandidate+JSON.h',
-            'examples/objc/AppRTCDemo/RTCIceCandidate+JSON.m',
-            'examples/objc/AppRTCDemo/RTCIceServer+JSON.h',
-            'examples/objc/AppRTCDemo/RTCIceServer+JSON.m',
-            'examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.h',
-            'examples/objc/AppRTCDemo/RTCMediaConstraints+JSON.m',
-            'examples/objc/AppRTCDemo/RTCSessionDescription+JSON.h',
-            'examples/objc/AppRTCDemo/RTCSessionDescription+JSON.m',
+            'examples/objc/AppRTCMobile/ARDAppClient.h',
+            'examples/objc/AppRTCMobile/ARDAppClient.m',
+            'examples/objc/AppRTCMobile/ARDAppClient+Internal.h',
+            'examples/objc/AppRTCMobile/ARDAppEngineClient.h',
+            'examples/objc/AppRTCMobile/ARDAppEngineClient.m',
+            'examples/objc/AppRTCMobile/ARDBitrateTracker.h',
+            'examples/objc/AppRTCMobile/ARDBitrateTracker.m',
+            'examples/objc/AppRTCMobile/ARDCEODTURNClient.h',
+            'examples/objc/AppRTCMobile/ARDCEODTURNClient.m',
+            'examples/objc/AppRTCMobile/ARDJoinResponse.h',
+            'examples/objc/AppRTCMobile/ARDJoinResponse.m',
+            'examples/objc/AppRTCMobile/ARDJoinResponse+Internal.h',
+            'examples/objc/AppRTCMobile/ARDMessageResponse.h',
+            'examples/objc/AppRTCMobile/ARDMessageResponse.m',
+            'examples/objc/AppRTCMobile/ARDMessageResponse+Internal.h',
+            'examples/objc/AppRTCMobile/ARDRoomServerClient.h',
+            'examples/objc/AppRTCMobile/ARDSDPUtils.h',
+            'examples/objc/AppRTCMobile/ARDSDPUtils.m',
+            'examples/objc/AppRTCMobile/ARDSignalingChannel.h',
+            'examples/objc/AppRTCMobile/ARDSignalingMessage.h',
+            'examples/objc/AppRTCMobile/ARDSignalingMessage.m',
+            'examples/objc/AppRTCMobile/ARDStatsBuilder.h',
+            'examples/objc/AppRTCMobile/ARDStatsBuilder.m',
+            'examples/objc/AppRTCMobile/ARDTURNClient.h',
+            'examples/objc/AppRTCMobile/ARDWebSocketChannel.h',
+            'examples/objc/AppRTCMobile/ARDWebSocketChannel.m',
+            'examples/objc/AppRTCMobile/RTCIceCandidate+JSON.h',
+            'examples/objc/AppRTCMobile/RTCIceCandidate+JSON.m',
+            'examples/objc/AppRTCMobile/RTCIceServer+JSON.h',
+            'examples/objc/AppRTCMobile/RTCIceServer+JSON.m',
+            'examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.h',
+            'examples/objc/AppRTCMobile/RTCMediaConstraints+JSON.m',
+            'examples/objc/AppRTCMobile/RTCSessionDescription+JSON.h',
+            'examples/objc/AppRTCMobile/RTCSessionDescription+JSON.m',
           ],
           'include_dirs': [
-            'examples/objc/AppRTCDemo',
+            'examples/objc/AppRTCMobile',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              'examples/objc/AppRTCDemo',
+              'examples/objc/AppRTCMobile',
             ],
           },
           'export_dependent_settings': [
@@ -272,9 +272,9 @@
           },
         },
         {
-          'target_name': 'AppRTCDemo',
+          'target_name': 'AppRTCMobile',
           'type': 'executable',
-          'product_name': 'AppRTCDemo',
+          'product_name': 'AppRTCMobile',
           'mac_bundle': 1,
           'dependencies': [
             'apprtc_common',
@@ -283,41 +283,41 @@
           'conditions': [
             ['OS=="ios"', {
               'mac_bundle_resources': [
-                'examples/objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf',
-                'examples/objc/AppRTCDemo/ios/resources/iPhone5@2x.png',
-                'examples/objc/AppRTCDemo/ios/resources/iPhone6@2x.png',
-                'examples/objc/AppRTCDemo/ios/resources/iPhone6p@3x.png',
-                'examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png',
-                'examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2x.png',
-                'examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png',
-                'examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.png',
-                'examples/objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp.png',
-                'examples/objc/AppRTCDemo/ios/resources/ic_surround_sound_black_24dp@2x.png',
-                'examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp.png',
-                'examples/objc/AppRTCDemo/ios/resources/ic_switch_video_black_24dp@2x.png',
-                'examples/objc/AppRTCDemo/ios/resources/mozart.mp3',
+                'examples/objc/AppRTCMobile/ios/resources/Roboto-Regular.ttf',
+                'examples/objc/AppRTCMobile/ios/resources/iPhone5@2x.png',
+                'examples/objc/AppRTCMobile/ios/resources/iPhone6@2x.png',
+                'examples/objc/AppRTCMobile/ios/resources/iPhone6p@3x.png',
+                'examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp.png',
+                'examples/objc/AppRTCMobile/ios/resources/ic_call_end_black_24dp@2x.png',
+                'examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp.png',
+                'examples/objc/AppRTCMobile/ios/resources/ic_clear_black_24dp@2x.png',
+                'examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp.png',
+                'examples/objc/AppRTCMobile/ios/resources/ic_surround_sound_black_24dp@2x.png',
+                'examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp.png',
+                'examples/objc/AppRTCMobile/ios/resources/ic_switch_video_black_24dp@2x.png',
+                'examples/objc/AppRTCMobile/ios/resources/mozart.mp3',
                 'examples/objc/Icon.png',
               ],
               'sources': [
-                'examples/objc/AppRTCDemo/ios/ARDAppDelegate.h',
-                'examples/objc/AppRTCDemo/ios/ARDAppDelegate.m',
-                'examples/objc/AppRTCDemo/ios/ARDMainView.h',
-                'examples/objc/AppRTCDemo/ios/ARDMainView.m',
-                'examples/objc/AppRTCDemo/ios/ARDMainViewController.h',
-                'examples/objc/AppRTCDemo/ios/ARDMainViewController.m',
-                'examples/objc/AppRTCDemo/ios/ARDStatsView.h',
-                'examples/objc/AppRTCDemo/ios/ARDStatsView.m',
-                'examples/objc/AppRTCDemo/ios/ARDVideoCallView.h',
-                'examples/objc/AppRTCDemo/ios/ARDVideoCallView.m',
-                'examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.h',
-                'examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m',
-                'examples/objc/AppRTCDemo/ios/AppRTCDemo-Prefix.pch',
-                'examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.h',
-                'examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.m',
-                'examples/objc/AppRTCDemo/ios/main.m',
+                'examples/objc/AppRTCMobile/ios/ARDAppDelegate.h',
+                'examples/objc/AppRTCMobile/ios/ARDAppDelegate.m',
+                'examples/objc/AppRTCMobile/ios/ARDMainView.h',
+                'examples/objc/AppRTCMobile/ios/ARDMainView.m',
+                'examples/objc/AppRTCMobile/ios/ARDMainViewController.h',
+                'examples/objc/AppRTCMobile/ios/ARDMainViewController.m',
+                'examples/objc/AppRTCMobile/ios/ARDStatsView.h',
+                'examples/objc/AppRTCMobile/ios/ARDStatsView.m',
+                'examples/objc/AppRTCMobile/ios/ARDVideoCallView.h',
+                'examples/objc/AppRTCMobile/ios/ARDVideoCallView.m',
+                'examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.h',
+                'examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m',
+                'examples/objc/AppRTCMobile/ios/AppRTCMobile-Prefix.pch',
+                'examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.h',
+                'examples/objc/AppRTCMobile/ios/UIImage+ARDUtilities.m',
+                'examples/objc/AppRTCMobile/ios/main.m',
               ],
               'xcode_settings': {
-                'INFOPLIST_FILE': 'examples/objc/AppRTCDemo/ios/Info.plist',
+                'INFOPLIST_FILE': 'examples/objc/AppRTCMobile/ios/Info.plist',
                 'WARNING_CFLAGS':  [
                   # Suppress compiler warnings about deprecated that triggered
                   # when moving from ios_deployment_target 7.0 to 9.0.
@@ -328,15 +328,15 @@
             }],
             ['OS=="mac"', {
               'sources': [
-                'examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.h',
-                'examples/objc/AppRTCDemo/mac/APPRTCAppDelegate.m',
-                'examples/objc/AppRTCDemo/mac/APPRTCViewController.h',
-                'examples/objc/AppRTCDemo/mac/APPRTCViewController.m',
-                'examples/objc/AppRTCDemo/mac/main.m',
+                'examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.h',
+                'examples/objc/AppRTCMobile/mac/APPRTCAppDelegate.m',
+                'examples/objc/AppRTCMobile/mac/APPRTCViewController.h',
+                'examples/objc/AppRTCMobile/mac/APPRTCViewController.m',
+                'examples/objc/AppRTCMobile/mac/main.m',
               ],
               'xcode_settings': {
                 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'NO',
-                'INFOPLIST_FILE': 'examples/objc/AppRTCDemo/mac/Info.plist',
+                'INFOPLIST_FILE': 'examples/objc/AppRTCMobile/mac/Info.plist',
                 'MACOSX_DEPLOYMENT_TARGET' : '10.8',
                 'OTHER_LDFLAGS': [
                   '-framework AVFoundation',
@@ -352,15 +352,15 @@
           'xcode_settings': {
             'CLANG_ENABLE_OBJC_ARC': 'YES',
           },
-        },  # target AppRTCDemo
+        },  # target AppRTCMobile
         {
           # TODO(tkchin): move this into the real third party location and
           # have it mirrored on chrome infra.
           'target_name': 'socketrocket',
           'type': 'static_library',
           'sources': [
-            'examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h',
-            'examples/objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m',
+            'examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.h',
+            'examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m',
           ],
           'conditions': [
             ['OS=="mac"', {
@@ -382,7 +382,7 @@
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              'examples/objc/AppRTCDemo/third_party/SocketRocket',
+              'examples/objc/AppRTCMobile/third_party/SocketRocket',
             ],
           },
           'xcode_settings': {
@@ -407,13 +407,13 @@
     ['OS=="android"', {
       'targets': [
         {
-          'target_name': 'AppRTCDemo',
+          'target_name': 'AppRTCMobile',
           'type': 'none',
           'dependencies': [
             'api/api_java.gyp:libjingle_peerconnection_java',
           ],
           'variables': {
-            'apk_name': 'AppRTCDemo',
+            'apk_name': 'AppRTCMobile',
             'java_in_dir': 'examples/androidapp',
             'has_java_resources': 1,
             'resource_dir': 'examples/androidapp/res',
@@ -429,31 +429,31 @@
             'add_to_dependents_classpaths':1,
           },
           'includes': [ '../build/java_apk.gypi' ],
-        },  # target AppRTCDemo
+        },  # target AppRTCMobile
 
         {
-          # AppRTCDemo creates a .jar as a side effect. Any java targets
+          # AppRTCMobile creates a .jar as a side effect. Any java targets
           # that need that .jar in their classpath should depend on this target,
-          # AppRTCDemo_apk. Dependents of AppRTCDemo_apk receive its
+          # AppRTCMobile_apk. Dependents of AppRTCMobile_apk receive its
           # jar path in the variable 'apk_output_jar_path'.
           # This target should only be used by targets which instrument
-          # AppRTCDemo_apk.
-          'target_name': 'AppRTCDemo_apk',
+          # AppRTCMobile_apk.
+          'target_name': 'AppRTCMobile_apk',
           'type': 'none',
           'dependencies': [
-             'AppRTCDemo',
+             'AppRTCMobile',
            ],
            'includes': [ '../build/apk_fake_jar.gypi' ],
-        },  # target AppRTCDemo_apk
+        },  # target AppRTCMobile_apk
 
         {
-          'target_name': 'AppRTCDemoTest',
+          'target_name': 'AppRTCMobileTest',
           'type': 'none',
           'dependencies': [
-            'AppRTCDemo_apk',
+            'AppRTCMobile_apk',
            ],
           'variables': {
-            'apk_name': 'AppRTCDemoTest',
+            'apk_name': 'AppRTCMobileTest',
             'java_in_dir': 'examples/androidtests',
             'is_test_apk': 1,
             'test_type': 'instrumentation',