Fix ability to capture archives in webpages_playback.py

Updated all page sets to match the file name. This is to make it easier to call record_wpr with the page set class name.
Also updated the wait time for baidu to 60 seconds.

BUG=skia:3049

Review URL: https://codereview.chromium.org/683473002

64 files changed, 139 insertions, 137 deletions

diff --git a/tools/skp/page_sets/skia_amazon_desktop.py b/tools/skp/page_sets/skia_amazon_desktop.py
index 1509c35dd7..d6e47d1ba8 100644
--- a/tools/skp/page_sets/skia_amazon_desktop.py
+++ b/tools/skp/page_sets/skia_amazon_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class AmazonDesktopPageSet(page_set_module.PageSet):
+class SkiaAmazonDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(AmazonDesktopPageSet, self).__init__(
+    super(SkiaAmazonDesktopPageSet, 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 dbbca39418..f121b6e304 100644
--- a/tools/skp/page_sets/skia_androidpolice_nexus10.py
+++ b/tools/skp/page_sets/skia_androidpolice_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class AndroidPoliceNexus10PageSet(page_set_module.PageSet):
+class SkiaAndroidpoliceNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(AndroidPoliceNexus10PageSet, self).__init__(
+    super(SkiaAndroidpoliceNexus10PageSet, 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 0b4a57a764..df11d6c5c7 100644
--- a/tools/skp/page_sets/skia_baidu_desktop.py
+++ b/tools/skp/page_sets/skia_baidu_desktop.py
@@ -23,15 +23,15 @@ class SkiaBuildbotDesktopPage(page_module.Page):
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
-    action_runner.Wait(5)
+    action_runner.Wait(60)
 
 
-class BaiduDesktopPageSet(page_set_module.PageSet):
+class SkiaBaiduDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(BaiduDesktopPageSet, self).__init__(
+    super(SkiaBaiduDesktopPageSet, 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 c5e31ee78c..678d0b1750 100644
--- a/tools/skp/page_sets/skia_blogger_desktop.py
+++ b/tools/skp/page_sets/skia_blogger_desktop.py
@@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(60)
 
 
-class BloggerDesktopPageSet(page_set_module.PageSet):
+class SkiaBloggerDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(BloggerDesktopPageSet, self).__init__(
+    super(SkiaBloggerDesktopPageSet, 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 8ce9c5ddc2..7f551a13c5 100644
--- a/tools/skp/page_sets/skia_booking_desktop.py
+++ b/tools/skp/page_sets/skia_booking_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class BookingDesktopPageSet(page_set_module.PageSet):
+class SkiaBookingDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(BookingDesktopPageSet, self).__init__(
+    super(SkiaBookingDesktopPageSet, 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 3d4bfaa82c..825d62b5b3 100644
--- a/tools/skp/page_sets/skia_carsvg_desktop.py
+++ b/tools/skp/page_sets/skia_carsvg_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class CarsvgDesktopPageSet(page_set_module.PageSet):
+class SkiaCarsvgDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(CarsvgDesktopPageSet, self).__init__(
+    super(SkiaCarsvgDesktopPageSet, 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 7156a678e1..2980690049 100644
--- a/tools/skp/page_sets/skia_chalkboard_desktop.py
+++ b/tools/skp/page_sets/skia_chalkboard_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class ChalkboardDesktopPageSet(page_set_module.PageSet):
+class SkiaChalkboardDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(ChalkboardDesktopPageSet, self).__init__(
+    super(SkiaChalkboardDesktopPageSet, 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 7e827b825f..35e6c32481 100644
--- a/tools/skp/page_sets/skia_cnet_nexus10.py
+++ b/tools/skp/page_sets/skia_cnet_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class CnetNexus10PageSet(page_set_module.PageSet):
+class SkiaCnetNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(CnetNexus10PageSet, self).__init__(
+    super(SkiaCnetNexus10PageSet, 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 811b93096f..e827723295 100644
--- a/tools/skp/page_sets/skia_css3gradients_desktop.py
+++ b/tools/skp/page_sets/skia_css3gradients_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class Css3DesktopPageSet(page_set_module.PageSet):
+class SkiaCss3gradientsDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(Css3DesktopPageSet, self).__init__(
+    super(SkiaCss3gradientsDesktopPageSet, 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 151f5b3f1c..bb7d0cc5eb 100644
--- a/tools/skp/page_sets/skia_culturalsolutions_nexus10.py
+++ b/tools/skp/page_sets/skia_culturalsolutions_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class CulturalNexus10PageSet(page_set_module.PageSet):
+class SkiaCulturalsolutionsNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(CulturalNexus10PageSet, self).__init__(
+    super(SkiaCulturalsolutionsNexus10PageSet, 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 69bc76575e..8332074594 100644
--- a/tools/skp/page_sets/skia_cuteoverload_nexus10.py
+++ b/tools/skp/page_sets/skia_cuteoverload_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class CuteOverloadNexus10PageSet(page_set_module.PageSet):
+class SkiaCuteoverloadNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(CuteOverloadNexus10PageSet, self).__init__(
+    super(SkiaCuteoverloadNexus10PageSet, 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 bdbf2b2a54..c645af75b4 100644
--- a/tools/skp/page_sets/skia_deviantart_nexus10.py
+++ b/tools/skp/page_sets/skia_deviantart_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class DeviantartNexus10PageSet(page_set_module.PageSet):
+class SkiaDeviantartNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(DeviantartNexus10PageSet, self).__init__(
+    super(SkiaDeviantartNexus10PageSet, 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 db08c730e7..bd44785e64 100644
--- a/tools/skp/page_sets/skia_digg_nexus10.py
+++ b/tools/skp/page_sets/skia_digg_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class DiggNexus10PageSet(page_set_module.PageSet):
+class SkiaDiggNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(DiggNexus10PageSet, self).__init__(
+    super(SkiaDiggNexus10PageSet, 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 f5eab364c7..7fc30fab3f 100644
--- a/tools/skp/page_sets/skia_ebay_desktop.py
+++ b/tools/skp/page_sets/skia_ebay_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class EbayDesktopPageSet(page_set_module.PageSet):
+class SkiaEbayDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(EbayDesktopPageSet, self).__init__(
+    super(SkiaEbayDesktopPageSet, 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 611b10c168..20e1b79b1a 100644
--- a/tools/skp/page_sets/skia_engadget_nexus10.py
+++ b/tools/skp/page_sets/skia_engadget_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class EngadgetNexus10PageSet(page_set_module.PageSet):
+class SkiaEngadgetNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(EngadgetNexus10PageSet, self).__init__(
+    super(SkiaEngadgetNexus10PageSet, 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 7b5f5da3d0..433e2a2f75 100644
--- a/tools/skp/page_sets/skia_espn_desktop.py
+++ b/tools/skp/page_sets/skia_espn_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class EspnDesktopPageSet(page_set_module.PageSet):
+class SkiaEspnDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(EspnDesktopPageSet, self).__init__(
+    super(SkiaEspnDesktopPageSet, 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 528ced98b9..c72e57ef13 100644
--- a/tools/skp/page_sets/skia_facebook_desktop.py
+++ b/tools/skp/page_sets/skia_facebook_desktop.py
@@ -28,12 +28,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class FacebookDesktopPageSet(page_set_module.PageSet):
+class SkiaFacebookDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(FacebookDesktopPageSet, self).__init__(
+    super(SkiaFacebookDesktopPageSet, 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 44b234f62a..a832a5a916 100644
--- a/tools/skp/page_sets/skia_fontwipe_desktop.py
+++ b/tools/skp/page_sets/skia_fontwipe_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class FontwipeDesktopPageSet(page_set_module.PageSet):
+class SkiaFontwipeDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(FontwipeDesktopPageSet, self).__init__(
+    super(SkiaFontwipeDesktopPageSet, 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 5ffed14998..08c523ac74 100644
--- a/tools/skp/page_sets/skia_forecastio_desktop.py
+++ b/tools/skp/page_sets/skia_forecastio_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(20)
 
 
-class ForecastioDesktopPageSet(page_set_module.PageSet):
+class SkiaForecastioDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(ForecastioDesktopPageSet, self).__init__(
+    super(SkiaForecastioDesktopPageSet, 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 8f1391911d..aee7d75bd3 100644
--- a/tools/skp/page_sets/skia_frantzen_nexus10.py
+++ b/tools/skp/page_sets/skia_frantzen_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class FrantzenNexus10PageSet(page_set_module.PageSet):
+class SkiaFrantzenNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(FrantzenNexus10PageSet, self).__init__(
+    super(SkiaFrantzenNexus10PageSet, 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 03a05eaeef..fcef0e1d49 100644
--- a/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
+++ b/tools/skp/page_sets/skia_gamedeksiam_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class GamedeksiamNexus10PageSet(page_set_module.PageSet):
+class SkiaGamedeksiamNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(GamedeksiamNexus10PageSet, self).__init__(
+    super(SkiaGamedeksiamNexus10PageSet, 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 8e4e314f11..58be388703 100644
--- a/tools/skp/page_sets/skia_gmail_nexus10.py
+++ b/tools/skp/page_sets/skia_gmail_nexus10.py
@@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(10)
 
 
-class GmailNexus10PageSet(page_set_module.PageSet):
+class SkiaGmailNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(GmailNexus10PageSet, self).__init__(
+    super(SkiaGmailNexus10PageSet, 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 0b2782cf35..ec13eccc7d 100644
--- a/tools/skp/page_sets/skia_gmailthread_desktop.py
+++ b/tools/skp/page_sets/skia_gmailthread_desktop.py
@@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(60)
 
 
-class GmailthreadDesktopPageSet(page_set_module.PageSet):
+class SkiaGmailthreadDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(GmailthreadDesktopPageSet, self).__init__(
+    super(SkiaGmailthreadDesktopPageSet, 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 c4b2bb4f9a..db06eefb88 100644
--- a/tools/skp/page_sets/skia_googleblog_nexus10.py
+++ b/tools/skp/page_sets/skia_googleblog_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class GoogleblogNexus10PageSet(page_set_module.PageSet):
+class SkiaGoogleblogNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(GoogleblogNexus10PageSet, self).__init__(
+    super(SkiaGoogleblogNexus10PageSet, 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 61ab231828..5e899b5778 100644
--- a/tools/skp/page_sets/skia_googlecalendar_nexus10.py
+++ b/tools/skp/page_sets/skia_googlecalendar_nexus10.py
@@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class GoogleCalendarNexus10PageSet(page_set_module.PageSet):
+class SkiaGooglecalendarNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(GoogleCalendarNexus10PageSet, self).__init__(
+    super(SkiaGooglecalendarNexus10PageSet, 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 6ae3c893fe..8187a44830 100644
--- a/tools/skp/page_sets/skia_googlehome_desktop.py
+++ b/tools/skp/page_sets/skia_googlehome_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class GooglehomeDesktopPageSet(page_set_module.PageSet):
+class SkiaGooglehomeDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(GooglehomeDesktopPageSet, self).__init__(
+    super(SkiaGooglehomeDesktopPageSet, 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 d2a39e9fa5..78775dfb9a 100644
--- a/tools/skp/page_sets/skia_googleplus_desktop.py
+++ b/tools/skp/page_sets/skia_googleplus_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class GooglePlusDesktopPageSet(page_set_module.PageSet):
+class SkiaGoogleplusDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(GooglePlusDesktopPageSet, self).__init__(
+    super(SkiaGoogleplusDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_googleplus_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
index 55f3c0fce0..0bbf0fc514 100644
--- a/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
+++ b/tools/skp/page_sets/skia_googlespreadsheet_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(10)
 
 
-class GoogleSpreadsheetDesktopPageSet(page_set_module.PageSet):
+class SkiaGooglespreadsheetDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(GoogleSpreadsheetDesktopPageSet, self).__init__(
+    super(SkiaGooglespreadsheetDesktopPageSet, self).__init__(
       user_agent_type='desktop',
       archive_data_file='data/skia_googlespreadsheet_desktop.json')
 
diff --git a/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py b/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
index 8bebf73508..deea590c02 100644
--- a/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
+++ b/tools/skp/page_sets/skia_googlespreadsheetdashed_desktop.py
@@ -27,12 +27,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(10)
 
 
-class GoogleSpreadsheetDashedDesktopPageSet(page_set_module.PageSet):
+class SkiaGooglespreadsheetdashedDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(GoogleSpreadsheetDashedDesktopPageSet, self).__init__(
+    super(SkiaGooglespreadsheetdashedDesktopPageSet, 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 b4768332e8..97c0ec43f9 100644
--- a/tools/skp/page_sets/skia_gspro_nexus10.py
+++ b/tools/skp/page_sets/skia_gspro_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class GsproNexus10PageSet(page_set_module.PageSet):
+class SkiaGsproNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(GsproNexus10PageSet, self).__init__(
+    super(SkiaGsproNexus10PageSet, 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 8b7238b567..864a8f7d0b 100644
--- a/tools/skp/page_sets/skia_gws_desktop.py
+++ b/tools/skp/page_sets/skia_gws_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class GwsDesktopPageSet(page_set_module.PageSet):
+class SkiaGwsDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(GwsDesktopPageSet, self).__init__(
+    super(SkiaGwsDesktopPageSet, 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 f6fb04f8d3..bf4c4fec80 100644
--- a/tools/skp/page_sets/skia_hsfi_nexus10.py
+++ b/tools/skp/page_sets/skia_hsfi_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class HsfiNexus10PageSet(page_set_module.PageSet):
+class SkiaHsfiNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(HsfiNexus10PageSet, self).__init__(
+    super(SkiaHsfiNexus10PageSet, 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 db1844c786..3ac769dbfa 100644
--- a/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlebigcar_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(10)
 
 
-class JsfiddleBigcarDesktopPageSet(page_set_module.PageSet):
+class SkiaJsfiddlebigcarDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(JsfiddleBigcarDesktopPageSet, self).__init__(
+    super(SkiaJsfiddlebigcarDesktopPageSet, 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 f9716b4d25..d85699e592 100644
--- a/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py
+++ b/tools/skp/page_sets/skia_jsfiddlehumperclip_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(10)
 
 
-class JsfiddleHumperDesktopPageSet(page_set_module.PageSet):
+class SkiaJsfiddlehumperclipDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(JsfiddleHumperDesktopPageSet, self).__init__(
+    super(SkiaJsfiddlehumperclipDesktopPageSet, 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 94700e2750..3e52d5ef26 100644
--- a/tools/skp/page_sets/skia_linkedin_desktop.py
+++ b/tools/skp/page_sets/skia_linkedin_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class LinkedinDesktopPageSet(page_set_module.PageSet):
+class SkiaLinkedinDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(LinkedinDesktopPageSet, self).__init__(
+    super(SkiaLinkedinDesktopPageSet, 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 3159dc44ea..877c8179cb 100644
--- a/tools/skp/page_sets/skia_mapsvg_desktop.py
+++ b/tools/skp/page_sets/skia_mapsvg_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(10)
 
 
-class MapsvgDesktopPageSet(page_set_module.PageSet):
+class SkiaMapsvgDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(MapsvgDesktopPageSet, self).__init__(
+    super(SkiaMapsvgDesktopPageSet, 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 93436735b1..91eadbc2f8 100644
--- a/tools/skp/page_sets/skia_mercurynews_nexus10.py
+++ b/tools/skp/page_sets/skia_mercurynews_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class MercurynewsNexus10PageSet(page_set_module.PageSet):
+class SkiaMercurynewsNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(MercurynewsNexus10PageSet, self).__init__(
+    super(SkiaMercurynewsNexus10PageSet, 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 0118edad7b..2bb9613e14 100644
--- a/tools/skp/page_sets/skia_mlb_nexus10.py
+++ b/tools/skp/page_sets/skia_mlb_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class MlbNexus10PageSet(page_set_module.PageSet):
+class SkiaMlbNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(MlbNexus10PageSet, self).__init__(
+    super(SkiaMlbNexus10PageSet, 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 7b334c4cdf..6e5c4b5c9d 100644
--- a/tools/skp/page_sets/skia_mobilenews_desktop.py
+++ b/tools/skp/page_sets/skia_mobilenews_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(10)
 
 
-class MobilenewsDesktopPageSet(page_set_module.PageSet):
+class SkiaMobilenewsDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(MobilenewsDesktopPageSet, self).__init__(
+    super(SkiaMobilenewsDesktopPageSet, 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 5e04d92827..eb33e079ef 100644
--- a/tools/skp/page_sets/skia_mozilla_nexus10.py
+++ b/tools/skp/page_sets/skia_mozilla_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class MozillaNexus10PageSet(page_set_module.PageSet):
+class SkiaMozillaNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(MozillaNexus10PageSet, self).__init__(
+    super(SkiaMozillaNexus10PageSet, 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 afc97c00ab..c7f7c648e5 100644
--- a/tools/skp/page_sets/skia_nofolo_nexus10.py
+++ b/tools/skp/page_sets/skia_nofolo_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class NofoloNexus10PageSet(page_set_module.PageSet):
+class SkiaNofoloNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(NofoloNexus10PageSet, self).__init__(
+    super(SkiaNofoloNexus10PageSet, 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 f68ec76b08..18d5732339 100644
--- a/tools/skp/page_sets/skia_nytimes_nexus10.py
+++ b/tools/skp/page_sets/skia_nytimes_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class NytimesNexus10PageSet(page_set_module.PageSet):
+class SkiaNytimesNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(NytimesNexus10PageSet, self).__init__(
+    super(SkiaNytimesNexus10PageSet, 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 747fde032d..0c50851ff5 100644
--- a/tools/skp/page_sets/skia_oldinboxapp_desktop.py
+++ b/tools/skp/page_sets/skia_oldinboxapp_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class OldinboxappDesktopPageSet(page_set_module.PageSet):
+class SkiaOldinboxappDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(OldinboxappDesktopPageSet, self).__init__(
+    super(SkiaOldinboxappDesktopPageSet, 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 6035f2d363..780c2bf27d 100644
--- a/tools/skp/page_sets/skia_pinterest_desktop.py
+++ b/tools/skp/page_sets/skia_pinterest_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class PinterestDesktopPageSet(page_set_module.PageSet):
+class SkiaPinterestDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(PinterestDesktopPageSet, self).__init__(
+    super(SkiaPinterestDesktopPageSet, 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 aafc988a3c..d96ac49113 100644
--- a/tools/skp/page_sets/skia_pokemonwiki_desktop.py
+++ b/tools/skp/page_sets/skia_pokemonwiki_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class PokemonwikiDesktopPageSet(page_set_module.PageSet):
+class SkiaPokemonwikiDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(PokemonwikiDesktopPageSet, self).__init__(
+    super(SkiaPokemonwikiDesktopPageSet, 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 7935a14684..6daaa439d9 100644
--- a/tools/skp/page_sets/skia_pravda_nexus10.py
+++ b/tools/skp/page_sets/skia_pravda_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(10)
 
 
-class PravdaNexus10PageSet(page_set_module.PageSet):
+class SkiaPravdaNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(PravdaNexus10PageSet, self).__init__(
+    super(SkiaPravdaNexus10PageSet, 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 5bfc0fb3db..a3b21ac4b8 100644
--- a/tools/skp/page_sets/skia_rectangletransition_desktop.py
+++ b/tools/skp/page_sets/skia_rectangletransition_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class RectangletransitionDesktopPageSet(page_set_module.PageSet):
+class SkiaRectangletransitionDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(RectangletransitionDesktopPageSet, self).__init__(
+    super(SkiaRectangletransitionDesktopPageSet, 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 dc8862bf4c..f1b383004f 100644
--- a/tools/skp/page_sets/skia_sahadan_nexus10.py
+++ b/tools/skp/page_sets/skia_sahadan_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class SahadanNexus10PageSet(page_set_module.PageSet):
+class SkiaSahadanNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SahadanNexus10PageSet, self).__init__(
+    super(SkiaSahadanNexus10PageSet, 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 3f2be0d741..817c821cc1 100644
--- a/tools/skp/page_sets/skia_samoasvg_desktop.py
+++ b/tools/skp/page_sets/skia_samoasvg_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class SamoasvgDesktopPageSet(page_set_module.PageSet):
+class SkiaSamoasvgDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SamoasvgDesktopPageSet, self).__init__(
+    super(SkiaSamoasvgDesktopPageSet, 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 e8ed1dc0e3..bcde7cc5a1 100644
--- a/tools/skp/page_sets/skia_sfgate_desktop.py
+++ b/tools/skp/page_sets/skia_sfgate_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class SfgateDesktopPageSet(page_set_module.PageSet):
+class SkiaSfgateDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SfgateDesktopPageSet, self).__init__(
+    super(SkiaSfgateDesktopPageSet, 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 f3a4bf5df9..ca5e1d2c9f 100644
--- a/tools/skp/page_sets/skia_slashdot_nexus10.py
+++ b/tools/skp/page_sets/skia_slashdot_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class SlashdotNexus10PageSet(page_set_module.PageSet):
+class SkiaSlashdotNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(SlashdotNexus10PageSet, self).__init__(
+    super(SkiaSlashdotNexus10PageSet, 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 a8be047c43..a006b07c0c 100644
--- a/tools/skp/page_sets/skia_techmeme_nexus10.py
+++ b/tools/skp/page_sets/skia_techmeme_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class TechmemeNexus10PageSet(page_set_module.PageSet):
+class SkiaTechmemeNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(TechmemeNexus10PageSet, self).__init__(
+    super(SkiaTechmemeNexus10PageSet, 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 33f0b5335a..47ad95b1ef 100644
--- a/tools/skp/page_sets/skia_tigersvg_desktop.py
+++ b/tools/skp/page_sets/skia_tigersvg_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class TigersvgDesktopPageSet(page_set_module.PageSet):
+class SkiaTigersvgDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(TigersvgDesktopPageSet, self).__init__(
+    super(SkiaTigersvgDesktopPageSet, 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 d9ec66f7dd..bcdccf8067 100644
--- a/tools/skp/page_sets/skia_twitter_desktop.py
+++ b/tools/skp/page_sets/skia_twitter_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class TwitterDesktopPageSet(page_set_module.PageSet):
+class SkiaTwitterDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(TwitterDesktopPageSet, self).__init__(
+    super(SkiaTwitterDesktopPageSet, 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 6f35d7c795..2fe938ac4a 100644
--- a/tools/skp/page_sets/skia_ukwsj_nexus10.py
+++ b/tools/skp/page_sets/skia_ukwsj_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class UkwsjNexus10PageSet(page_set_module.PageSet):
+class SkiaUkwsjNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(UkwsjNexus10PageSet, self).__init__(
+    super(SkiaUkwsjNexus10PageSet, 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 51b2e57177..a820d1265f 100644
--- a/tools/skp/page_sets/skia_vnexpress_nexus10.py
+++ b/tools/skp/page_sets/skia_vnexpress_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class VnexpressNexus10PageSet(page_set_module.PageSet):
+class SkiaVnexpressNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(VnexpressNexus10PageSet, self).__init__(
+    super(SkiaVnexpressNexus10PageSet, 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 cae33b7d18..c8371819e4 100644
--- a/tools/skp/page_sets/skia_weather_desktop.py
+++ b/tools/skp/page_sets/skia_weather_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class WeatherDesktopPageSet(page_set_module.PageSet):
+class SkiaWeatherDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(WeatherDesktopPageSet, self).__init__(
+    super(SkiaWeatherDesktopPageSet, 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 bcbe04ae79..e0be4e9fff 100644
--- a/tools/skp/page_sets/skia_wikipedia_galaxynexus.py
+++ b/tools/skp/page_sets/skia_wikipedia_galaxynexus.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class WikipediaGalaxynexusPageSet(page_set_module.PageSet):
+class SkiaWikipediaGalaxynexusPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(WikipediaGalaxynexusPageSet, self).__init__(
+    super(SkiaWikipediaGalaxynexusPageSet, 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 0d7be05064..9684aa9579 100644
--- a/tools/skp/page_sets/skia_worldjournal_nexus10.py
+++ b/tools/skp/page_sets/skia_worldjournal_nexus10.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class WorldjournalNexus10PageSet(page_set_module.PageSet):
+class SkiaWorldjournalNexus10PageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(WorldjournalNexus10PageSet, self).__init__(
+    super(SkiaWorldjournalNexus10PageSet, 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 fcabc2a73a..0acc80403d 100644
--- a/tools/skp/page_sets/skia_wowwiki_desktop.py
+++ b/tools/skp/page_sets/skia_wowwiki_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class WowWikiDesktopPageSet(page_set_module.PageSet):
+class SkiaWowwikiDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(WowWikiDesktopPageSet, self).__init__(
+    super(SkiaWowwikiDesktopPageSet, 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 c86599fd3d..274ad43b3a 100644
--- a/tools/skp/page_sets/skia_yahooanswers_desktop.py
+++ b/tools/skp/page_sets/skia_yahooanswers_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(5)
 
 
-class YahooAnswersDesktopPageSet(page_set_module.PageSet):
+class SkiaYahooanswersDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(YahooAnswersDesktopPageSet, self).__init__(
+    super(SkiaYahooanswersDesktopPageSet, 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 75ff00bb59..7a81104bf2 100644
--- a/tools/skp/page_sets/skia_youtube_desktop.py
+++ b/tools/skp/page_sets/skia_youtube_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(15)
 
 
-class YoutubeDesktopPageSet(page_set_module.PageSet):
+class SkiaYoutubeDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(YoutubeDesktopPageSet, self).__init__(
+    super(SkiaYoutubeDesktopPageSet, 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 3217087bbf..d54bcfa221 100644
--- a/tools/skp/page_sets/skia_youtubetvvideo_desktop.py
+++ b/tools/skp/page_sets/skia_youtubetvvideo_desktop.py
@@ -26,12 +26,12 @@ class SkiaBuildbotDesktopPage(page_module.Page):
     action_runner.Wait(10)
 
 
-class YoutubeTvVideoDesktopPageSet(page_set_module.PageSet):
+class SkiaYoutubetvvideoDesktopPageSet(page_set_module.PageSet):
 
   """ Pages designed to represent the median, not highly optimized web """
 
   def __init__(self):
-    super(YoutubeTvVideoDesktopPageSet, self).__init__(
+    super(SkiaYoutubetvvideoDesktopPageSet, 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 394e14ea4d..97fec5172d 100644
--- a/tools/skp/webpages_playback.py
+++ b/tools/skp/webpages_playback.py
@@ -202,19 +202,23 @@ class SkPicturePlayback(object):
     # Loop through all page_sets.
     for page_set in self._page_sets:
 
-      page_set_basename = os.path.basename(page_set).split('.')[0] + '.json'
+      page_set_basename = os.path.basename(page_set).split('.')[0]
+      page_set_json_name = page_set_basename + '.json'
       wpr_data_file = page_set.split(os.path.sep)[-1].split('.')[0] + '_000.wpr'
+      page_set_dir = os.path.dirname(page_set)
 
       if self._record:
         # Create an archive of the specified webpages if '--record=True' is
         # specified.
         record_wpr_cmd = (
+          'PYTHONPATH=%s:$PYTHONPATH' % page_set_dir,
           'DISPLAY=%s' % X11_DISPLAY,
           os.path.join(self._telemetry_binaries_dir, 'record_wpr'),
           '--extra-browser-args=--disable-setuid-sandbox',
           '--browser=exact',
           '--browser-executable=%s' % self._browser_executable,
-          page_set
+          '%s_page_set' % page_set_basename,
+          '--page-set-base-dir=%s' % page_set_dir
         )
         for _ in range(RETRY_RECORD_WPR_COUNT):
           output = shell_utils.run(' '.join(record_wpr_cmd), shell=True)
@@ -231,10 +235,8 @@ class SkPicturePlayback(object):
       else:
         if not self._skip_all_gs_access:
           # Get the webpages archive so that it can be replayed.
-          self._DownloadWebpagesArchive(wpr_data_file, page_set_basename)
+          self._DownloadWebpagesArchive(wpr_data_file, page_set_json_name)
 
-      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,
@@ -244,7 +246,7 @@ class SkPicturePlayback(object):
           '--browser=exact',
           '--browser-executable=%s' % self._browser_executable,
           SKP_BENCHMARK,
-          '--page-set-name=%s' % page_set_name,
+          '--page-set-name=%s' % page_set_basename,
           '--page-set-base-dir=%s' % page_set_dir,
           '--skp-outdir=%s' % TMP_SKP_DIR,
           '--also-run-disabled-tests'
@@ -267,7 +269,7 @@ class SkPicturePlayback(object):
               self._local_record_webpages_archive_dir)
           shutil.move(
               os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR,
-                           page_set_basename),
+                           page_set_json_name),
               self._local_record_webpages_archive_dir)
 
         # Rename generated SKP files into more descriptive names.
@@ -375,13 +377,13 @@ class SkPicturePlayback(object):
         shutil.rmtree(d)
       os.makedirs(d)
 
-  def _DownloadWebpagesArchive(self, wpr_data_file, page_set_basename):
+  def _DownloadWebpagesArchive(self, wpr_data_file, page_set_json_name):
     """Downloads the webpages archive and its required page set from GS."""
     wpr_source = posixpath.join(ROOT_PLAYBACK_DIR_NAME, 'webpages_archive',
                                 wpr_data_file)
     page_set_source = posixpath.join(ROOT_PLAYBACK_DIR_NAME,
                                      'webpages_archive',
-                                     page_set_basename)
+                                     page_set_json_name)
     gs = gs_utils.GSUtils()
     gs_bucket = self._dest_gsbase.lstrip(gs_utils.GS_PREFIX)
     if (gs.does_storage_object_exist(gs_bucket, wpr_source) and
@@ -391,7 +393,7 @@ class SkPicturePlayback(object):
                                     wpr_data_file))
       gs.download_file(gs_bucket, page_set_source,
                        os.path.join(LOCAL_REPLAY_WEBPAGES_ARCHIVE_DIR,
-                                    page_set_basename))
+                                    page_set_json_name))
     else:
       raise Exception('%s and %s do not exist in Google Storage!' % (
           wpr_source, page_set_source))