diff --git a/tools/skp/page_sets/skia_amazon_desktop.py b/tools/skp/page_sets/skia_amazon_desktop.py
index 961ea66..1509c35 100644
--- a/tools/skp/page_sets/skia_amazon_desktop.py
+++ b/tools/skp/page_sets/skia_amazon_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class AmazonDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(AmazonDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_amazon_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_androidpolice_nexus10.py b/tools/skp/page_sets/skia_androidpolice_nexus10.py
index 207bf7a..dbbca39 100644
--- a/tools/skp/page_sets/skia_androidpolice_nexus10.py
+++ b/tools/skp/page_sets/skia_androidpolice_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class AndroidPoliceNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(AndroidPoliceNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_androidpolice_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_baidu_desktop.py b/tools/skp/page_sets/skia_baidu_desktop.py
index 946d5a74..0b4a57a 100644
--- a/tools/skp/page_sets/skia_baidu_desktop.py
+++ b/tools/skp/page_sets/skia_baidu_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class BaiduDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(BaiduDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_baidu_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_blogger_desktop.py b/tools/skp/page_sets/skia_blogger_desktop.py
index 801cf0d..c5e31ee 100644
--- a/tools/skp/page_sets/skia_blogger_desktop.py
+++ b/tools/skp/page_sets/skia_blogger_desktop.py
@@ -27,12 +27,12 @@
     action_runner.Wait(60)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class BloggerDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(BloggerDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_blogger_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_booking_desktop.py b/tools/skp/page_sets/skia_booking_desktop.py
index 8ab5475..8ce9c5d 100644
--- a/tools/skp/page_sets/skia_booking_desktop.py
+++ b/tools/skp/page_sets/skia_booking_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class BookingDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(BookingDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_booking_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_carsvg_desktop.py b/tools/skp/page_sets/skia_carsvg_desktop.py
index 13550f5..3d4bfaa 100644
--- a/tools/skp/page_sets/skia_carsvg_desktop.py
+++ b/tools/skp/page_sets/skia_carsvg_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class CarsvgDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(CarsvgDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_carsvg_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_chalkboard_desktop.py b/tools/skp/page_sets/skia_chalkboard_desktop.py
index fab91f6..7156a67 100644
--- a/tools/skp/page_sets/skia_chalkboard_desktop.py
+++ b/tools/skp/page_sets/skia_chalkboard_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class ChalkboardDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(ChalkboardDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_chalkboard_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_cnet_nexus10.py b/tools/skp/page_sets/skia_cnet_nexus10.py
index 6672a69..7e827b8 100644
--- a/tools/skp/page_sets/skia_cnet_nexus10.py
+++ b/tools/skp/page_sets/skia_cnet_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class CnetNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(CnetNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_cnet_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_css3gradients_desktop.py b/tools/skp/page_sets/skia_css3gradients_desktop.py
index ef80f5c..811b930 100644
--- a/tools/skp/page_sets/skia_css3gradients_desktop.py
+++ b/tools/skp/page_sets/skia_css3gradients_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class Css3DesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(Css3DesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_css3gradients_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_culturalsolutions_nexus10.py b/tools/skp/page_sets/skia_culturalsolutions_nexus10.py
index 4157faa..151f5b3 100644
--- a/tools/skp/page_sets/skia_culturalsolutions_nexus10.py
+++ b/tools/skp/page_sets/skia_culturalsolutions_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class CulturalNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(CulturalNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_culturalsolutions_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_cuteoverload_nexus10.py b/tools/skp/page_sets/skia_cuteoverload_nexus10.py
index cc43e85..69bc765 100644
--- a/tools/skp/page_sets/skia_cuteoverload_nexus10.py
+++ b/tools/skp/page_sets/skia_cuteoverload_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class CuteOverloadNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(CuteOverloadNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_cuteoverload_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_deviantart_nexus10.py b/tools/skp/page_sets/skia_deviantart_nexus10.py
index 5e5c29a..bdbf2b2 100644
--- a/tools/skp/page_sets/skia_deviantart_nexus10.py
+++ b/tools/skp/page_sets/skia_deviantart_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class DeviantartNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(DeviantartNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_deviantart_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_digg_nexus10.py b/tools/skp/page_sets/skia_digg_nexus10.py
index dd764b0..db08c73 100644
--- a/tools/skp/page_sets/skia_digg_nexus10.py
+++ b/tools/skp/page_sets/skia_digg_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class DiggNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(DiggNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_digg_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_ebay_desktop.py b/tools/skp/page_sets/skia_ebay_desktop.py
index 4f5adb6..f5eab36 100644
--- a/tools/skp/page_sets/skia_ebay_desktop.py
+++ b/tools/skp/page_sets/skia_ebay_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class EbayDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(EbayDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_ebay_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_engadget_nexus10.py b/tools/skp/page_sets/skia_engadget_nexus10.py
index 65ea2c1..611b10c 100644
--- a/tools/skp/page_sets/skia_engadget_nexus10.py
+++ b/tools/skp/page_sets/skia_engadget_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class EngadgetNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(EngadgetNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_engadget_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_espn_desktop.py b/tools/skp/page_sets/skia_espn_desktop.py
index 5061c55..7b5f5da 100644
--- a/tools/skp/page_sets/skia_espn_desktop.py
+++ b/tools/skp/page_sets/skia_espn_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class EspnDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(EspnDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_espn_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_facebook_desktop.py b/tools/skp/page_sets/skia_facebook_desktop.py
index 167c37e..528ced9 100644
--- a/tools/skp/page_sets/skia_facebook_desktop.py
+++ b/tools/skp/page_sets/skia_facebook_desktop.py
@@ -28,12 +28,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class FacebookDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(FacebookDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_facebook_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_fontwipe_desktop.py b/tools/skp/page_sets/skia_fontwipe_desktop.py
index 381a831..44b234f 100644
--- a/tools/skp/page_sets/skia_fontwipe_desktop.py
+++ b/tools/skp/page_sets/skia_fontwipe_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class FontwipeDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(FontwipeDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_fontwipe_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_forecastio_desktop.py b/tools/skp/page_sets/skia_forecastio_desktop.py
index 8c4d39c..5ffed14 100644
--- a/tools/skp/page_sets/skia_forecastio_desktop.py
+++ b/tools/skp/page_sets/skia_forecastio_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(20)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class ForecastioDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(ForecastioDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_forecastio_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_frantzen_nexus10.py b/tools/skp/page_sets/skia_frantzen_nexus10.py
index 4017e25..8f13919 100644
--- a/tools/skp/page_sets/skia_frantzen_nexus10.py
+++ b/tools/skp/page_sets/skia_frantzen_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class FrantzenNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(FrantzenNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_frantzen_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
index 5e1c52a..03a05ea 100644
--- a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
+++ b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class GamedeksiamNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(GamedeksiamNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_gamedeksiam_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_gmail_nexus10.py b/tools/skp/page_sets/skia_gmail_nexus10.py
index 2f5f090..8e4e314 100644
--- a/tools/skp/page_sets/skia_gmail_nexus10.py
+++ b/tools/skp/page_sets/skia_gmail_nexus10.py
@@ -27,12 +27,12 @@
     action_runner.Wait(10)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class GmailNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(GmailNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_gmail_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_gmailthread_desktop.py b/tools/skp/page_sets/skia_gmailthread_desktop.py
index 03409b8..0b2782c 100644
--- a/tools/skp/page_sets/skia_gmailthread_desktop.py
+++ b/tools/skp/page_sets/skia_gmailthread_desktop.py
@@ -27,12 +27,12 @@
     action_runner.Wait(60)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class GmailthreadDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(GmailthreadDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_gmailthread_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_googleblog_nexus10.py b/tools/skp/page_sets/skia_googleblog_nexus10.py
index 4e358c2..c4b2bb4 100644
--- a/tools/skp/page_sets/skia_googleblog_nexus10.py
+++ b/tools/skp/page_sets/skia_googleblog_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class GoogleblogNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(GoogleblogNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_googleblog_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_googlecalendar_nexus10.py b/tools/skp/page_sets/skia_googlecalendar_nexus10.py
index 41224e3..61ab231 100644
--- a/tools/skp/page_sets/skia_googlecalendar_nexus10.py
+++ b/tools/skp/page_sets/skia_googlecalendar_nexus10.py
@@ -27,12 +27,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class GoogleCalendarNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(GoogleCalendarNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_googlecalendar_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_googlehome_desktop.py b/tools/skp/page_sets/skia_googlehome_desktop.py
index 35857b3..6ae3c89 100644
--- a/tools/skp/page_sets/skia_googlehome_desktop.py
+++ b/tools/skp/page_sets/skia_googlehome_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class GooglehomeDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(GooglehomeDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_googlehome_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_googleplus_desktop.py b/tools/skp/page_sets/skia_googleplus_desktop.py
index c95166c..d2a39e9 100644
--- a/tools/skp/page_sets/skia_googleplus_desktop.py
+++ b/tools/skp/page_sets/skia_googleplus_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class GooglePlusDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(GooglePlusDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_googleplus_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py b/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
index 079caff..8bebf73 100644
--- a/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
+++ b/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
@@ -27,12 +27,12 @@
     action_runner.Wait(10)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class GoogleSpreadsheetDashedDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(GoogleSpreadsheetDashedDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_googlespreadsheetdashed_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_gspro_nexus10.py b/tools/skp/page_sets/skia_gspro_nexus10.py
index f385d8a..b476833 100644
--- a/tools/skp/page_sets/skia_gspro_nexus10.py
+++ b/tools/skp/page_sets/skia_gspro_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class GsproNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(GsproNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_gspro_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_gws_desktop.py b/tools/skp/page_sets/skia_gws_desktop.py
index 195ede9..8b7238b 100644
--- a/tools/skp/page_sets/skia_gws_desktop.py
+++ b/tools/skp/page_sets/skia_gws_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class GwsDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(GwsDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_gws_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_hsfi_nexus10.py b/tools/skp/page_sets/skia_hsfi_nexus10.py
index e251036..f6fb04f 100644
--- a/tools/skp/page_sets/skia_hsfi_nexus10.py
+++ b/tools/skp/page_sets/skia_hsfi_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class HsfiNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(HsfiNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_hsfi_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
index c9c337b..db1844c 100644
--- a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(10)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class JsfiddleBigcarDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(JsfiddleBigcarDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_jsfiddlebigcar_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py b/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py
index b26c5f0..f9716b4 100644
--- a/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(10)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class JsfiddleHumperDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(JsfiddleHumperDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_jsfiddlehumperclip_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_linkedin_desktop.py b/tools/skp/page_sets/skia_linkedin_desktop.py
index f8449ca..94700e2 100644
--- a/tools/skp/page_sets/skia_linkedin_desktop.py
+++ b/tools/skp/page_sets/skia_linkedin_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class LinkedinDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(LinkedinDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_linkedin_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_mapsvg_desktop.py b/tools/skp/page_sets/skia_mapsvg_desktop.py
index 57130f7..3159dc4 100644
--- a/tools/skp/page_sets/skia_mapsvg_desktop.py
+++ b/tools/skp/page_sets/skia_mapsvg_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(10)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class MapsvgDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(MapsvgDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_mapsvg_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_mercurynews_nexus10.py b/tools/skp/page_sets/skia_mercurynews_nexus10.py
index c161036..9343673 100644
--- a/tools/skp/page_sets/skia_mercurynews_nexus10.py
+++ b/tools/skp/page_sets/skia_mercurynews_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class MercurynewsNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(MercurynewsNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_mercurynews_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_mlb_nexus10.py b/tools/skp/page_sets/skia_mlb_nexus10.py
index d6326c3..0118eda 100644
--- a/tools/skp/page_sets/skia_mlb_nexus10.py
+++ b/tools/skp/page_sets/skia_mlb_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class MlbNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(MlbNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_mlb_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_mobilenews_desktop.py b/tools/skp/page_sets/skia_mobilenews_desktop.py
index dc7e176..7b334c4 100644
--- a/tools/skp/page_sets/skia_mobilenews_desktop.py
+++ b/tools/skp/page_sets/skia_mobilenews_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(10)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class MobilenewsDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(MobilenewsDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_mobilenews_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_mozilla_nexus10.py b/tools/skp/page_sets/skia_mozilla_nexus10.py
index f1a39dd..5e04d92 100644
--- a/tools/skp/page_sets/skia_mozilla_nexus10.py
+++ b/tools/skp/page_sets/skia_mozilla_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class MozillaNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(MozillaNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_mozilla_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_nofolo_nexus10.py b/tools/skp/page_sets/skia_nofolo_nexus10.py
index 986ed37..afc97c0 100644
--- a/tools/skp/page_sets/skia_nofolo_nexus10.py
+++ b/tools/skp/page_sets/skia_nofolo_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class NofoloNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(NofoloNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_nofolo_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_nytimes_nexus10.py b/tools/skp/page_sets/skia_nytimes_nexus10.py
index 8d98503..f68ec76 100644
--- a/tools/skp/page_sets/skia_nytimes_nexus10.py
+++ b/tools/skp/page_sets/skia_nytimes_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class NytimesNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(NytimesNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_nytimes_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_oldinboxapp_desktop.py b/tools/skp/page_sets/skia_oldinboxapp_desktop.py
index 798a6c8..747fde0 100644
--- a/tools/skp/page_sets/skia_oldinboxapp_desktop.py
+++ b/tools/skp/page_sets/skia_oldinboxapp_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class OldinboxappDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(OldinboxappDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_oldinboxapp_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_pinterest_desktop.py b/tools/skp/page_sets/skia_pinterest_desktop.py
index 218ccab..6035f2d 100644
--- a/tools/skp/page_sets/skia_pinterest_desktop.py
+++ b/tools/skp/page_sets/skia_pinterest_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class PinterestDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(PinterestDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_pinterest_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_pokemonwiki_desktop.py b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
index 5d32731..aafc988 100644
--- a/tools/skp/page_sets/skia_pokemonwiki_desktop.py
+++ b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class PokemonwikiDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(PokemonwikiDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_pokemonwiki_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_pravda_nexus10.py b/tools/skp/page_sets/skia_pravda_nexus10.py
index a7792b1..7935a14 100644
--- a/tools/skp/page_sets/skia_pravda_nexus10.py
+++ b/tools/skp/page_sets/skia_pravda_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(10)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class PravdaNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(PravdaNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_pravda_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_rectangletransition_desktop.py b/tools/skp/page_sets/skia_rectangletransition_desktop.py
index 1783117..5bfc0fb 100644
--- a/tools/skp/page_sets/skia_rectangletransition_desktop.py
+++ b/tools/skp/page_sets/skia_rectangletransition_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class RectangletransitionDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(RectangletransitionDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_rectangletransition_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_sahadan_nexus10.py b/tools/skp/page_sets/skia_sahadan_nexus10.py
index c6c4dcb..dc8862b 100644
--- a/tools/skp/page_sets/skia_sahadan_nexus10.py
+++ b/tools/skp/page_sets/skia_sahadan_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class SahadanNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(SahadanNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_sahadan_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_samoasvg_desktop.py b/tools/skp/page_sets/skia_samoasvg_desktop.py
index 8242872..3f2be0d 100644
--- a/tools/skp/page_sets/skia_samoasvg_desktop.py
+++ b/tools/skp/page_sets/skia_samoasvg_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class SamoasvgDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(SamoasvgDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_samoasvg_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_sfgate_desktop.py b/tools/skp/page_sets/skia_sfgate_desktop.py
index 892d467..e8ed1dc 100644
--- a/tools/skp/page_sets/skia_sfgate_desktop.py
+++ b/tools/skp/page_sets/skia_sfgate_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class SfgateDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(SfgateDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_sfgate_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_slashdot_nexus10.py b/tools/skp/page_sets/skia_slashdot_nexus10.py
index 1c1a58b..f3a4bf5 100644
--- a/tools/skp/page_sets/skia_slashdot_nexus10.py
+++ b/tools/skp/page_sets/skia_slashdot_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class SlashdotNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(SlashdotNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_slashdot_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_techmeme_nexus10.py b/tools/skp/page_sets/skia_techmeme_nexus10.py
index 905bd71..a8be047 100644
--- a/tools/skp/page_sets/skia_techmeme_nexus10.py
+++ b/tools/skp/page_sets/skia_techmeme_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class TechmemeNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(TechmemeNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_techmeme_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_tigersvg_desktop.py b/tools/skp/page_sets/skia_tigersvg_desktop.py
index fede740..33f0b53 100644
--- a/tools/skp/page_sets/skia_tigersvg_desktop.py
+++ b/tools/skp/page_sets/skia_tigersvg_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class TigersvgDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(TigersvgDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_tigersvg_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_twitter_desktop.py b/tools/skp/page_sets/skia_twitter_desktop.py
index 8500137..d9ec66f 100644
--- a/tools/skp/page_sets/skia_twitter_desktop.py
+++ b/tools/skp/page_sets/skia_twitter_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class TwitterDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(TwitterDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_twitter_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_ukwsj_nexus10.py b/tools/skp/page_sets/skia_ukwsj_nexus10.py
index abc0b3a..6f35d7c 100644
--- a/tools/skp/page_sets/skia_ukwsj_nexus10.py
+++ b/tools/skp/page_sets/skia_ukwsj_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class UkwsjNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(UkwsjNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_ukwsj_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_vnexpress_nexus10.py b/tools/skp/page_sets/skia_vnexpress_nexus10.py
index 781e24a..51b2e57 100644
--- a/tools/skp/page_sets/skia_vnexpress_nexus10.py
+++ b/tools/skp/page_sets/skia_vnexpress_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class VnexpressNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(VnexpressNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_vnexpress_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_weather_desktop.py b/tools/skp/page_sets/skia_weather_desktop.py
index 13d8389..cae33b7 100644
--- a/tools/skp/page_sets/skia_weather_desktop.py
+++ b/tools/skp/page_sets/skia_weather_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class WeatherDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(WeatherDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_weather_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_wikipedia_galaxynexus.py b/tools/skp/page_sets/skia_wikipedia_galaxynexus.py
index d799de9..bcbe04a 100644
--- a/tools/skp/page_sets/skia_wikipedia_galaxynexus.py
+++ b/tools/skp/page_sets/skia_wikipedia_galaxynexus.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class WikipediaGalaxynexusPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(WikipediaGalaxynexusPageSet, self).__init__(
       user_agent_type='mobile',
       archive_data_file='data/skia_wikipedia_galaxynexus.json')
 
diff --git a/tools/skp/page_sets/skia_worldjournal_nexus10.py b/tools/skp/page_sets/skia_worldjournal_nexus10.py
index 333eed4..0d7be05 100644
--- a/tools/skp/page_sets/skia_worldjournal_nexus10.py
+++ b/tools/skp/page_sets/skia_worldjournal_nexus10.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class WorldjournalNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(WorldjournalNexus10PageSet, self).__init__(
       user_agent_type='tablet',
       archive_data_file='data/skia_worldjournal_nexus10.json')
 
diff --git a/tools/skp/page_sets/skia_wowwiki_desktop.py b/tools/skp/page_sets/skia_wowwiki_desktop.py
index 55e1714..fcabc2a 100644
--- a/tools/skp/page_sets/skia_wowwiki_desktop.py
+++ b/tools/skp/page_sets/skia_wowwiki_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class WowWikiDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(WowWikiDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_wowwiki_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_yahooanswers_desktop.py b/tools/skp/page_sets/skia_yahooanswers_desktop.py
index 10c7952..c86599f 100644
--- a/tools/skp/page_sets/skia_yahooanswers_desktop.py
+++ b/tools/skp/page_sets/skia_yahooanswers_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(5)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class YahooAnswersDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(YahooAnswersDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_yahooanswers_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_youtube_desktop.py b/tools/skp/page_sets/skia_youtube_desktop.py
index fc9872d..75ff00b 100644
--- a/tools/skp/page_sets/skia_youtube_desktop.py
+++ b/tools/skp/page_sets/skia_youtube_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(15)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class YoutubeDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(YoutubeDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_youtube_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_youtubetvvideo_desktop.py b/tools/skp/page_sets/skia_youtubetvvideo_desktop.py
index 0636347..3217087 100644
--- a/tools/skp/page_sets/skia_youtubetvvideo_desktop.py
+++ b/tools/skp/page_sets/skia_youtubetvvideo_desktop.py
@@ -26,12 +26,12 @@
     action_runner.Wait(10)
 
 
-class SkiaBuildbotPageSet(page_set_module.PageSet):
+class YoutubeTvVideoDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SkiaBuildbotPageSet, self).__init__(
+    super(YoutubeTvVideoDesktopPageSet, self).__init__(
       user_agent_type='',
       archive_data_file='data/skia_youtubetvvideo_desktop.json')
 
diff --git a/tools/skp/webpages_playback.py b/tools/skp/webpages_playback.py
index 4dfe6fc..394e14e 100644
--- a/tools/skp/webpages_playback.py
+++ b/tools/skp/webpages_playback.py
@@ -73,6 +73,13 @@
     os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data')
 TMP_SKP_DIR = tempfile.mkdtemp()
 
+# Location of the credentials.json file and the string that represents missing
+# passwords.
+CREDENTIALS_FILE_PATH = os.path.join(
+    os.path.abspath(os.path.dirname(__file__)), 'page_sets', 'data',
+    'credentials.json'
+)
+
 # Stdout that signifies that a recording has failed.
 RECORD_FAILURE_MSG = 'The recording has not been updated for these pages.'
 
@@ -94,6 +101,9 @@
 # How many times the run_benchmark binary should be retried.
 RETRY_RUN_MEASUREMENT_COUNT = 5
 
+# Location of the credentials.json file in Google Storage.
+CREDENTIALS_GS_PATH = '/playback/credentials/credentials.json'
+
 X11_DISPLAY = os.getenv('DISPLAY', ':0')
 
 GS_PREDEFINED_ACL = gs_utils.GSUtils.PredefinedACL.PRIVATE
@@ -154,6 +164,26 @@
   def Run(self):
     """Run the SkPicturePlayback BuildStep."""
 
+    # Download the credentials file if it was not previously downloaded.
+    if self._skip_all_gs_access:
+      print """\n\nPlease create a %s file that contains:
+      {
+        "google": {
+          "username": "google_testing_account_username",
+          "password": "google_testing_account_password"
+        },
+        "facebook": {
+          "username": "facebook_testing_account_username",
+          "password": "facebook_testing_account_password"
+        }
+      }\n\n""" % CREDENTIALS_FILE_PATH
+      raw_input("Please press a key when you are ready to proceed...")
+    elif not os.path.isfile(CREDENTIALS_FILE_PATH):
+      # Download the credentials.json file from Google Storage.
+      gs_bucket = self._dest_gsbase.lstrip(gs_utils.GS_PREFIX)
+      gs_utils.GSUtils().download_file(gs_bucket, CREDENTIALS_GS_PATH,
+                                       CREDENTIALS_FILE_PATH)
+
     # Delete any left over data files in the data directory.
     for archive_file in glob.glob(
         os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR, 'skia_*')):
@@ -204,7 +234,9 @@
           self._DownloadWebpagesArchive(wpr_data_file, page_set_basename)
 
       page_set_name = os.path.basename(page_set).split('.')[0]
+      page_set_dir = os.path.dirname(page_set)
       run_benchmark_cmd = (
+          'PYTHONPATH=%s:$PYTHONPATH' % page_set_dir,
           'DISPLAY=%s' % X11_DISPLAY,
           'timeout', '300',
           os.path.join(self._telemetry_binaries_dir, 'run_benchmark'),
@@ -212,30 +244,11 @@
           '--browser=exact',
           '--browser-executable=%s' % self._browser_executable,
           SKP_BENCHMARK,
-          page_set_name,
-          '-o',
-          '/tmp/test.skp',
-          '--skp-outdir=%s' % TMP_SKP_DIR
+          '--page-set-name=%s' % page_set_name,
+          '--page-set-base-dir=%s' % page_set_dir,
+          '--skp-outdir=%s' % TMP_SKP_DIR,
+          '--also-run-disabled-tests'
       )
-      page_set_dst = os.path.join(self._telemetry_binaries_dir, 'page_sets',
-                                  os.path.basename(page_set))
-      wpr_dst = os.path.join(self._telemetry_binaries_dir, 'page_sets', 'data',
-                             wpr_data_file)
-      json_dst = os.path.join(self._telemetry_binaries_dir, 'page_sets', 'data',
-                              page_set_basename)
-      copied_page_set = False
-      if not os.path.exists(page_set_dst):
-        print 'Copying %s to %s' % (page_set, page_set_dst)
-        shutil.copyfile(page_set, page_set_dst)
-        wpr_src = os.path.join(os.path.dirname(page_set), 'data',
-                               wpr_data_file)
-        print 'Copying %s to %s' % (wpr_src, wpr_dst)
-        shutil.copyfile(wpr_src, wpr_dst)
-        json_src = os.path.join(os.path.dirname(page_set), 'data',
-                                page_set_basename)
-        print 'Copying %s to %s' % (json_src, json_dst)
-        shutil.copyfile(json_src, json_dst)
-        copied_page_set = True
 
       for _ in range(RETRY_RUN_MEASUREMENT_COUNT):
         try:
@@ -268,19 +281,10 @@
           print '\n\n=======Retrying %s=======\n\n' % page_set
           time.sleep(10)
       else:
-        if copied_page_set:
-          os.remove(page_set_dst)
-          os.remove(wpr_dst)
-          os.remove(json_dst)
         # If we get here then run_benchmark did not succeed and thus did not
         # break out of the loop.
         raise Exception('run_benchmark failed for page_set: %s' % page_set)
 
-      if copied_page_set:
-        os.remove(page_set_dst)
-        os.remove(wpr_dst)
-        os.remove(json_dst)
-
     print '\n\n=======Capturing SKP files took %s seconds=======\n\n' % (
         time.time() - start_time)