100 files changed, 183 insertions, 183 deletions

diff --git a/android_webview/tools/known_incompatible.py b/android_webview/tools/known_incompatible.py
index cfc74a8..5e6dcf9 100644
--- a/android_webview/tools/known_incompatible.py
+++ b/android_webview/tools/known_incompatible.py
@@ -35,7 +35,7 @@ KNOWN_INCOMPATIBLE = {
         'third_party/talloc',
         'third_party/webdriver',
         'third_party/wtl',
-        'tools/chrome_remote_control/third_party/websocket-client',
+        'tools/telemetry/third_party/websocket-client',
     ],
     # Incompatible code in ICU.
     'third_party/icu': [
diff --git a/tools/perf/PRESUBMIT.py b/tools/perf/PRESUBMIT.py
index bf22604..e2a028e 100644
--- a/tools/perf/PRESUBMIT.py
+++ b/tools/perf/PRESUBMIT.py
@@ -11,7 +11,7 @@ def _CommonChecks(input_api, output_api):
   results = []
   old_sys_path = sys.path
   try:
-    sys.path = [os.path.join('..', 'chrome_remote_control')] + sys.path
+    sys.path = [os.path.join('..', 'telemetry')] + sys.path
     results.extend(input_api.canned_checks.RunPylint(
         input_api, output_api,
         black_list=PYLINT_BLACKLIST,
diff --git a/tools/perf/page_sets/page_sets_unittest.py b/tools/perf/page_sets/page_sets_unittest.py
index fe6c589..1d8580d 100644
--- a/tools/perf/page_sets/page_sets_unittest.py
+++ b/tools/perf/page_sets/page_sets_unittest.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 import unittest
 
-from chrome_remote_control import page_set
+from telemetry import page_set
 import page_sets
 
 class PageSetsUnittest(unittest.TestCase):
diff --git a/tools/perf/perf_tools/__init__.py b/tools/perf/perf_tools/__init__.py
index 525a274..9106907 100644
--- a/tools/perf/perf_tools/__init__.py
+++ b/tools/perf/perf_tools/__init__.py
@@ -6,9 +6,9 @@ import os
 import sys
 
 def Init():
-  crc_path = os.path.join(os.path.dirname(__file__),
-                          '..', '..', 'chrome_remote_control')
-  absolute_crc_path = os.path.abspath(crc_path)
-  sys.path.append(absolute_crc_path)
+  telemetry_path = os.path.join(os.path.dirname(__file__),
+                          '..', '..', 'telemetry')
+  absolute_telemetry_path = os.path.abspath(telemetry_path)
+  sys.path.append(absolute_telemetry_path)
 
 Init()
diff --git a/tools/perf/perf_tools/first_paint_time_benchmark.py b/tools/perf/perf_tools/first_paint_time_benchmark.py
index ceab188..b781fee 100644
--- a/tools/perf/perf_tools/first_paint_time_benchmark.py
+++ b/tools/perf/perf_tools/first_paint_time_benchmark.py
@@ -4,8 +4,8 @@
 
 # The test takes a list of URLs through stdin and prints results in CSV format.
 # Example: python run_scroll_test.py < data/urls.txt > test_results.csv
-from chrome_remote_control import multi_page_benchmark
-from chrome_remote_control import util
+from telemetry import multi_page_benchmark
+from telemetry import util
 
 class FirstPaintTimeBenchmark(multi_page_benchmark.MultiPageBenchmark):
   def MeasurePage(self, _, tab, results):
diff --git a/tools/perf/perf_tools/first_paint_time_benchmark_unittest.py b/tools/perf/perf_tools/first_paint_time_benchmark_unittest.py
index 60a549d..a4e8869 100644
--- a/tools/perf/perf_tools/first_paint_time_benchmark_unittest.py
+++ b/tools/perf/perf_tools/first_paint_time_benchmark_unittest.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-from chrome_remote_control import multi_page_benchmark_unittest_base
+from telemetry import multi_page_benchmark_unittest_base
 from perf_tools import first_paint_time_benchmark
 
 class FirstPaintTimeBenchmarkUnitTest(
diff --git a/tools/perf/perf_tools/jsgamebench.py b/tools/perf/perf_tools/jsgamebench.py
index e2df1d2..347edf0 100644
--- a/tools/perf/perf_tools/jsgamebench.py
+++ b/tools/perf/perf_tools/jsgamebench.py
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from chrome_remote_control import multi_page_benchmark
-from chrome_remote_control import util
+from telemetry import multi_page_benchmark
+from telemetry import util
 
 class JsGameBench(multi_page_benchmark.MultiPageBenchmark):
   def MeasurePage(self, _, tab, results):
diff --git a/tools/perf/perf_tools/kraken.py b/tools/perf/perf_tools/kraken.py
index a854634..cd6507b 100644
--- a/tools/perf/perf_tools/kraken.py
+++ b/tools/perf/perf_tools/kraken.py
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from chrome_remote_control import multi_page_benchmark
-from chrome_remote_control import util
+from telemetry import multi_page_benchmark
+from telemetry import util
 
 def _Mean(l):
   return float(sum(l)) / len(l) if len(l) > 0 else 0.0
diff --git a/tools/perf/perf_tools/painting_benchmark.py b/tools/perf/perf_tools/painting_benchmark.py
index cde8243..7bd4557 100644
--- a/tools/perf/perf_tools/painting_benchmark.py
+++ b/tools/perf/perf_tools/painting_benchmark.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-from chrome_remote_control import multi_page_benchmark
+from telemetry import multi_page_benchmark
 from perf_tools import scrolling_benchmark
 
 class PaintingBenchmark(scrolling_benchmark.ScrollingBenchmark):
diff --git a/tools/perf/perf_tools/robohornetpro.py b/tools/perf/perf_tools/robohornetpro.py
index ab06ace..59632c3 100644
--- a/tools/perf/perf_tools/robohornetpro.py
+++ b/tools/perf/perf_tools/robohornetpro.py
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from chrome_remote_control import multi_page_benchmark
-from chrome_remote_control import util
+from telemetry import multi_page_benchmark
+from telemetry import util
 
 class RobohornetPro(multi_page_benchmark.MultiPageBenchmark):
   def CustomizeBrowserOptions(self, options):
diff --git a/tools/perf/perf_tools/scrolling_benchmark.py b/tools/perf/perf_tools/scrolling_benchmark.py
index b25ca53..0dfeb43 100644
--- a/tools/perf/perf_tools/scrolling_benchmark.py
+++ b/tools/perf/perf_tools/scrolling_benchmark.py
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 import os
 
-from chrome_remote_control import multi_page_benchmark
-from chrome_remote_control import util
+from telemetry import multi_page_benchmark
+from telemetry import util
 
 class DidNotScrollException(multi_page_benchmark.MeasurementFailure):
   def __init__(self):
diff --git a/tools/perf/perf_tools/scrolling_benchmark_unittest.py b/tools/perf/perf_tools/scrolling_benchmark_unittest.py
index 7848517..e10bd4b 100644
--- a/tools/perf/perf_tools/scrolling_benchmark_unittest.py
+++ b/tools/perf/perf_tools/scrolling_benchmark_unittest.py
@@ -1,8 +1,8 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-from chrome_remote_control import multi_page_benchmark
-from chrome_remote_control import multi_page_benchmark_unittest_base
+from telemetry import multi_page_benchmark
+from telemetry import multi_page_benchmark_unittest_base
 from perf_tools import scrolling_benchmark
 
 class ScrollingBenchmarkUnitTest(
diff --git a/tools/perf/perf_tools/skpicture_printer.py b/tools/perf/perf_tools/skpicture_printer.py
index 33a4974..ec55df8 100755
--- a/tools/perf/perf_tools/skpicture_printer.py
+++ b/tools/perf/perf_tools/skpicture_printer.py
@@ -5,7 +5,7 @@
 import os
 import re
 
-from chrome_remote_control import multi_page_benchmark
+from telemetry import multi_page_benchmark
 
 _JS = 'chrome.gpuBenchmarking.printToSkPicture("{0}");'
 
diff --git a/tools/perf/perf_tools/skpicture_printer_unittest.py b/tools/perf/perf_tools/skpicture_printer_unittest.py
index 6aaac7f..285b48c 100755
--- a/tools/perf/perf_tools/skpicture_printer_unittest.py
+++ b/tools/perf/perf_tools/skpicture_printer_unittest.py
@@ -6,7 +6,7 @@ import os
 import tempfile
 import shutil
 
-from chrome_remote_control import multi_page_benchmark_unittest_base
+from telemetry import multi_page_benchmark_unittest_base
 from perf_tools import skpicture_printer
 
 class SkPicturePrinterUnitTest(
diff --git a/tools/perf/perf_tools/spaceport.py b/tools/perf/perf_tools/spaceport.py
index b248459..363e523 100644
--- a/tools/perf/perf_tools/spaceport.py
+++ b/tools/perf/perf_tools/spaceport.py
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from chrome_remote_control import multi_page_benchmark
-from chrome_remote_control import util
+from telemetry import multi_page_benchmark
+from telemetry import util
 
 class SpaceportBenchmark(multi_page_benchmark.MultiPageBenchmark):
   def CustomizeBrowserOptions(self, options):
diff --git a/tools/perf/run_multipage_benchmarks b/tools/perf/run_multipage_benchmarks
index c859c30..ac22e43 100755
--- a/tools/perf/run_multipage_benchmarks
+++ b/tools/perf/run_multipage_benchmarks
@@ -6,7 +6,7 @@ import os
 import sys
 
 import perf_tools
-from chrome_remote_control import multi_page_benchmark_runner
+from telemetry import multi_page_benchmark_runner
 
 if __name__ == '__main__':
   benchmark_dir = os.path.join(os.path.dirname(__file__), 'perf_tools')
diff --git a/tools/perf/run_tests b/tools/perf/run_tests
index 2e78b56..384a0ca 100755
--- a/tools/perf/run_tests
+++ b/tools/perf/run_tests
@@ -12,17 +12,17 @@ import os
 import sys
 
 import perf_tools
-import chrome_remote_control.run_tests
+import telemetry.run_tests
 
 if __name__ == '__main__':
   top_level_dir = os.path.abspath(
     os.path.dirname(__file__))
   start_dir = 'perf_tools'
-  ret = chrome_remote_control.run_tests.Main(
+  ret = telemetry.run_tests.Main(
     sys.argv[1:], start_dir, top_level_dir)
 
   start_dir = 'page_sets'
-  ret = chrome_remote_control.run_tests.Main(
+  ret = telemetry.run_tests.Main(
     sys.argv[1:], start_dir, top_level_dir)
 
   sys.exit(ret)
diff --git a/tools/chrome_remote_control/.gitignore b/tools/telemetry/.gitignore
index 4269dc8..4269dc8 100644
--- a/tools/chrome_remote_control/.gitignore
+++ b/tools/telemetry/.gitignore
diff --git a/tools/chrome_remote_control/OWNERS b/tools/telemetry/OWNERS
index 1cbe471..1cbe471 100644
--- a/tools/chrome_remote_control/OWNERS
+++ b/tools/telemetry/OWNERS
diff --git a/tools/chrome_remote_control/PRESUBMIT.py b/tools/telemetry/PRESUBMIT.py
index fcc7fe4..6866cc2 100644
--- a/tools/chrome_remote_control/PRESUBMIT.py
+++ b/tools/telemetry/PRESUBMIT.py
@@ -11,7 +11,7 @@ def _CommonChecks(input_api, output_api):
   results = []
   old_sys_path = sys.path
   try:
-    sys.path = [os.path.join('..', 'chrome_remote_control')] + sys.path
+    sys.path = [os.path.join('..', 'telemetry')] + sys.path
     results.extend(input_api.canned_checks.RunPylint(
         input_api, output_api,
         black_list=PYLINT_BLACKLIST,
diff --git a/tools/chrome_remote_control/README b/tools/telemetry/README
index 42a13a2..744f53f 100644
--- a/tools/chrome_remote_control/README
+++ b/tools/telemetry/README
@@ -1,4 +1,4 @@
-chrome_remote_control provides automation of chrome instances on top of the
+telemetry provides automation of chrome instances on top of the
 chrome developer tools protocol.
 
 The protocol we use:
diff --git a/tools/chrome_remote_control/examples/credentials_example.json b/tools/telemetry/examples/credentials_example.json
index c7c53c5..c7c53c5 100644
--- a/tools/chrome_remote_control/examples/credentials_example.json
+++ b/tools/telemetry/examples/credentials_example.json
diff --git a/tools/chrome_remote_control/examples/list_available_browsers b/tools/telemetry/examples/list_available_browsers
index be0336e..d40646c 100755
--- a/tools/chrome_remote_control/examples/list_available_browsers
+++ b/tools/telemetry/examples/list_available_browsers
@@ -8,10 +8,10 @@ import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 
-import chrome_remote_control
+import telemetry
 
 def Main(args):
-  options = chrome_remote_control.BrowserOptions()
+  options = telemetry.BrowserOptions()
   options.browser_type = 'list';
   parser = options.CreateParser('list_available_browsers')
   parser.parse_args()
diff --git a/tools/chrome_remote_control/examples/rendering_microbenchmark_test.py b/tools/telemetry/examples/rendering_microbenchmark_test.py
index 4dd26ed..9976c74 100755
--- a/tools/chrome_remote_control/examples/rendering_microbenchmark_test.py
+++ b/tools/telemetry/examples/rendering_microbenchmark_test.py
@@ -8,10 +8,10 @@ import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 
-import chrome_remote_control
+import telemetry
 
 def Main(args):
-  options = chrome_remote_control.BrowserOptions()
+  options = telemetry.BrowserOptions()
   parser = options.CreateParser('rendering_microbenchmark_test.py <sitelist>')
   # TODO(nduca): Add test specific options here, if any.
   options, args = parser.parse_args(args)
@@ -28,10 +28,10 @@ def Main(args):
       urls.append(url)
 
   options.extra_browser_args.append('--enable-gpu-benchmarking')
-  browser_to_create = chrome_remote_control.FindBrowser(options)
+  browser_to_create = telemetry.FindBrowser(options)
   if not browser_to_create:
     sys.stderr.write('No browser found! Supported types: %s' %
-        chrome_remote_control.GetAllAvailableBrowserTypes(options))
+        telemetry.GetAllAvailableBrowserTypes(options))
     return 255
   with browser_to_create.Create() as b:
     with b.ConnectToNthTab(0) as tab:
diff --git a/tools/chrome_remote_control/examples/crc_perf_test.py b/tools/telemetry/examples/telemetry_perf_test.py
index fd76a37..de9aceb 100755
--- a/tools/chrome_remote_control/examples/crc_perf_test.py
+++ b/tools/telemetry/examples/telemetry_perf_test.py
@@ -8,14 +8,14 @@ import time
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 
-import chrome_remote_control
+import telemetry
 
 def Main(args):
-  options = chrome_remote_control.BrowserOptions()
-  parser = options.CreateParser('crc_perf_test.py')
+  options = telemetry.BrowserOptions()
+  parser = options.CreateParser('telemetry_perf_test.py')
   options, args = parser.parse_args(args)
 
-  browser_to_create = chrome_remote_control.FindBrowser(options)
+  browser_to_create = telemetry.FindBrowser(options)
   assert browser_to_create
   with browser_to_create.Create() as b:
     with b.ConnectToNthTab(0) as tab:
diff --git a/tools/chrome_remote_control/examples/top1k b/tools/telemetry/examples/top1k
index f32a38c..f32a38c 100644
--- a/tools/chrome_remote_control/examples/top1k
+++ b/tools/telemetry/examples/top1k
diff --git a/tools/chrome_remote_control/run_tests b/tools/telemetry/run_tests
index e6d64bf..43a9ec2 100755
--- a/tools/chrome_remote_control/run_tests
+++ b/tools/telemetry/run_tests
@@ -5,12 +5,12 @@
 import os
 import sys
 
-import chrome_remote_control.run_tests
+import telemetry.run_tests
 
 if __name__ == '__main__':
   top_level_dir = os.path.abspath(
     os.path.dirname(__file__))
-  start_dir = 'chrome_remote_control'
-  ret = chrome_remote_control.run_tests.Main(
+  start_dir = 'telemetry'
+  ret = telemetry.run_tests.Main(
     sys.argv[1:], start_dir, top_level_dir)
   sys.exit(ret)
diff --git a/tools/chrome_remote_control/chrome_remote_control/__init__.py b/tools/telemetry/telemetry/__init__.py
index d08a896..04f488e 100644
--- a/tools/chrome_remote_control/chrome_remote_control/__init__.py
+++ b/tools/telemetry/telemetry/__init__.py
@@ -4,14 +4,14 @@
 """A library for chrome-based tests.
 
 """
-from chrome_remote_control.browser import Browser
-from chrome_remote_control.browser_finder import FindBrowser
-from chrome_remote_control.browser_finder import GetAllAvailableBrowserTypes
-from chrome_remote_control.browser_gone_exception import BrowserGoneException
-from chrome_remote_control.browser_options import BrowserOptions
-from chrome_remote_control.tab import Tab
-from chrome_remote_control.tab_crash_exception import TabCrashException
-from chrome_remote_control.util import TimeoutException, WaitFor
+from telemetry.browser import Browser
+from telemetry.browser_finder import FindBrowser
+from telemetry.browser_finder import GetAllAvailableBrowserTypes
+from telemetry.browser_gone_exception import BrowserGoneException
+from telemetry.browser_options import BrowserOptions
+from telemetry.tab import Tab
+from telemetry.tab_crash_exception import TabCrashException
+from telemetry.util import TimeoutException, WaitFor
 
 def CreateBrowser(browser_type):
   """Shorthand way to create a browser of a given type
diff --git a/tools/chrome_remote_control/chrome_remote_control/adb_commands.py b/tools/telemetry/telemetry/adb_commands.py
index a1dbb40..a1dbb40 100644
--- a/tools/chrome_remote_control/chrome_remote_control/adb_commands.py
+++ b/tools/telemetry/telemetry/adb_commands.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/android_browser_backend.py b/tools/telemetry/telemetry/android_browser_backend.py
index 1ed1372..b5aaa62 100644
--- a/tools/chrome_remote_control/chrome_remote_control/android_browser_backend.py
+++ b/tools/telemetry/telemetry/android_browser_backend.py
@@ -5,9 +5,9 @@ import logging
 import tempfile
 import json
 
-from chrome_remote_control import adb_commands
-from chrome_remote_control import browser_backend
-from chrome_remote_control import browser_gone_exception
+from telemetry import adb_commands
+from telemetry import browser_backend
+from telemetry import browser_gone_exception
 
 class AndroidBrowserBackend(browser_backend.BrowserBackend):
   """The backend for controlling a browser instance running on Android.
@@ -34,7 +34,7 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend):
     # to somewhere safe.
     if not is_content_shell and not options.dont_override_profile:
       # Set up the temp dir
-      # self._tmpdir = '/sdcard/chrome_remote_control_data'
+      # self._tmpdir = '/sdcard/telemetry_data'
       # self._adb.RunShellCommand('rm -r %s' %  self._tmpdir)
       # args.append('--user-data-dir=%s' % self._tmpdir)
       pass
diff --git a/tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py b/tools/telemetry/telemetry/android_browser_finder.py
index a0d4b04..83e1030 100644
--- a/tools/chrome_remote_control/chrome_remote_control/android_browser_finder.py
+++ b/tools/telemetry/telemetry/android_browser_finder.py
@@ -1,18 +1,18 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-"""Finds android browsers that can be controlled by chrome_remote_control."""
+"""Finds android browsers that can be controlled by telemetry."""
 
 import os
 import logging as real_logging
 import re
 import subprocess
 
-from chrome_remote_control import adb_commands
-from chrome_remote_control import android_browser_backend
-from chrome_remote_control import android_platform
-from chrome_remote_control import browser
-from chrome_remote_control import possible_browser
+from telemetry import adb_commands
+from telemetry import android_browser_backend
+from telemetry import android_platform
+from telemetry import browser
+from telemetry import possible_browser
 
 ALL_BROWSER_TYPES = ','.join([
     'android-content-shell',
@@ -139,7 +139,7 @@ def FindAllAvailableBrowsers(options, logging=real_logging):
   # See if the "forwarder" is installed -- we need this to host content locally
   # but make it accessible to the device.
   if len(possible_browsers) and not adb_commands.HasForwarder(adb):
-    logging.warn('chrome_remote_control detected an android device. However,')
+    logging.warn('telemetry detected an android device. However,')
     logging.warn('Chrome\'s port-forwarder app is not available.')
     logging.warn('To build:')
     logging.warn('  make -j16 host_forwarder device_forwarder')
diff --git a/tools/chrome_remote_control/chrome_remote_control/android_browser_finder_unittest.py b/tools/telemetry/telemetry/android_browser_finder_unittest.py
index 1bdba4a..ef1c75b 100644
--- a/tools/chrome_remote_control/chrome_remote_control/android_browser_finder_unittest.py
+++ b/tools/telemetry/telemetry/android_browser_finder_unittest.py
@@ -3,9 +3,9 @@
 # found in the LICENSE file.
 import unittest
 
-from chrome_remote_control import android_browser_finder
-from chrome_remote_control import browser_options
-from chrome_remote_control import system_stub
+from telemetry import android_browser_finder
+from telemetry import browser_options
+from telemetry import system_stub
 
 class LoggingStub(object):
   def __init__(self):
diff --git a/tools/chrome_remote_control/chrome_remote_control/android_platform.py b/tools/telemetry/telemetry/android_platform.py
index 6e544d7..6e544d7 100644
--- a/tools/chrome_remote_control/chrome_remote_control/android_platform.py
+++ b/tools/telemetry/telemetry/android_platform.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/browser.py b/tools/telemetry/telemetry/browser.py
index a755ccf..96dcc9b 100644
--- a/tools/chrome_remote_control/chrome_remote_control/browser.py
+++ b/tools/telemetry/telemetry/browser.py
@@ -3,10 +3,10 @@
 # found in the LICENSE file.
 import os
 
-from chrome_remote_control import temporary_http_server
-from chrome_remote_control import browser_credentials
-from chrome_remote_control import wpr_modes
-from chrome_remote_control import wpr_server
+from telemetry import temporary_http_server
+from telemetry import browser_credentials
+from telemetry import wpr_modes
+from telemetry import wpr_server
 
 class Browser(object):
   """A running browser instance that can be controlled in a limited way.
diff --git a/tools/chrome_remote_control/chrome_remote_control/browser_backend.py b/tools/telemetry/telemetry/browser_backend.py
index a779254..52fbdb2 100644
--- a/tools/chrome_remote_control/chrome_remote_control/browser_backend.py
+++ b/tools/telemetry/telemetry/browser_backend.py
@@ -6,12 +6,12 @@ import httplib
 import socket
 import json
 
-from chrome_remote_control import browser_gone_exception
-from chrome_remote_control import inspector_backend
-from chrome_remote_control import tab
-from chrome_remote_control import util
-from chrome_remote_control import wpr_modes
-from chrome_remote_control import wpr_server
+from telemetry import browser_gone_exception
+from telemetry import inspector_backend
+from telemetry import tab
+from telemetry import util
+from telemetry import wpr_modes
+from telemetry import wpr_server
 
 class BrowserBackend(object):
   """A base class for broser backends. Provides basic functionality
diff --git a/tools/chrome_remote_control/chrome_remote_control/browser_credentials.py b/tools/telemetry/telemetry/browser_credentials.py
index 2e00e8c53..9908d91 100644
--- a/tools/chrome_remote_control/chrome_remote_control/browser_credentials.py
+++ b/tools/telemetry/telemetry/browser_credentials.py
@@ -5,9 +5,9 @@ import logging
 import json
 import os
 
-from chrome_remote_control import facebook_credentials_backend
-from chrome_remote_control import google_credentials_backend
-from chrome_remote_control import options_for_unittests
+from telemetry import facebook_credentials_backend
+from telemetry import google_credentials_backend
+from telemetry import options_for_unittests
 
 class BrowserCredentials(object):
   def __init__(self, backends = None):
@@ -71,13 +71,13 @@ class BrowserCredentials(object):
         credentials = json.loads(f.read())
 
     # TODO(nduca): use system keychain, if possible.
-    homedir_credentials_path = os.path.expanduser('~/.crc-credentials')
+    homedir_credentials_path = os.path.expanduser('~/.telemetry-credentials')
     homedir_credentials = {}
 
     if (not options_for_unittests.Get() and
         os.path.exists(homedir_credentials_path)):
-      logging.info("Found ~/.crc-credentials. Its contents will be used when "
-                   "no other credentials can be found.")
+      logging.info("Found ~/.telemetry-credentials. Its contents will be used "
+                   "when no other credentials can be found.")
       with open(homedir_credentials_path, 'r') as f:
         homedir_credentials = json.loads(f.read())
 
@@ -90,7 +90,7 @@ class BrowserCredentials(object):
       if k in credentials:
         self._credentials[k] = credentials[k]
       if k in homedir_credentials:
-        logging.info("Will use ~/.crc-credentials for %s logins." % k)
+        logging.info("Will use ~/.telemetry-credentials for %s logins." % k)
         self._credentials[k] = homedir_credentials[k]
       if k in self._extra_credentials:
         self._credentials[k] = self._extra_credentials[k]
@@ -110,7 +110,7 @@ class BrowserCredentials(object):
         files_to_tweak.append(
           os.path.relpath(os.path.join(page_set.base_dir,
                                        page_set.credentials_path)))
-      files_to_tweak.append('~/.crc-credentials')
+      files_to_tweak.append('~/.telemetry-credentials')
 
       example_credentials_file = (
         os.path.relpath(
diff --git a/tools/chrome_remote_control/chrome_remote_control/browser_credentials_unittest.py b/tools/telemetry/telemetry/browser_credentials_unittest.py
index 5b775cb..28b0d77 100644
--- a/tools/chrome_remote_control/chrome_remote_control/browser_credentials_unittest.py
+++ b/tools/telemetry/telemetry/browser_credentials_unittest.py
@@ -4,7 +4,7 @@
 import unittest
 import tempfile
 
-from chrome_remote_control import browser_credentials
+from telemetry import browser_credentials
 
 SIMPLE_CREDENTIALS_STRING = """
 {
diff --git a/tools/chrome_remote_control/chrome_remote_control/browser_finder.py b/tools/telemetry/telemetry/browser_finder.py
index fb2a217..82a98b2 100644
--- a/tools/chrome_remote_control/chrome_remote_control/browser_finder.py
+++ b/tools/telemetry/telemetry/browser_finder.py
@@ -1,13 +1,13 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-"""Finds browsers that can be controlled by chrome_remote_control."""
+"""Finds browsers that can be controlled by telemetry."""
 
 import logging
 
-from chrome_remote_control import android_browser_finder
-from chrome_remote_control import cros_browser_finder
-from chrome_remote_control import desktop_browser_finder
+from telemetry import android_browser_finder
+from telemetry import cros_browser_finder
+from telemetry import desktop_browser_finder
 
 ALL_BROWSER_TYPES = (
     desktop_browser_finder.ALL_BROWSER_TYPES + ',' +
diff --git a/tools/chrome_remote_control/chrome_remote_control/browser_gone_exception.py b/tools/telemetry/telemetry/browser_gone_exception.py
index 56bf012..56bf012 100644
--- a/tools/chrome_remote_control/chrome_remote_control/browser_gone_exception.py
+++ b/tools/telemetry/telemetry/browser_gone_exception.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/browser_options.py b/tools/telemetry/telemetry/browser_options.py
index d624c85..25eff1f 100644
--- a/tools/chrome_remote_control/chrome_remote_control/browser_options.py
+++ b/tools/telemetry/telemetry/browser_options.py
@@ -7,8 +7,8 @@ import sys
 import shlex
 import logging
 
-from chrome_remote_control import browser_finder
-from chrome_remote_control import wpr_modes
+from telemetry import browser_finder
+from telemetry import wpr_modes
 
 class BrowserOptions(optparse.Values):
   """Options to be used for discovering and launching a browser."""
diff --git a/tools/chrome_remote_control/chrome_remote_control/browser_options_unittest.py b/tools/telemetry/telemetry/browser_options_unittest.py
index 9b52416..c92c02a 100644
--- a/tools/chrome_remote_control/chrome_remote_control/browser_options_unittest.py
+++ b/tools/telemetry/telemetry/browser_options_unittest.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 import unittest
 
-from chrome_remote_control import browser_options
+from telemetry import browser_options
 
 class BrowserOptionsTest(unittest.TestCase):
   def testDefaults(self):
diff --git a/tools/chrome_remote_control/chrome_remote_control/browser_unittest.py b/tools/telemetry/telemetry/browser_unittest.py
index 0735870..d49509e 100644
--- a/tools/chrome_remote_control/chrome_remote_control/browser_unittest.py
+++ b/tools/telemetry/telemetry/browser_unittest.py
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 import unittest
 
-from chrome_remote_control import browser_finder
-from chrome_remote_control import options_for_unittests
+from telemetry import browser_finder
+from telemetry import options_for_unittests
 
 class BrowserTest(unittest.TestCase):
   def testBrowserCreation(self):
@@ -24,7 +24,7 @@ class BrowserTest(unittest.TestCase):
     # being set.
     options = options_for_unittests.Get()
 
-    flag1 = '--user-agent=chrome_remote_control'
+    flag1 = '--user-agent=telemetry'
     options.extra_browser_args.append(flag1)
 
     browser_to_create = browser_finder.FindBrowser(options)
@@ -33,7 +33,7 @@ class BrowserTest(unittest.TestCase):
         t.page.Navigate('http://www.google.com/')
         t.WaitForDocumentReadyStateToBeInteractiveOrBetter()
         self.assertEquals(t.runtime.Evaluate('navigator.userAgent'),
-                          'chrome_remote_control')
+                          'telemetry')
 
   def testNewCloseTab(self):
     options = options_for_unittests.Get()
diff --git a/tools/chrome_remote_control/chrome_remote_control/cros_browser_backend.py b/tools/telemetry/telemetry/cros_browser_backend.py
index 25f02cc..e1d6c5b 100644
--- a/tools/chrome_remote_control/chrome_remote_control/cros_browser_backend.py
+++ b/tools/telemetry/telemetry/cros_browser_backend.py
@@ -6,8 +6,8 @@ import socket
 import subprocess
 import time
 
-from chrome_remote_control import browser_backend
-from chrome_remote_control import cros_interface
+from telemetry import browser_backend
+from telemetry import cros_interface
 
 class CrOSBrowserBackend(browser_backend.BrowserBackend):
   """The backend for controlling a browser instance running on CrOS.
@@ -42,7 +42,7 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend):
     # Set up user data dir.
     if not is_content_shell:
       logging.info('Preparing user data dir')
-      self._tmpdir = '/tmp/chrome_remote_control'
+      self._tmpdir = '/tmp/telemetry'
       if options.dont_override_profile:
         # TODO(nduca): Implement support for this.
         logging.critical('Feature not (yet) implemented.')
diff --git a/tools/chrome_remote_control/chrome_remote_control/cros_browser_finder.py b/tools/telemetry/telemetry/cros_browser_finder.py
index 5d45cda..7c3b3f8 100644
--- a/tools/chrome_remote_control/chrome_remote_control/cros_browser_finder.py
+++ b/tools/telemetry/telemetry/cros_browser_finder.py
@@ -1,15 +1,15 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-"""Finds android browsers that can be controlled by chrome_remote_control."""
+"""Finds android browsers that can be controlled by telemetry."""
 
 import logging
 
-from chrome_remote_control import browser
-from chrome_remote_control import platform
-from chrome_remote_control import possible_browser
-from chrome_remote_control import cros_browser_backend
-from chrome_remote_control import cros_interface
+from telemetry import browser
+from telemetry import platform
+from telemetry import possible_browser
+from telemetry import cros_browser_backend
+from telemetry import cros_interface
 
 ALL_BROWSER_TYPES = ','.join([
     'cros-chrome',
diff --git a/tools/chrome_remote_control/chrome_remote_control/cros_browser_finder_unittest.py b/tools/telemetry/telemetry/cros_browser_finder_unittest.py
index 07f2e03..07f2e03 100644
--- a/tools/chrome_remote_control/chrome_remote_control/cros_browser_finder_unittest.py
+++ b/tools/telemetry/telemetry/cros_browser_finder_unittest.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/cros_interface.py b/tools/telemetry/telemetry/cros_interface.py
index b03356f..5e3232c 100644
--- a/tools/chrome_remote_control/chrome_remote_control/cros_interface.py
+++ b/tools/telemetry/telemetry/cros_interface.py
@@ -10,7 +10,7 @@ import sys
 import time
 import tempfile
 
-from chrome_remote_control import util
+from telemetry import util
 
 _next_remote_port = 9224
 
diff --git a/tools/chrome_remote_control/chrome_remote_control/cros_interface_unittest.py b/tools/telemetry/telemetry/cros_interface_unittest.py
index fea1aa8..a445a5c 100644
--- a/tools/chrome_remote_control/chrome_remote_control/cros_interface_unittest.py
+++ b/tools/telemetry/telemetry/cros_interface_unittest.py
@@ -7,9 +7,9 @@
 # a bit.
 import unittest
 
-from chrome_remote_control import cros_interface
-from chrome_remote_control import options_for_unittests
-from chrome_remote_control import run_tests
+from telemetry import cros_interface
+from telemetry import options_for_unittests
+from telemetry import run_tests
 
 class CrOSInterfaceTest(unittest.TestCase):
   @run_tests.RequiresBrowserOfType('cros-chrome')
diff --git a/tools/chrome_remote_control/chrome_remote_control/desktop_browser_backend.py b/tools/telemetry/telemetry/desktop_browser_backend.py
index fbc6832..5d20c5d 100644
--- a/tools/chrome_remote_control/chrome_remote_control/desktop_browser_backend.py
+++ b/tools/telemetry/telemetry/desktop_browser_backend.py
@@ -6,8 +6,8 @@ import subprocess as subprocess
 import shutil
 import tempfile
 
-from chrome_remote_control import browser_backend
-from chrome_remote_control import util
+from telemetry import browser_backend
+from telemetry import util
 
 DEFAULT_PORT = 9273
 
diff --git a/tools/chrome_remote_control/chrome_remote_control/desktop_browser_finder.py b/tools/telemetry/telemetry/desktop_browser_finder.py
index 343c7b2..15c630d 100644
--- a/tools/chrome_remote_control/chrome_remote_control/desktop_browser_finder.py
+++ b/tools/telemetry/telemetry/desktop_browser_finder.py
@@ -1,17 +1,17 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-"""Finds desktop browsers that can be controlled by chrome_remote_control."""
+"""Finds desktop browsers that can be controlled by telemetry."""
 
 import logging
 import os
 import subprocess
 import sys
 
-from chrome_remote_control import browser
-from chrome_remote_control import desktop_browser_backend
-from chrome_remote_control import platform
-from chrome_remote_control import possible_browser
+from telemetry import browser
+from telemetry import desktop_browser_backend
+from telemetry import platform
+from telemetry import possible_browser
 
 ALL_BROWSER_TYPES = ','.join([
     'exact',
diff --git a/tools/chrome_remote_control/chrome_remote_control/desktop_browser_finder_unittest.py b/tools/telemetry/telemetry/desktop_browser_finder_unittest.py
index fac32fc..52184cc 100644
--- a/tools/chrome_remote_control/chrome_remote_control/desktop_browser_finder_unittest.py
+++ b/tools/telemetry/telemetry/desktop_browser_finder_unittest.py
@@ -3,9 +3,9 @@
 # found in the LICENSE file.
 import unittest
 
-from chrome_remote_control import browser_options
-from chrome_remote_control import desktop_browser_finder
-from chrome_remote_control import system_stub
+from telemetry import browser_options
+from telemetry import desktop_browser_finder
+from telemetry import system_stub
 
 # This file verifies the logic for finding a browser instance on all platforms
 # at once. It does so by providing stubs for the OS/sys/subprocess primitives
diff --git a/tools/chrome_remote_control/chrome_remote_control/facebook_credentials_backend.py b/tools/telemetry/telemetry/facebook_credentials_backend.py
index 76ea13f..abde849 100644
--- a/tools/chrome_remote_control/chrome_remote_control/facebook_credentials_backend.py
+++ b/tools/telemetry/telemetry/facebook_credentials_backend.py
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from chrome_remote_control import form_based_credentials_backend
+from telemetry import form_based_credentials_backend
 
 class FacebookCredentialsBackend(
     form_based_credentials_backend.FormBasedCredentialsBackend):
diff --git a/tools/chrome_remote_control/chrome_remote_control/form_based_credentials_backend.py b/tools/telemetry/telemetry/form_based_credentials_backend.py
index 4876415..6a21cb8 100644
--- a/tools/chrome_remote_control/chrome_remote_control/form_based_credentials_backend.py
+++ b/tools/telemetry/telemetry/form_based_credentials_backend.py
@@ -4,8 +4,8 @@
 
 import logging
 
-import chrome_remote_control
-from chrome_remote_control import util
+import telemetry
+from telemetry import util
 
 def _WaitForFormToLoad(form_id, tab):
   def IsFormLoaded():
@@ -84,7 +84,7 @@ class FormBasedCredentialsBackend(object):
 
       self._logged_in = True
       return True
-    except chrome_remote_control.TimeoutException:
+    except telemetry.TimeoutException:
       logging.warning('Timed out while loading: %s', self.url)
       return False
 
diff --git a/tools/chrome_remote_control/chrome_remote_control/google_credentials_backend.py b/tools/telemetry/telemetry/google_credentials_backend.py
index 00b2118..600dff9 100644
--- a/tools/chrome_remote_control/chrome_remote_control/google_credentials_backend.py
+++ b/tools/telemetry/telemetry/google_credentials_backend.py
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from chrome_remote_control import form_based_credentials_backend
+from telemetry import form_based_credentials_backend
 
 class GoogleCredentialsBackend(
     form_based_credentials_backend.FormBasedCredentialsBackend):
diff --git a/tools/chrome_remote_control/chrome_remote_control/google_credentials_backend_unittest.py b/tools/telemetry/telemetry/google_credentials_backend_unittest.py
index 8b380f0..5c2ed7a 100644
--- a/tools/chrome_remote_control/chrome_remote_control/google_credentials_backend_unittest.py
+++ b/tools/telemetry/telemetry/google_credentials_backend_unittest.py
@@ -4,10 +4,10 @@
 import os
 import unittest
 
-from chrome_remote_control import browser_finder
-from chrome_remote_control import google_credentials_backend
-from chrome_remote_control import simple_mock
-from chrome_remote_control import options_for_unittests
+from telemetry import browser_finder
+from telemetry import google_credentials_backend
+from telemetry import simple_mock
+from telemetry import options_for_unittests
 
 _ = simple_mock.DONT_CARE
 
diff --git a/tools/chrome_remote_control/chrome_remote_control/inspector_backend.py b/tools/telemetry/telemetry/inspector_backend.py
index ae35ee9..83b4841 100644
--- a/tools/chrome_remote_control/chrome_remote_control/inspector_backend.py
+++ b/tools/telemetry/telemetry/inspector_backend.py
@@ -5,9 +5,9 @@ import json
 import logging
 import socket
 
-from chrome_remote_control import tab_crash_exception
-from chrome_remote_control import util
-from chrome_remote_control import websocket
+from telemetry import tab_crash_exception
+from telemetry import util
+from telemetry import websocket
 
 class InspectorException(Exception):
   pass
diff --git a/tools/chrome_remote_control/chrome_remote_control/inspector_console.py b/tools/telemetry/telemetry/inspector_console.py
index b9ea024..b9ea024 100644
--- a/tools/chrome_remote_control/chrome_remote_control/inspector_console.py
+++ b/tools/telemetry/telemetry/inspector_console.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/inspector_console_unittest.py b/tools/telemetry/telemetry/inspector_console_unittest.py
index 134b250..5e73706 100644
--- a/tools/chrome_remote_control/chrome_remote_control/inspector_console_unittest.py
+++ b/tools/telemetry/telemetry/inspector_console_unittest.py
@@ -5,8 +5,8 @@ import os
 import re
 import StringIO
 
-from chrome_remote_control import tab_test_case
-from chrome_remote_control import util
+from telemetry import tab_test_case
+from telemetry import util
 
 class TabConsoleTest(tab_test_case.TabTestCase):
   def testConsoleOutputStream(self):
diff --git a/tools/chrome_remote_control/chrome_remote_control/inspector_page.py b/tools/telemetry/telemetry/inspector_page.py
index 5018cb2..a879dcf 100644
--- a/tools/chrome_remote_control/chrome_remote_control/inspector_page.py
+++ b/tools/telemetry/telemetry/inspector_page.py
@@ -4,7 +4,7 @@
 import json
 import logging
 
-from chrome_remote_control import util
+from telemetry import util
 
 class InspectorPage(object):
   def __init__(self, inspector_backend):
diff --git a/tools/chrome_remote_control/chrome_remote_control/inspector_page_unittest.py b/tools/telemetry/telemetry/inspector_page_unittest.py
index 7b6df99..fee527a 100644
--- a/tools/chrome_remote_control/chrome_remote_control/inspector_page_unittest.py
+++ b/tools/telemetry/telemetry/inspector_page_unittest.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-from chrome_remote_control import tab_test_case
+from telemetry import tab_test_case
 
 class InspectorPageTest(tab_test_case.TabTestCase):
   def testPageNavigateToNormalUrl(self):
diff --git a/tools/chrome_remote_control/chrome_remote_control/inspector_runtime.py b/tools/telemetry/telemetry/inspector_runtime.py
index 4479b66..4479b66 100644
--- a/tools/chrome_remote_control/chrome_remote_control/inspector_runtime.py
+++ b/tools/telemetry/telemetry/inspector_runtime.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/inspector_runtime_unittest.py b/tools/telemetry/telemetry/inspector_runtime_unittest.py
index ccc31e0..96d089f 100644
--- a/tools/chrome_remote_control/chrome_remote_control/inspector_runtime_unittest.py
+++ b/tools/telemetry/telemetry/inspector_runtime_unittest.py
@@ -1,8 +1,8 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-from chrome_remote_control import inspector_runtime
-from chrome_remote_control import tab_test_case
+from telemetry import inspector_runtime
+from telemetry import tab_test_case
 
 class InspectorRuntimeTest(tab_test_case.TabTestCase):
   def testRuntimeEvaluateSimple(self):
diff --git a/tools/chrome_remote_control/chrome_remote_control/multi_page_benchmark.py b/tools/telemetry/telemetry/multi_page_benchmark.py
index 064a5d3..a17a031 100644
--- a/tools/chrome_remote_control/chrome_remote_control/multi_page_benchmark.py
+++ b/tools/telemetry/telemetry/multi_page_benchmark.py
@@ -5,7 +5,7 @@ from collections import defaultdict
 import os
 import sys
 
-from chrome_remote_control import page_test
+from telemetry import page_test
 
 # Get build/android/pylib scripts into our path.
 # TODO(tonyg): Move perf_tests_helper.py to a common location.
@@ -158,7 +158,7 @@ class MultiPageBenchmark(page_test.PageTest):
     """Override to actually measure the page's performance.
 
     page is a page_set.Page
-    tab is an instance of chrome_remote_control.Tab
+    tab is an instance of telemetry.Tab
 
     Should call results.Add(name, units, value) for each result, or raise an
     exception on failure. The name and units of each Add() call must be
diff --git a/tools/chrome_remote_control/chrome_remote_control/multi_page_benchmark_runner.py b/tools/telemetry/telemetry/multi_page_benchmark_runner.py
index 7b58a97..48837ee 100755
--- a/tools/chrome_remote_control/chrome_remote_control/multi_page_benchmark_runner.py
+++ b/tools/telemetry/telemetry/multi_page_benchmark_runner.py
@@ -9,11 +9,11 @@ import os
 import sys
 import traceback
 
-from chrome_remote_control import browser_finder
-from chrome_remote_control import browser_options
-from chrome_remote_control import multi_page_benchmark
-from chrome_remote_control import page_runner
-from chrome_remote_control import page_set
+from telemetry import browser_finder
+from telemetry import browser_options
+from telemetry import multi_page_benchmark
+from telemetry import page_runner
+from telemetry import page_set
 
 
 def _Discover(start_dir, clazz):
diff --git a/tools/chrome_remote_control/chrome_remote_control/multi_page_benchmark_unittest.py b/tools/telemetry/telemetry/multi_page_benchmark_unittest.py
index a902518..ca59014 100644
--- a/tools/chrome_remote_control/chrome_remote_control/multi_page_benchmark_unittest.py
+++ b/tools/telemetry/telemetry/multi_page_benchmark_unittest.py
@@ -3,11 +3,11 @@
 # found in the LICENSE file.
 import os
 
-from chrome_remote_control import multi_page_benchmark
-from chrome_remote_control import multi_page_benchmark_unittest_base
-from chrome_remote_control import page as page_module
-from chrome_remote_control import page_set
-from chrome_remote_control import wpr_modes
+from telemetry import multi_page_benchmark
+from telemetry import multi_page_benchmark_unittest_base
+from telemetry import page as page_module
+from telemetry import page_set
+from telemetry import wpr_modes
 
 class BenchThatFails(multi_page_benchmark.MultiPageBenchmark):
   def MeasurePage(self, page, tab, results):
diff --git a/tools/chrome_remote_control/chrome_remote_control/multi_page_benchmark_unittest_base.py b/tools/telemetry/telemetry/multi_page_benchmark_unittest_base.py
index 873829d..01ec171 100644
--- a/tools/chrome_remote_control/chrome_remote_control/multi_page_benchmark_unittest_base.py
+++ b/tools/telemetry/telemetry/multi_page_benchmark_unittest_base.py
@@ -4,12 +4,12 @@
 import os
 import unittest
 
-from chrome_remote_control import browser_finder
-from chrome_remote_control import multi_page_benchmark
-from chrome_remote_control import options_for_unittests
-from chrome_remote_control import page_runner
-from chrome_remote_control import page as page_module
-from chrome_remote_control import page_set
+from telemetry import browser_finder
+from telemetry import multi_page_benchmark
+from telemetry import options_for_unittests
+from telemetry import page_runner
+from telemetry import page as page_module
+from telemetry import page_set
 
 class MultiPageBenchmarkUnitTestBase(unittest.TestCase):
   """unittest.TestCase-derived class to help in the construction of unit tests
diff --git a/tools/chrome_remote_control/chrome_remote_control/options_for_unittests.py b/tools/telemetry/telemetry/options_for_unittests.py
index ca30208..ca30208 100644
--- a/tools/chrome_remote_control/chrome_remote_control/options_for_unittests.py
+++ b/tools/telemetry/telemetry/options_for_unittests.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/page.py b/tools/telemetry/telemetry/page.py
index 122e62b..122e62b 100644
--- a/tools/chrome_remote_control/chrome_remote_control/page.py
+++ b/tools/telemetry/telemetry/page.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/page_runner.py b/tools/telemetry/telemetry/page_runner.py
index 1295311..2fd7ee3 100644
--- a/tools/chrome_remote_control/chrome_remote_control/page_runner.py
+++ b/tools/telemetry/telemetry/page_runner.py
@@ -9,9 +9,9 @@ import urlparse
 import random
 import csv
 
-from chrome_remote_control import page_test
-from chrome_remote_control import util
-from chrome_remote_control import wpr_modes
+from telemetry import page_test
+from telemetry import util
+from telemetry import wpr_modes
 
 class PageState(object):
   def __init__(self):
diff --git a/tools/chrome_remote_control/chrome_remote_control/page_runner_unittest.py b/tools/telemetry/telemetry/page_runner_unittest.py
index 5b29633..44fdce0 100644
--- a/tools/chrome_remote_control/chrome_remote_control/page_runner_unittest.py
+++ b/tools/telemetry/telemetry/page_runner_unittest.py
@@ -4,12 +4,12 @@
 import tempfile
 import unittest
 
-from chrome_remote_control import browser_finder
-from chrome_remote_control import page as page_module
-from chrome_remote_control import page_set
-from chrome_remote_control import page_test
-from chrome_remote_control import page_runner
-from chrome_remote_control import options_for_unittests
+from telemetry import browser_finder
+from telemetry import page as page_module
+from telemetry import page_set
+from telemetry import page_test
+from telemetry import page_runner
+from telemetry import options_for_unittests
 
 SIMPLE_CREDENTIALS_STRING = """
 {
diff --git a/tools/chrome_remote_control/chrome_remote_control/page_set.py b/tools/telemetry/telemetry/page_set.py
index ea43175..e41cdb3 100644
--- a/tools/chrome_remote_control/chrome_remote_control/page_set.py
+++ b/tools/telemetry/telemetry/page_set.py
@@ -5,7 +5,7 @@ import json
 import os
 import urlparse
 
-from chrome_remote_control import page as page_module
+from telemetry import page as page_module
 
 class PageSet(object):
   def __init__(self, base_dir='', attributes=None):
diff --git a/tools/chrome_remote_control/chrome_remote_control/page_set_unittest.py b/tools/telemetry/telemetry/page_set_unittest.py
index e982e32..ef1a83c 100644
--- a/tools/chrome_remote_control/chrome_remote_control/page_set_unittest.py
+++ b/tools/telemetry/telemetry/page_set_unittest.py
@@ -4,7 +4,7 @@
 import tempfile
 import unittest
 
-from chrome_remote_control import page_set
+from telemetry import page_set
 
 simple_set = """
 {"description": "hello",
diff --git a/tools/chrome_remote_control/chrome_remote_control/page_test.py b/tools/telemetry/telemetry/page_test.py
index 2d4d24f..2d4d24f 100644
--- a/tools/chrome_remote_control/chrome_remote_control/page_test.py
+++ b/tools/telemetry/telemetry/page_test.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/platform.py b/tools/telemetry/telemetry/platform.py
index c668f7b..c668f7b 100644
--- a/tools/chrome_remote_control/chrome_remote_control/platform.py
+++ b/tools/telemetry/telemetry/platform.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/possible_browser.py b/tools/telemetry/telemetry/possible_browser.py
index 2cb995f..2cb995f 100644
--- a/tools/chrome_remote_control/chrome_remote_control/possible_browser.py
+++ b/tools/telemetry/telemetry/possible_browser.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/run_tests.py b/tools/telemetry/telemetry/run_tests.py
index e0955072..c1f4eb7 100644
--- a/tools/chrome_remote_control/chrome_remote_control/run_tests.py
+++ b/tools/telemetry/telemetry/run_tests.py
@@ -7,8 +7,8 @@ import os
 import traceback
 import unittest
 
-from chrome_remote_control import browser_options
-from chrome_remote_control import options_for_unittests
+from telemetry import browser_options
+from telemetry import options_for_unittests
 
 def RequiresBrowserOfType(*types):
   def wrap(func):
@@ -105,7 +105,7 @@ def DiscoverAndRunTests(dir_name, args, top_level_dir):
   return len(test_result.errors) + len(test_result.failures)
 
 def Main(args, start_dir, top_level_dir):
-  """Unit test suite that collects all test cases for chrome_remote_control."""
+  """Unit test suite that collects all test cases for telemetry."""
   default_options = browser_options.BrowserOptions()
   default_options.browser_type = 'any'
 
@@ -119,7 +119,7 @@ def Main(args, start_dir, top_level_dir):
   if default_options.verbosity == 0:
     logging.getLogger().setLevel(logging.ERROR)
 
-  from chrome_remote_control import browser_finder
+  from telemetry import browser_finder
   browser_to_create = browser_finder.FindBrowser(default_options)
   if browser_to_create == None:
     logging.error('No browser found of type %s. Cannot run tests.',
diff --git a/tools/chrome_remote_control/chrome_remote_control/simple_mock.py b/tools/telemetry/telemetry/simple_mock.py
index 6f7afb6..6f7afb6 100644
--- a/tools/chrome_remote_control/chrome_remote_control/simple_mock.py
+++ b/tools/telemetry/telemetry/simple_mock.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/simple_mock_unittest.py b/tools/telemetry/telemetry/simple_mock_unittest.py
index b170808..edbdbb2 100644
--- a/tools/chrome_remote_control/chrome_remote_control/simple_mock_unittest.py
+++ b/tools/telemetry/telemetry/simple_mock_unittest.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 import unittest
 
-from chrome_remote_control import simple_mock
+from telemetry import simple_mock
 
 _ = simple_mock.DONT_CARE
 
diff --git a/tools/chrome_remote_control/chrome_remote_control/system_stub.py b/tools/telemetry/telemetry/system_stub.py
index ce35e9d..ce35e9d 100644
--- a/tools/chrome_remote_control/chrome_remote_control/system_stub.py
+++ b/tools/telemetry/telemetry/system_stub.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/tab.py b/tools/telemetry/telemetry/tab.py
index da6061f..527a2e0 100644
--- a/tools/chrome_remote_control/chrome_remote_control/tab.py
+++ b/tools/telemetry/telemetry/tab.py
@@ -1,10 +1,10 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-from chrome_remote_control import inspector_console
-from chrome_remote_control import inspector_page
-from chrome_remote_control import inspector_runtime
-from chrome_remote_control import util
+from telemetry import inspector_console
+from telemetry import inspector_page
+from telemetry import inspector_runtime
+from telemetry import util
 
 DEFAULT_TAB_TIMEOUT = 60
 
diff --git a/tools/chrome_remote_control/chrome_remote_control/tab_crash_exception.py b/tools/telemetry/telemetry/tab_crash_exception.py
index 434a883..434a883 100644
--- a/tools/chrome_remote_control/chrome_remote_control/tab_crash_exception.py
+++ b/tools/telemetry/telemetry/tab_crash_exception.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/tab_test_case.py b/tools/telemetry/telemetry/tab_test_case.py
index 899f208..cbd52d1 100644
--- a/tools/chrome_remote_control/chrome_remote_control/tab_test_case.py
+++ b/tools/telemetry/telemetry/tab_test_case.py
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 import unittest
 
-from chrome_remote_control import browser_finder
-from chrome_remote_control import options_for_unittests
+from telemetry import browser_finder
+from telemetry import options_for_unittests
 
 class TabTestCase(unittest.TestCase):
   def setUp(self):
diff --git a/tools/chrome_remote_control/chrome_remote_control/tab_unittest.py b/tools/telemetry/telemetry/tab_unittest.py
index 7b141ab..0d95900 100644
--- a/tools/chrome_remote_control/chrome_remote_control/tab_unittest.py
+++ b/tools/telemetry/telemetry/tab_unittest.py
@@ -1,8 +1,8 @@
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-from chrome_remote_control import tab_test_case
-from chrome_remote_control import tab_crash_exception
+from telemetry import tab_test_case
+from telemetry import tab_crash_exception
 
 class TabTest(tab_test_case.TabTestCase):
   def testNavigateAndWaitToForCompleteState(self):
diff --git a/tools/chrome_remote_control/chrome_remote_control/temporary_http_server.py b/tools/telemetry/telemetry/temporary_http_server.py
index 952f942..952f942 100644
--- a/tools/chrome_remote_control/chrome_remote_control/temporary_http_server.py
+++ b/tools/telemetry/telemetry/temporary_http_server.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/temporary_http_server_unittest.py b/tools/telemetry/telemetry/temporary_http_server_unittest.py
index 62cf65f..f77d0e8d 100644
--- a/tools/chrome_remote_control/chrome_remote_control/temporary_http_server_unittest.py
+++ b/tools/telemetry/telemetry/temporary_http_server_unittest.py
@@ -4,8 +4,8 @@
 import os
 import unittest
 
-from chrome_remote_control import browser_finder
-from chrome_remote_control import options_for_unittests
+from telemetry import browser_finder
+from telemetry import options_for_unittests
 
 class TemporaryHTTPServerTest(unittest.TestCase):
   def testBasicHosting(self):
diff --git a/tools/chrome_remote_control/chrome_remote_control/util.py b/tools/telemetry/telemetry/util.py
index f74e4db..f74e4db 100644
--- a/tools/chrome_remote_control/chrome_remote_control/util.py
+++ b/tools/telemetry/telemetry/util.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/util_unittest.py b/tools/telemetry/telemetry/util_unittest.py
index 6194af4..5d144e3 100644
--- a/tools/chrome_remote_control/chrome_remote_control/util_unittest.py
+++ b/tools/telemetry/telemetry/util_unittest.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 import unittest
 
-from chrome_remote_control import util
+from telemetry import util
 
 class TestWait(unittest.TestCase):
   @staticmethod
diff --git a/tools/chrome_remote_control/chrome_remote_control/websocket.py b/tools/telemetry/telemetry/websocket.py
index a057d1f..a057d1f 100644
--- a/tools/chrome_remote_control/chrome_remote_control/websocket.py
+++ b/tools/telemetry/telemetry/websocket.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/websocket_unittest.py b/tools/telemetry/telemetry/websocket_unittest.py
index 995ff47..826e230 100644
--- a/tools/chrome_remote_control/chrome_remote_control/websocket_unittest.py
+++ b/tools/telemetry/telemetry/websocket_unittest.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 import unittest
 
-from chrome_remote_control import websocket
+from telemetry import websocket
 
 class TestWebSocket(unittest.TestCase):
   def testExports(self):
diff --git a/tools/chrome_remote_control/chrome_remote_control/wpr_modes.py b/tools/telemetry/telemetry/wpr_modes.py
index 64ffe08..64ffe08 100644
--- a/tools/chrome_remote_control/chrome_remote_control/wpr_modes.py
+++ b/tools/telemetry/telemetry/wpr_modes.py
diff --git a/tools/chrome_remote_control/chrome_remote_control/wpr_server.py b/tools/telemetry/telemetry/wpr_server.py
index 9789d95..9789d95 100644
--- a/tools/chrome_remote_control/chrome_remote_control/wpr_server.py
+++ b/tools/telemetry/telemetry/wpr_server.py
diff --git a/tools/chrome_remote_control/third_party/websocket-client/.gitignore b/tools/telemetry/third_party/websocket-client/.gitignore
index c7d73ad..c7d73ad 100644
--- a/tools/chrome_remote_control/third_party/websocket-client/.gitignore
+++ b/tools/telemetry/third_party/websocket-client/.gitignore
diff --git a/tools/chrome_remote_control/third_party/websocket-client/LICENSE b/tools/telemetry/third_party/websocket-client/LICENSE
index c255f4a..c255f4a 100644
--- a/tools/chrome_remote_control/third_party/websocket-client/LICENSE
+++ b/tools/telemetry/third_party/websocket-client/LICENSE
diff --git a/tools/chrome_remote_control/third_party/websocket-client/README.chromium b/tools/telemetry/third_party/websocket-client/README.chromium
index d5b6b0e..d5b6b0e 100644
--- a/tools/chrome_remote_control/third_party/websocket-client/README.chromium
+++ b/tools/telemetry/third_party/websocket-client/README.chromium
diff --git a/tools/chrome_remote_control/third_party/websocket-client/README.rst b/tools/telemetry/third_party/websocket-client/README.rst
index 1b7faeb..1b7faeb 100644
--- a/tools/chrome_remote_control/third_party/websocket-client/README.rst
+++ b/tools/telemetry/third_party/websocket-client/README.rst
diff --git a/tools/chrome_remote_control/third_party/websocket-client/websocket.py b/tools/telemetry/third_party/websocket-client/websocket.py
index 480bfc0..480bfc0 100644
--- a/tools/chrome_remote_control/third_party/websocket-client/websocket.py
+++ b/tools/telemetry/third_party/websocket-client/websocket.py
diff --git a/tools/chrome_remote_control/unittest_data/.gitignore b/tools/telemetry/unittest_data/.gitignore
index 4842ffe..4842ffe 100644
--- a/tools/chrome_remote_control/unittest_data/.gitignore
+++ b/tools/telemetry/unittest_data/.gitignore
diff --git a/tools/chrome_remote_control/unittest_data/blank.html b/tools/telemetry/unittest_data/blank.html
index 8d0ce09..8d0ce09 100644
--- a/tools/chrome_remote_control/unittest_data/blank.html
+++ b/tools/telemetry/unittest_data/blank.html
diff --git a/tools/chrome_remote_control/unittest_data/non_scrollable_page.html b/tools/telemetry/unittest_data/non_scrollable_page.html
index 5770408..5770408 100644
--- a/tools/chrome_remote_control/unittest_data/non_scrollable_page.html
+++ b/tools/telemetry/unittest_data/non_scrollable_page.html
diff --git a/tools/chrome_remote_control/unittest_data/page_that_logs_to_console.html b/tools/telemetry/unittest_data/page_that_logs_to_console.html
index 373eebc..373eebc 100644
--- a/tools/chrome_remote_control/unittest_data/page_that_logs_to_console.html
+++ b/tools/telemetry/unittest_data/page_that_logs_to_console.html
diff --git a/tools/chrome_remote_control/unittest_data/scrollable_page.html b/tools/telemetry/unittest_data/scrollable_page.html
index c5102ce..c5102ce 100644
--- a/tools/chrome_remote_control/unittest_data/scrollable_page.html
+++ b/tools/telemetry/unittest_data/scrollable_page.html