Rename AddPage -> AddUserStory in tools/perf/page_sets/.

BUG=439512

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

Cr-Commit-Position: refs/heads/master@{#308274}

69 files changed, 287 insertions, 285 deletions

diff --git a/tools/perf/page_sets/alexa1-10000.py b/tools/perf/page_sets/alexa1-10000.py
index fec9fe1..094e705 100644
--- a/tools/perf/page_sets/alexa1-10000.py
+++ b/tools/perf/page_sets/alexa1-10000.py
@@ -19377,4 +19377,4 @@ class Alexa1To10000PageSet(PageSet):
       # Why: #9999 in Alexa global
       'http://www.busuk.org/']
     for url in urls_list:
-      self.AddPage(Alexa1To10000Page(url, self))
+      self.AddUserStory(Alexa1To10000Page(url, self))
diff --git a/tools/perf/page_sets/android_acceptance.py b/tools/perf/page_sets/android_acceptance.py
index 6afe493..2afb97d 100644
--- a/tools/perf/page_sets/android_acceptance.py
+++ b/tools/perf/page_sets/android_acceptance.py
@@ -35,4 +35,4 @@ class AndroidAcceptancePageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(AndroidAcceptancePage(url, self))
+      self.AddUserStory(AndroidAcceptancePage(url, self))
diff --git a/tools/perf/page_sets/blank_page.py b/tools/perf/page_sets/blank_page.py
index c5b79d5..3d22b7c 100644
--- a/tools/perf/page_sets/blank_page.py
+++ b/tools/perf/page_sets/blank_page.py
@@ -15,4 +15,4 @@ class BlankPageSet(page_set_module.PageSet):
 
   def __init__(self):
     super(BlankPageSet, self).__init__()
-    self.AddPage(BlankPage('file://blank_page/blank_page.html', self))
+    self.AddUserStory(BlankPage('file://blank_page/blank_page.html', self))
diff --git a/tools/perf/page_sets/five_blank_pages.py b/tools/perf/page_sets/five_blank_pages.py
index d2cbfcc..a84e21e 100644
--- a/tools/perf/page_sets/five_blank_pages.py
+++ b/tools/perf/page_sets/five_blank_pages.py
@@ -18,4 +18,4 @@ class FiveBlankPagesPageSet(page_set_module.PageSet):
   def __init__(self):
     super(FiveBlankPagesPageSet, self).__init__()
     for _ in xrange(5):
-      self.AddPage(BlankPage('file://blank_page/blank_page.html', self))
+      self.AddUserStory(BlankPage('file://blank_page/blank_page.html', self))
diff --git a/tools/perf/page_sets/flash_energy_cases.py b/tools/perf/page_sets/flash_energy_cases.py
index 1c52f68..f1738e5 100644
--- a/tools/perf/page_sets/flash_energy_cases.py
+++ b/tools/perf/page_sets/flash_energy_cases.py
@@ -36,4 +36,4 @@ class FlashEnergyCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(FlashEnergyCasesPage(url, self))
+      self.AddUserStory(FlashEnergyCasesPage(url, self))
diff --git a/tools/perf/page_sets/garbage_collection_cases.py b/tools/perf/page_sets/garbage_collection_cases.py
index 027173c..e5a121c 100644
--- a/tools/perf/page_sets/garbage_collection_cases.py
+++ b/tools/perf/page_sets/garbage_collection_cases.py
@@ -41,4 +41,4 @@ class GarbageCollectionCasesPageSet(page_set_module.PageSet):
       archive_data_file='data/garbage_collection_cases.json',
       bucket=page_set_module.PARTNER_BUCKET)
 
-    self.AddPage(SpinningBallsPage(self))
+    self.AddUserStory(SpinningBallsPage(self))
diff --git a/tools/perf/page_sets/gmail_compose_discard.py b/tools/perf/page_sets/gmail_compose_discard.py
index 3eedb59..e971505 100644
--- a/tools/perf/page_sets/gmail_compose_discard.py
+++ b/tools/perf/page_sets/gmail_compose_discard.py
@@ -68,4 +68,4 @@ class GmailComposeDiscardPageSet(page_set_module.PageSet):
     super(GmailComposeDiscardPageSet, self).__init__(
       user_agent_type='desktop')
 
-    self.AddPage(GmailComposeDiscardPage(self))
+    self.AddUserStory(GmailComposeDiscardPage(self))
diff --git a/tools/perf/page_sets/gmail_refresh.py b/tools/perf/page_sets/gmail_refresh.py
index d288963..87f5e31 100644
--- a/tools/perf/page_sets/gmail_refresh.py
+++ b/tools/perf/page_sets/gmail_refresh.py
@@ -33,4 +33,4 @@ class GmailRefreshPageSet(page_set_module.PageSet):
       archive_data_file='data/gmail_refresh.json',
       bucket=page_set_module.PUBLIC_BUCKET)
 
-    self.AddPage(GmailRefreshPage(self))
+    self.AddUserStory(GmailRefreshPage(self))
diff --git a/tools/perf/page_sets/image_decoding_cases.py b/tools/perf/page_sets/image_decoding_cases.py
index 902cabd..3e14151 100644
--- a/tools/perf/page_sets/image_decoding_cases.py
+++ b/tools/perf/page_sets/image_decoding_cases.py
@@ -24,4 +24,4 @@ class ImageDecodingCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(ImageDecodingCasesPage(url, self))
+      self.AddUserStory(ImageDecodingCasesPage(url, self))
diff --git a/tools/perf/page_sets/image_decoding_measurement.py b/tools/perf/page_sets/image_decoding_measurement.py
index f73fe18..2b0ac95 100644
--- a/tools/perf/page_sets/image_decoding_measurement.py
+++ b/tools/perf/page_sets/image_decoding_measurement.py
@@ -34,4 +34,4 @@ class ImageDecodingMeasurementPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(ImageDecodingMeasurementPage(url, self))
+      self.AddUserStory(ImageDecodingMeasurementPage(url, self))
diff --git a/tools/perf/page_sets/intl_ar_fa_he.py b/tools/perf/page_sets/intl_ar_fa_he.py
index 52f11e8..7c59835 100644
--- a/tools/perf/page_sets/intl_ar_fa_he.py
+++ b/tools/perf/page_sets/intl_ar_fa_he.py
@@ -41,4 +41,4 @@ class IntlArFaHePageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(IntlArFaHePage(url, self))
+      self.AddUserStory(IntlArFaHePage(url, self))
diff --git a/tools/perf/page_sets/intl_es_fr_pt-BR.py b/tools/perf/page_sets/intl_es_fr_pt-BR.py
index b170e3c..30d51f2 100644
--- a/tools/perf/page_sets/intl_es_fr_pt-BR.py
+++ b/tools/perf/page_sets/intl_es_fr_pt-BR.py
@@ -49,4 +49,4 @@ class IntlEsFrPtBrPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(IntlEsFrPtBrPage(url, self))
+      self.AddUserStory(IntlEsFrPtBrPage(url, self))
diff --git a/tools/perf/page_sets/intl_hi_ru.py b/tools/perf/page_sets/intl_hi_ru.py
index e7d13d0..da8f4a2 100644
--- a/tools/perf/page_sets/intl_hi_ru.py
+++ b/tools/perf/page_sets/intl_hi_ru.py
@@ -50,4 +50,4 @@ class IntlHiRuPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(IntlHiRuPage(url, self))
+      self.AddUserStory(IntlHiRuPage(url, self))
diff --git a/tools/perf/page_sets/intl_ja_zh.py b/tools/perf/page_sets/intl_ja_zh.py
index 1ca321d..93ac080 100644
--- a/tools/perf/page_sets/intl_ja_zh.py
+++ b/tools/perf/page_sets/intl_ja_zh.py
@@ -61,4 +61,4 @@ class IntlJaZhPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(IntlJaZhPage(url, self))
+      self.AddUserStory(IntlJaZhPage(url, self))
diff --git a/tools/perf/page_sets/intl_ko_th_vi.py b/tools/perf/page_sets/intl_ko_th_vi.py
index 23e0fe2..8421dad 100644
--- a/tools/perf/page_sets/intl_ko_th_vi.py
+++ b/tools/perf/page_sets/intl_ko_th_vi.py
@@ -54,4 +54,4 @@ class IntlKoThViPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(IntlKoThViPage(url, self))
+      self.AddUserStory(IntlKoThViPage(url, self))
diff --git a/tools/perf/page_sets/key_desktop_sites.py b/tools/perf/page_sets/key_desktop_sites.py
index 69dca11..a512027 100644
--- a/tools/perf/page_sets/key_desktop_sites.py
+++ b/tools/perf/page_sets/key_desktop_sites.py
@@ -122,11 +122,11 @@ class KeyDesktopSitesPageSet(page_set_module.PageSet):
       archive_data_file='data/key_desktop_sites.json',
       bucket=page_set_module.PARTNER_BUCKET)
 
-    self.AddPage(FacebookPage(self))
-    self.AddPage(GmailPage(self))
-    self.AddPage(GoogleCalendarPage(self))
-    self.AddPage(GoogleDrivePage(self))
-    self.AddPage(GoogleDocPage(self))
+    self.AddUserStory(FacebookPage(self))
+    self.AddUserStory(GmailPage(self))
+    self.AddUserStory(GoogleCalendarPage(self))
+    self.AddUserStory(GoogleDrivePage(self))
+    self.AddUserStory(GoogleDocPage(self))
 
     urls_list = [
       'http://www.google.com/nexus/5/#/',
@@ -850,4 +850,4 @@ class KeyDesktopSitesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(KeyDesktopSitesPage(url, self))
+      self.AddUserStory(KeyDesktopSitesPage(url, self))
diff --git a/tools/perf/page_sets/key_hit_test_cases.py b/tools/perf/page_sets/key_hit_test_cases.py
index c504123..2cc0855 100644
--- a/tools/perf/page_sets/key_hit_test_cases.py
+++ b/tools/perf/page_sets/key_hit_test_cases.py
@@ -52,4 +52,4 @@ class KeyHitTestCasesPageSet(page_set_module.PageSet):
     super(KeyHitTestCasesPageSet, self).__init__(
       user_agent_type='mobile')
 
-    self.AddPage(PaperCalculatorHitTest(self))
+    self.AddUserStory(PaperCalculatorHitTest(self))
diff --git a/tools/perf/page_sets/key_mobile_sites.py b/tools/perf/page_sets/key_mobile_sites.py
index 754114b..e6e683e 100644
--- a/tools/perf/page_sets/key_mobile_sites.py
+++ b/tools/perf/page_sets/key_mobile_sites.py
@@ -312,47 +312,47 @@ class KeyMobileSitesPageSet(page_set_module.PageSet):
       bucket=page_set_module.PARTNER_BUCKET)
 
 
-    self.AddPage(CapitolVolkswagenPage(self))
-    self.AddPage(TheVergePage(self))
-    self.AddPage(CnnPage(self))
-    self.AddPage(FacebookPage(self))
-    self.AddPage(YoutubeMobilePage(self))
-    self.AddPage(LinkedInPage(self))
-    self.AddPage(YahooAnswersPage(self))
-    self.AddPage(GmailPage(self))
+    self.AddUserStory(CapitolVolkswagenPage(self))
+    self.AddUserStory(TheVergePage(self))
+    self.AddUserStory(CnnPage(self))
+    self.AddUserStory(FacebookPage(self))
+    self.AddUserStory(YoutubeMobilePage(self))
+    self.AddUserStory(LinkedInPage(self))
+    self.AddUserStory(YahooAnswersPage(self))
+    self.AddUserStory(GmailPage(self))
     # Page behaves non-deterministically, replaced with test version for now.
-    # self.AddPage(GroupClonedPage(self))
+    # self.AddUserStory(GroupClonedPage(self))
     # mean_input_event_latency cannot be tracked correctly for
     # GroupClonedListImagesPage.
     # See crbug.com/409086.
-    # self.AddPage(GroupClonedListImagesPage(self))
-    self.AddPage(GoogleNewsMobilePage(self))
-    self.AddPage(GoogleNewsMobile2Page(self))
-    self.AddPage(AmazonNicolasCagePage(self))
+    # self.AddUserStory(GroupClonedListImagesPage(self))
+    self.AddUserStory(GoogleNewsMobilePage(self))
+    self.AddUserStory(GoogleNewsMobile2Page(self))
+    self.AddUserStory(AmazonNicolasCagePage(self))
 
     # Why: Top news site.
-    self.AddPage(KeyMobileSitesPage(
+    self.AddUserStory(KeyMobileSitesPage(
       url='http://nytimes.com/', page_set=self, labels=['fastpath']))
 
     # Why: Image-heavy site.
-    self.AddPage(KeyMobileSitesPage(
+    self.AddUserStory(KeyMobileSitesPage(
       url='http://cuteoverload.com', page_set=self, labels=['fastpath']))
 
     # Why: #11 (Alexa global), google property; some blogger layouts
     # have infinite scroll but more interesting.
-    self.AddPage(KeyMobileSitesPage(
+    self.AddUserStory(KeyMobileSitesPage(
       url='http://googlewebmastercentral.blogspot.com/',
       page_set=self, name='Blogger'))
 
     # Why: #18 (Alexa global), Picked an interesting post """
-    self.AddPage(KeyMobileSitesPage(
+    self.AddUserStory(KeyMobileSitesPage(
       # pylint: disable=C0301
       url='http://en.blog.wordpress.com/2012/09/04/freshly-pressed-editors-picks-for-august-2012/',
       page_set=self,
       name='Wordpress'))
 
    # Why: #6 (Alexa) most visited worldwide, picked an interesting page
-    self.AddPage(KeyMobileSitesPage(
+    self.AddUserStory(KeyMobileSitesPage(
       url='http://en.wikipedia.org/wiki/Wikipedia',
       page_set=self,
       name='Wikipedia (1 tab)'))
@@ -360,34 +360,35 @@ class KeyMobileSitesPageSet(page_set_module.PageSet):
 
     # Why: #8 (Alexa global), picked an interesting page
     # Forbidden (Rate Limit Exceeded)
-    # self.AddPage(KeyMobileSitesPage(
+    # self.AddUserStory(KeyMobileSitesPage(
     #  url='http://twitter.com/katyperry', page_set=self, name='Twitter'))
 
     # Why: #37 (Alexa global) """
-    self.AddPage(KeyMobileSitesPage(
+    self.AddUserStory(KeyMobileSitesPage(
         url='http://pinterest.com',
         page_set=self,
         name='Pinterest'))
 
     # Why: #1 sports.
     # Fails often; crbug.com/249722'
-    # self.AddPage(KeyMobileSitesPage(
+    # self.AddUserStory(KeyMobileSitesPage(
     # url='http://espn.go.com', page_set=self, name='ESPN'))
     # Why: crbug.com/231413
     # Doesn't scroll; crbug.com/249736
-    # self.AddPage(KeyMobileSitesPage(url='http://forecast.io', page_set=self))
+    # self.AddUserStory(KeyMobileSitesPage(
+    #     url='http://forecast.io', page_set=self))
     # Why: crbug.com/169827
-    self.AddPage(KeyMobileSitesPage(
+    self.AddUserStory(KeyMobileSitesPage(
       url='http://slashdot.org/', page_set=self, labels=['fastpath']))
 
     # Why: #5 Alexa news """
 
-    self.AddPage(KeyMobileSitesPage(
+    self.AddUserStory(KeyMobileSitesPage(
       url='http://www.reddit.com/r/programming/comments/1g96ve',
       page_set=self, labels=['fastpath']))
 
     # Why: Problematic use of fixed position elements """
-    self.AddPage(KeyMobileSitesPage(
+    self.AddUserStory(KeyMobileSitesPage(
       url='http://www.boingboing.net', page_set=self, labels=['fastpath']))
 
     urls_list = [
@@ -441,4 +442,4 @@ class KeyMobileSitesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(KeyMobileSitesPage(url, self))
+      self.AddUserStory(KeyMobileSitesPage(url, self))
diff --git a/tools/perf/page_sets/key_search_mobile.py b/tools/perf/page_sets/key_search_mobile.py
index d40d772..a4ad75c 100644
--- a/tools/perf/page_sets/key_search_mobile.py
+++ b/tools/perf/page_sets/key_search_mobile.py
@@ -65,4 +65,4 @@ class KeySearchMobilePageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(KeySearchMobilePage(url, self))
+      self.AddUserStory(KeySearchMobilePage(url, self))
diff --git a/tools/perf/page_sets/key_silk_cases.py b/tools/perf/page_sets/key_silk_cases.py
index bc257a9..50c7f5b 100644
--- a/tools/perf/page_sets/key_silk_cases.py
+++ b/tools/perf/page_sets/key_silk_cases.py
@@ -658,35 +658,35 @@ class KeySilkCasesPageSet(page_set_module.PageSet):
       archive_data_file='data/key_silk_cases.json',
       bucket=page_set_module.PARTNER_BUCKET)
 
-    self.AddPage(Page1(self))
-    self.AddPage(Page2(self))
-    self.AddPage(Page3(self))
-    self.AddPage(Page4(self))
-    self.AddPage(Page5(self))
-    self.AddPage(Page6(self))
-    self.AddPage(Page7(self))
-    self.AddPage(Page8(self))
-    self.AddPage(Page9(self))
-    self.AddPage(Page10(self))
-    self.AddPage(Page11(self))
-    self.AddPage(Page12(self))
-    self.AddPage(Page13(self))
-    self.AddPage(Page14(self))
-    self.AddPage(Page15(self))
-    self.AddPage(Page16(self))
-    self.AddPage(Page17(self))
-    self.AddPage(Page18(self))
+    self.AddUserStory(Page1(self))
+    self.AddUserStory(Page2(self))
+    self.AddUserStory(Page3(self))
+    self.AddUserStory(Page4(self))
+    self.AddUserStory(Page5(self))
+    self.AddUserStory(Page6(self))
+    self.AddUserStory(Page7(self))
+    self.AddUserStory(Page8(self))
+    self.AddUserStory(Page9(self))
+    self.AddUserStory(Page10(self))
+    self.AddUserStory(Page11(self))
+    self.AddUserStory(Page12(self))
+    self.AddUserStory(Page13(self))
+    self.AddUserStory(Page14(self))
+    self.AddUserStory(Page15(self))
+    self.AddUserStory(Page16(self))
+    self.AddUserStory(Page17(self))
+    self.AddUserStory(Page18(self))
     # crbug.com/404317
-    # self.AddPage(Page19(self))
-    self.AddPage(Page20(self))
-    self.AddPage(GwsGoogleExpansion(self))
-    self.AddPage(GwsBoogieExpansion(self))
+    # self.AddUserStory(Page19(self))
+    self.AddUserStory(Page20(self))
+    self.AddUserStory(GwsGoogleExpansion(self))
+    self.AddUserStory(GwsBoogieExpansion(self))
     # Times out on Windows; crbug.com/338838
-    # self.AddPage(Page22(self))
-    self.AddPage(Page23(self))
-    self.AddPage(Page24(self))
-    self.AddPage(Page25(self))
-    self.AddPage(Page26(self))
-    self.AddPage(SVGIconRaster(self))
-    self.AddPage(UpdateHistoryState(self))
-    self.AddPage(SilkFinance(self))
+    # self.AddUserStory(Page22(self))
+    self.AddUserStory(Page23(self))
+    self.AddUserStory(Page24(self))
+    self.AddUserStory(Page25(self))
+    self.AddUserStory(Page26(self))
+    self.AddUserStory(SVGIconRaster(self))
+    self.AddUserStory(UpdateHistoryState(self))
+    self.AddUserStory(SilkFinance(self))
diff --git a/tools/perf/page_sets/maps.py b/tools/perf/page_sets/maps.py
index ff25070..4c56dad 100644
--- a/tools/perf/page_sets/maps.py
+++ b/tools/perf/page_sets/maps.py
@@ -40,4 +40,4 @@ class MapsPageSet(page_set_module.PageSet):
         archive_data_file='data/maps.json',
         bucket=page_set_module.PUBLIC_BUCKET)
 
-    self.AddPage(MapsPage(self))
+    self.AddUserStory(MapsPage(self))
diff --git a/tools/perf/page_sets/media_cns_cases.py b/tools/perf/page_sets/media_cns_cases.py
index 83f98db..1bd3912 100644
--- a/tools/perf/page_sets/media_cns_cases.py
+++ b/tools/perf/page_sets/media_cns_cases.py
@@ -93,7 +93,7 @@ class MediaCnsCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(BasicPlayPage(url, self))
+      self.AddUserStory(BasicPlayPage(url, self))
 
     urls_list2 = [
       # pylint: disable=C0301
@@ -113,4 +113,4 @@ class MediaCnsCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list2:
-      self.AddPage(SeekBeforeAndAfterPlayheadPage(url, self))
+      self.AddUserStory(SeekBeforeAndAfterPlayheadPage(url, self))
diff --git a/tools/perf/page_sets/mobile_memory.py b/tools/perf/page_sets/mobile_memory.py
index 222e108..cb84efc 100644
--- a/tools/perf/page_sets/mobile_memory.py
+++ b/tools/perf/page_sets/mobile_memory.py
@@ -92,8 +92,8 @@ class MobileMemoryPageSet(page_set_module.PageSet):
         archive_data_file='data/mobile_memory.json',
         bucket=page_set_module.PARTNER_BUCKET)
 
-    self.AddPage(GmailPage(self))
-    self.AddPage(GoogleSearchPage(self))
+    self.AddUserStory(GmailPage(self))
+    self.AddUserStory(GoogleSearchPage(self))
 
     urls_list = [
       # Why: Renderer process memory bloat
@@ -105,4 +105,4 @@ class MobileMemoryPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(ScrollPage(url, self))
+      self.AddUserStory(ScrollPage(url, self))
diff --git a/tools/perf/page_sets/mse_cases.py b/tools/perf/page_sets/mse_cases.py
index ecf5be0..3000a37 100644
--- a/tools/perf/page_sets/mse_cases.py
+++ b/tools/perf/page_sets/mse_cases.py
@@ -44,4 +44,4 @@ class MseCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(MseCasesPage(url, self))
+      self.AddUserStory(MseCasesPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/alexa_us.py b/tools/perf/page_sets/page_cycler/alexa_us.py
index cf09b6a..49baaee 100644
--- a/tools/perf/page_sets/page_cycler/alexa_us.py
+++ b/tools/perf/page_sets/page_cycler/alexa_us.py
@@ -45,4 +45,4 @@ class AlexaUsPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(AlexaUsPage(url, self))
+      self.AddUserStory(AlexaUsPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/bloat.py b/tools/perf/page_sets/page_cycler/bloat.py
index 7666a76..9118c8c 100644
--- a/tools/perf/page_sets/page_cycler/bloat.py
+++ b/tools/perf/page_sets/page_cycler/bloat.py
@@ -21,6 +21,6 @@ class BloatPageSet(page_set_module.PageSet):
       serving_dirs=set(['../../../../data/page_cycler/bloat']),
       bucket=page_set_module.PUBLIC_BUCKET)
 
-    self.AddPage(BloatPage(
+    self.AddUserStory(BloatPage(
       'file://../../../../data/page_cycler/bloat/gmail_load_cleardot/',
       self))
diff --git a/tools/perf/page_sets/page_cycler/dhtml.py b/tools/perf/page_sets/page_cycler/dhtml.py
index 2a6a655..c7347fa 100644
--- a/tools/perf/page_sets/page_cycler/dhtml.py
+++ b/tools/perf/page_sets/page_cycler/dhtml.py
@@ -42,4 +42,4 @@ class DhtmlPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(DhtmlPage(url, self))
+      self.AddUserStory(DhtmlPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/dom.py b/tools/perf/page_sets/page_cycler/dom.py
index db9dd57..52cdedf 100644
--- a/tools/perf/page_sets/page_cycler/dom.py
+++ b/tools/perf/page_sets/page_cycler/dom.py
@@ -33,4 +33,4 @@ class DomPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(DomPage(url, self))
+      self.AddUserStory(DomPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/intl1.py b/tools/perf/page_sets/page_cycler/intl1.py
index c90822e..2dd2244 100644
--- a/tools/perf/page_sets/page_cycler/intl1.py
+++ b/tools/perf/page_sets/page_cycler/intl1.py
@@ -79,4 +79,4 @@ class Intl1PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(Intl1Page(url, self))
+      self.AddUserStory(Intl1Page(url, self))
diff --git a/tools/perf/page_sets/page_cycler/intl2.py b/tools/perf/page_sets/page_cycler/intl2.py
index e930c09..d1cfd79 100644
--- a/tools/perf/page_sets/page_cycler/intl2.py
+++ b/tools/perf/page_sets/page_cycler/intl2.py
@@ -56,4 +56,4 @@ class Intl2PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(Intl2Page(url, self))
+      self.AddUserStory(Intl2Page(url, self))
diff --git a/tools/perf/page_sets/page_cycler/morejs.py b/tools/perf/page_sets/page_cycler/morejs.py
index b06dbf8..2fb4572 100644
--- a/tools/perf/page_sets/page_cycler/morejs.py
+++ b/tools/perf/page_sets/page_cycler/morejs.py
@@ -33,4 +33,4 @@ class MorejsPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(MorejsPage(url, self))
+      self.AddUserStory(MorejsPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/morejsnp.py b/tools/perf/page_sets/page_cycler/morejsnp.py
index 6ae31e6..d0b24a2 100644
--- a/tools/perf/page_sets/page_cycler/morejsnp.py
+++ b/tools/perf/page_sets/page_cycler/morejsnp.py
@@ -35,4 +35,4 @@ class MorejsnpPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(MorejsnpPage(url, self))
+      self.AddUserStory(MorejsnpPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/moz.py b/tools/perf/page_sets/page_cycler/moz.py
index 7ac43ff..c583421 100644
--- a/tools/perf/page_sets/page_cycler/moz.py
+++ b/tools/perf/page_sets/page_cycler/moz.py
@@ -65,4 +65,4 @@ class MozPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(MozPage(url, self))
+      self.AddUserStory(MozPage(url, self))
diff --git a/tools/perf/page_sets/page_cycler/moz2.py b/tools/perf/page_sets/page_cycler/moz2.py
index d2b1928..879c9f3 100644
--- a/tools/perf/page_sets/page_cycler/moz2.py
+++ b/tools/perf/page_sets/page_cycler/moz2.py
@@ -65,4 +65,4 @@ class Moz2PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(Moz2Page(url, self))
+      self.AddUserStory(Moz2Page(url, self))
diff --git a/tools/perf/page_sets/pica.py b/tools/perf/page_sets/pica.py
index ed19d38..fa1120e 100644
--- a/tools/perf/page_sets/pica.py
+++ b/tools/perf/page_sets/pica.py
@@ -23,4 +23,4 @@ class PicaPageSet(page_set_module.PageSet):
       archive_data_file='data/pica.json',
       bucket=page_set_module.INTERNAL_BUCKET)
 
-    self.AddPage(PicaPage(self))
+    self.AddUserStory(PicaPage(self))
diff --git a/tools/perf/page_sets/polymer.py b/tools/perf/page_sets/polymer.py
index 988f821..c7894bc 100644
--- a/tools/perf/page_sets/polymer.py
+++ b/tools/perf/page_sets/polymer.py
@@ -210,8 +210,8 @@ class PolymerPageSet(page_set_module.PageSet):
       archive_data_file='data/polymer.json',
       bucket=page_set_module.PUBLIC_BUCKET)
 
-    self.AddPage(PolymerCalculatorPage(self))
-    self.AddPage(PolymerShadowPage(self))
+    self.AddUserStory(PolymerCalculatorPage(self))
+    self.AddUserStory(PolymerShadowPage(self))
 
     # Polymer Sampler subpages that are interesting to tap / swipe elements on
     TAPPABLE_PAGES = [
@@ -228,11 +228,11 @@ class PolymerPageSet(page_set_module.PageSet):
         'paper-toggle-button',
         ]
     for p in TAPPABLE_PAGES:
-      self.AddPage(PolymerSampler(self, p))
+      self.AddUserStory(PolymerSampler(self, p))
 
     # Polymer Sampler subpages that are interesting to scroll
     SCROLLABLE_PAGES = [
         'core-scroll-header-panel',
         ]
     for p in SCROLLABLE_PAGES:
-      self.AddPage(PolymerSampler(self, p, scrolling_page=True))
+      self.AddUserStory(PolymerSampler(self, p, scrolling_page=True))
diff --git a/tools/perf/page_sets/service_worker.py b/tools/perf/page_sets/service_worker.py
index aabb62a..2ac1c6b 100644
--- a/tools/perf/page_sets/service_worker.py
+++ b/tools/perf/page_sets/service_worker.py
@@ -20,11 +20,11 @@ class ServiceWorkerPageSet(page_set.PageSet):
 
     # Why: the first application using ServiceWorker
     # 1st time: registration
-    self.AddPage(page.Page(
+    self.AddUserStory(page.Page(
         'https://jakearchibald.github.io/trained-to-thrill/', self))
     # 2st time: 1st onfetch with caching
-    self.AddPage(page.Page(
+    self.AddUserStory(page.Page(
         'https://jakearchibald.github.io/trained-to-thrill/', self))
     # 3rd time: 2nd onfetch from cache
-    self.AddPage(page.Page(
+    self.AddUserStory(page.Page(
         'https://jakearchibald.github.io/trained-to-thrill/', self))
diff --git a/tools/perf/page_sets/service_worker_micro_benchmark.py b/tools/perf/page_sets/service_worker_micro_benchmark.py
index bf89505..6523aad 100644
--- a/tools/perf/page_sets/service_worker_micro_benchmark.py
+++ b/tools/perf/page_sets/service_worker_micro_benchmark.py
@@ -35,5 +35,5 @@ class ServiceWorkerMicroBenchmarkPageSet(page_set.PageSet):
     # This will be merged into the main repository.
     # pylint: enable=C0301
     # Why: to measure performance of many concurrent fetches
-    self.AddPage(ServiceWorkerBenchmarkPage(
+    self.AddUserStory(ServiceWorkerBenchmarkPage(
         'http://localhost:8091/index.html', self))
diff --git a/tools/perf/page_sets/simple_mobile_sites.py b/tools/perf/page_sets/simple_mobile_sites.py
index 093766d..250f557 100644
--- a/tools/perf/page_sets/simple_mobile_sites.py
+++ b/tools/perf/page_sets/simple_mobile_sites.py
@@ -51,5 +51,5 @@ class SimpleMobileSitesPageSet(page_set_module.PageSet):
     ]
 
     for url in scroll_page_list:
-      self.AddPage(SimpleScrollPage(url, self))
+      self.AddUserStory(SimpleScrollPage(url, self))
 
diff --git a/tools/perf/page_sets/startup_pages.py b/tools/perf/page_sets/startup_pages.py
index 0fbfacb..13e5f27 100644
--- a/tools/perf/page_sets/startup_pages.py
+++ b/tools/perf/page_sets/startup_pages.py
@@ -29,8 +29,9 @@ class StartupPagesPageSet(page_set_module.PageSet):
         bucket=page_set_module.PARTNER_BUCKET)
 
     # Typical page.
-    self.AddPage(StartedPage('about:blank', 'about:blank', self))
+    self.AddUserStory(StartedPage('about:blank', 'about:blank', self))
     # Typical page.
-    self.AddPage(StartedPage('http://bbc.co.uk', 'http://bbc.co.uk', self))
+    self.AddUserStory(StartedPage('http://bbc.co.uk', 'http://bbc.co.uk', self))
     # Horribly complex page - stress test!
-    self.AddPage(StartedPage('http://kapook.com', 'http://kapook.com', self))
+    self.AddUserStory(StartedPage(
+        'http://kapook.com', 'http://kapook.com', self))
diff --git a/tools/perf/page_sets/startup_pages_record.py b/tools/perf/page_sets/startup_pages_record.py
index 2a5e3b1..768e9c8 100644
--- a/tools/perf/page_sets/startup_pages_record.py
+++ b/tools/perf/page_sets/startup_pages_record.py
@@ -33,4 +33,4 @@ class StartupPagesRecordPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(StartupPagesRecordPage(url, self))
+      self.AddUserStory(StartupPagesRecordPage(url, self))
diff --git a/tools/perf/page_sets/top_10.py b/tools/perf/page_sets/top_10.py
index 4297b19..0f0db80 100644
--- a/tools/perf/page_sets/top_10.py
+++ b/tools/perf/page_sets/top_10.py
@@ -96,33 +96,33 @@ class Top10PageSet(page_set_module.PageSet):
       bucket=page_set_module.PARTNER_BUCKET)
 
     # top google property; a google tab is often open
-    self.AddPage(Google(self))
+    self.AddUserStory(Google(self))
 
     # productivity, top google properties
     # TODO(dominikg): fix crbug.com/386152
-    #self.AddPage(Gmail(self))
+    #self.AddUserStory(Gmail(self))
 
     # productivity, top google properties
-    self.AddPage(GoogleCalendar(self))
+    self.AddUserStory(GoogleCalendar(self))
 
     # #3 (Alexa global)
-    self.AddPage(Youtube(self))
+    self.AddUserStory(Youtube(self))
 
     # top social, Public profile
-    self.AddPage(Facebook(self))
+    self.AddUserStory(Facebook(self))
 
     # #6 (Alexa) most visited worldwide,Picked an interesting page
-    self.AddPage(SimpleScrollPage('http://en.wikipedia.org/wiki/Wikipedia',
+    self.AddUserStory(SimpleScrollPage('http://en.wikipedia.org/wiki/Wikipedia',
                                   self, name='Wikipedia'))
 
     # #1 world commerce website by visits; #3 commerce in the US by time spent
-    self.AddPage(SimpleScrollPage('http://www.amazon.com', self))
+    self.AddUserStory(SimpleScrollPage('http://www.amazon.com', self))
 
     # #4 Alexa
-    self.AddPage(SimpleScrollPage('http://www.yahoo.com/', self))
+    self.AddUserStory(SimpleScrollPage('http://www.yahoo.com/', self))
 
     # #16 Alexa
-    self.AddPage(SimpleScrollPage('http://www.bing.com/', self))
+    self.AddUserStory(SimpleScrollPage('http://www.bing.com/', self))
 
     # #20 Alexa
-    self.AddPage(SimpleScrollPage('http://www.ask.com/', self))
+    self.AddUserStory(SimpleScrollPage('http://www.ask.com/', self))
diff --git a/tools/perf/page_sets/top_10_mobile.py b/tools/perf/page_sets/top_10_mobile.py
index 4301924..febd560 100644
--- a/tools/perf/page_sets/top_10_mobile.py
+++ b/tools/perf/page_sets/top_10_mobile.py
@@ -63,4 +63,4 @@ class Top10MobilePageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(Top10MobilePage(url, self))
+      self.AddUserStory(Top10MobilePage(url, self))
diff --git a/tools/perf/page_sets/top_25_repaint.py b/tools/perf/page_sets/top_25_repaint.py
index 66a08eb..e3a39e0 100644
--- a/tools/perf/page_sets/top_25_repaint.py
+++ b/tools/perf/page_sets/top_25_repaint.py
@@ -60,7 +60,7 @@ class Top25RepaintPageSet(page_set_module.PageSet):
     ]
 
     for cl in top_page_classes:
-      self.AddPage(_CreatePageClassWithRepaintInteractions(cl)(self))
+      self.AddUserStory(_CreatePageClassWithRepaintInteractions(cl)(self))
 
     other_urls = [
         # Why: #1 news worldwide (Alexa global)
@@ -83,4 +83,4 @@ class Top25RepaintPageSet(page_set_module.PageSet):
     ]
 
     for url in other_urls:
-      self.AddPage(TopRepaintPage(url, self))
+      self.AddUserStory(TopRepaintPage(url, self))
diff --git a/tools/perf/page_sets/top_25_smooth.py b/tools/perf/page_sets/top_25_smooth.py
index 7fc5aad..4d56a37 100644
--- a/tools/perf/page_sets/top_25_smooth.py
+++ b/tools/perf/page_sets/top_25_smooth.py
@@ -96,35 +96,35 @@ class Top25SmoothPageSet(page_set_module.PageSet):
         archive_data_file='data/top_25.json',
         bucket=page_set_module.PARTNER_BUCKET)
 
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.GoogleWebSearchPage)(self))
-    self.AddPage(GmailSmoothPage(self))
-    self.AddPage(GoogleCalendarSmoothPage(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(GmailSmoothPage(self))
+    self.AddUserStory(GoogleCalendarSmoothPage(self))
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.GoogleImageSearchPage)(self))
-    self.AddPage(GoogleDocSmoothPage(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(GoogleDocSmoothPage(self))
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.GooglePlusPage)(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.YoutubePage)(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.BlogspotPage)(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.WordpressPage)(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.FacebookPage)(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.LinkedinPage)(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.WikipediaPage)(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.TwitterPage)(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.PinterestPage)(self))
-    self.AddPage(ESPNSmoothPage(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(ESPNSmoothPage(self))
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.WeatherPage)(self))
-    self.AddPage(_CreatePageClassWithSmoothInteractions(
+    self.AddUserStory(_CreatePageClassWithSmoothInteractions(
         top_pages.YahooGamesPage)(self))
 
     other_urls = [
@@ -148,4 +148,4 @@ class Top25SmoothPageSet(page_set_module.PageSet):
     ]
 
     for url in other_urls:
-      self.AddPage(TopSmoothPage(url, self))
+      self.AddUserStory(TopSmoothPage(url, self))
diff --git a/tools/perf/page_sets/top_7_stress.py b/tools/perf/page_sets/top_7_stress.py
index ae18deb..32ad29f 100644
--- a/tools/perf/page_sets/top_7_stress.py
+++ b/tools/perf/page_sets/top_7_stress.py
@@ -333,10 +333,10 @@ class Top7StressPageSet(page_set_module.PageSet):
       archive_data_file='data/top_25.json',
       bucket=page_set_module.PARTNER_BUCKET)
 
-    self.AddPage(GoogleWebSearchPage(self))
-    self.AddPage(GmailPage(self))
-    self.AddPage(GoogleCalendarPage(self))
-    self.AddPage(GooglePlusPage(self))
-    self.AddPage(BlogspotPage(self))
-    self.AddPage(WordpressPage(self))
-    self.AddPage(FacebookPage(self))
+    self.AddUserStory(GoogleWebSearchPage(self))
+    self.AddUserStory(GmailPage(self))
+    self.AddUserStory(GoogleCalendarPage(self))
+    self.AddUserStory(GooglePlusPage(self))
+    self.AddUserStory(BlogspotPage(self))
+    self.AddUserStory(WordpressPage(self))
+    self.AddUserStory(FacebookPage(self))
diff --git a/tools/perf/page_sets/top_desktop_sites_2012Q3.py b/tools/perf/page_sets/top_desktop_sites_2012Q3.py
index 3d080e7..5d26058 100644
--- a/tools/perf/page_sets/top_desktop_sites_2012Q3.py
+++ b/tools/perf/page_sets/top_desktop_sites_2012Q3.py
@@ -273,4 +273,4 @@ class Top2012Q3PageSet(page_set.PageSet):
 
 
     for url in TOP_2013_URLS:
-      self.AddPage(Top2012Q3Page(url, self))
+      self.AddUserStory(Top2012Q3Page(url, self))
diff --git a/tools/perf/page_sets/top_desktop_sites_2012Q3_stress.py b/tools/perf/page_sets/top_desktop_sites_2012Q3_stress.py
index c9bc096..bc1d9ce3 100644
--- a/tools/perf/page_sets/top_desktop_sites_2012Q3_stress.py
+++ b/tools/perf/page_sets/top_desktop_sites_2012Q3_stress.py
@@ -33,4 +33,4 @@ class Top2012Q3StressPageSet(page_set.PageSet):
       bucket=page_set.PARTNER_BUCKET)
 
     for url in top_desktop_sites_2012Q3.TOP_2013_URLS:
-      self.AddPage(Top2012Q3StressPage(url, self))
+      self.AddUserStory(Top2012Q3StressPage(url, self))
diff --git a/tools/perf/page_sets/topeka.py b/tools/perf/page_sets/topeka.py
index 126593b..1e5f334 100644
--- a/tools/perf/page_sets/topeka.py
+++ b/tools/perf/page_sets/topeka.py
@@ -25,4 +25,4 @@ class TopekaPageSet(page_set_module.PageSet):
       archive_data_file='data/topeka.json',
       bucket=page_set_module.INTERNAL_BUCKET)
 
-    self.AddPage(TopekaPage(self))
+    self.AddUserStory(TopekaPage(self))
diff --git a/tools/perf/page_sets/tough_animation_cases.py b/tools/perf/page_sets/tough_animation_cases.py
index b848909..8f1cb63 100644
--- a/tools/perf/page_sets/tough_animation_cases.py
+++ b/tools/perf/page_sets/tough_animation_cases.py
@@ -184,7 +184,7 @@ class ToughAnimationCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list_one:
-      self.AddPage(ToughAnimationCasesPage(url, self,
+      self.AddUserStory(ToughAnimationCasesPage(url, self,
                                            need_measurement_ready=True))
 
     urls_list_two = [
@@ -201,5 +201,5 @@ class ToughAnimationCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list_two:
-      self.AddPage(ToughAnimationCasesPage(url, self,
+      self.AddUserStory(ToughAnimationCasesPage(url, self,
                                            need_measurement_ready=False))
diff --git a/tools/perf/page_sets/tough_canvas_cases.py b/tools/perf/page_sets/tough_canvas_cases.py
index f4be457..adff9a7 100644
--- a/tools/perf/page_sets/tough_canvas_cases.py
+++ b/tools/perf/page_sets/tough_canvas_cases.py
@@ -41,7 +41,7 @@ class ToughCanvasCasesPageSet(page_set_module.PageSet):
       bucket=page_set_module.PARTNER_BUCKET)
 
     # Crashes on Galaxy Nexus. crbug.com/314131
-    # self.AddPage(MicrosofFirefliesPage(self))
+    # self.AddUserStory(MicrosofFirefliesPage(self))
 
     # Failing on Nexus 5 (http://crbug.com/364248):
     # 'http://geoapis.appspot.com/agdnZW9hcGlzchMLEgtFeGFtcGxlQ29kZRjh1wIM',
@@ -84,4 +84,4 @@ class ToughCanvasCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(ToughCanvasCasesPage(url, self))
+      self.AddUserStory(ToughCanvasCasesPage(url, self))
diff --git a/tools/perf/page_sets/tough_compositor_cases.py b/tools/perf/page_sets/tough_compositor_cases.py
index 6980813..62984d0 100644
--- a/tools/perf/page_sets/tough_compositor_cases.py
+++ b/tools/perf/page_sets/tough_compositor_cases.py
@@ -73,7 +73,7 @@ class ToughCompositorCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in scroll_urls_list:
-      self.AddPage(ToughCompositorScrollPage(url, self))
+      self.AddUserStory(ToughCompositorScrollPage(url, self))
 
     for url in wait_urls_list:
-      self.AddPage(ToughCompositorWaitPage(url, self))
+      self.AddUserStory(ToughCompositorWaitPage(url, self))
diff --git a/tools/perf/page_sets/tough_dom_memory_cases.py b/tools/perf/page_sets/tough_dom_memory_cases.py
index c9af6ff..c697d97 100644
--- a/tools/perf/page_sets/tough_dom_memory_cases.py
+++ b/tools/perf/page_sets/tough_dom_memory_cases.py
@@ -46,4 +46,4 @@ class ToughDomMemoryCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(ToughDomMemoryCasesPage(url, self))
+      self.AddUserStory(ToughDomMemoryCasesPage(url, self))
diff --git a/tools/perf/page_sets/tough_energy_cases.py b/tools/perf/page_sets/tough_energy_cases.py
index 8afcbd7..c17c031 100644
--- a/tools/perf/page_sets/tough_energy_cases.py
+++ b/tools/perf/page_sets/tough_energy_cases.py
@@ -42,85 +42,85 @@ class ToughEnergyCasesPageSet(page_set_module.PageSet):
         bucket=page_set_module.PARTNER_BUCKET)
 
     # Why: productivity, top google properties
-    self.AddPage(GooglePage('https://mail.google.com/mail/', self))
+    self.AddUserStory(GooglePage('https://mail.google.com/mail/', self))
 
     # Disabled: pegs CPU too much to get meaningful results.
     # Why: Image constantly changed in the background, above the fold
-    # self.AddPage(CodePenPage(
+    # self.AddUserStory(CodePenPage(
     #     'http://codepen.io/testificate364/debug/eIutG', self))
 
     # Disabled: pegs CPU too much to get meaningful results.
     # Why: Image constantly changed in the background, below the fold
-    # self.AddPage(CodePenPage(
+    # self.AddUserStory(CodePenPage(
     #     'http://codepen.io/testificate364/debug/zcDdv', self))
 
     # Why: CSS Animation, above the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
          'http://codepen.io/testificate364/debug/nrbDc', self))
 
     # Why: CSS Animation, below the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/fhKCg', self))
 
     # Why: requestAnimationFrame, above the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/paJhg',self))
 
     # Why: requestAnimationFrame, below the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/yaosK', self))
 
     # Why: setTimeout animation, above the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/DLbxg', self))
 
     # Why: setTimeout animation, below the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/kFvpd', self))
 
     # Why: setInterval animation, above the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/lEhyw', self))
 
     # Why: setInterval animation, below the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/zhgBD', self))
 
     # Why: Animated GIF, above the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/jetyn', self))
 
     # Why: Animated GIF, below the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/Kvdxs', self))
 
     # Why: HTML5 video, above the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/lJAiH', self))
 
     # Why: HTML5 video, below the fold
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/EFceH', self))
 
     # Disabled: pegs CPU too much to get meaningful results.
     # Why: PostMessage between frames, above the fold
-    # self.AddPage(CodePenPage(
+    # self.AddUserStory(CodePenPage(
     #    'http://codepen.io/testificate364/debug/pgBHu', self))
 
     # Disabled: pegs CPU too much to get meaningful results.
     # Why: Asynchronous XHR continually running
-    # self.AddPage(CodePenPage(
+    # self.AddUserStory(CodePenPage(
     # 'http://codepen.io/testificate364/debug/iwAfJ', self))
 
     # Disabled: pegs CPU too much to get meaningful results.
     # Why: Web Worker continually running
-    # self.AddPage(CodePenPage(
+    # self.AddUserStory(CodePenPage(
     #     'http://codepen.io/testificate364/debug/ckItK', self))
 
     # Why: flash video
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/slBue', self))
 
     # Why: Blank page in the foreground
-    self.AddPage(CodePenPage(
+    self.AddUserStory(CodePenPage(
         'http://codepen.io/testificate364/debug/HdIgr', self))
diff --git a/tools/perf/page_sets/tough_filters_cases.py b/tools/perf/page_sets/tough_filters_cases.py
index d3f6fe8..52e10fe 100644
--- a/tools/perf/page_sets/tough_filters_cases.py
+++ b/tools/perf/page_sets/tough_filters_cases.py
@@ -35,7 +35,7 @@ class ToughFiltersCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(ToughFiltersCasesPage(url, self))
+      self.AddUserStory(ToughFiltersCasesPage(url, self))
 
-    self.AddPage(PirateMarkPage(
+    self.AddUserStory(PirateMarkPage(
         'http://ie.microsoft.com/testdrive/Performance/Pirates/', self))
diff --git a/tools/perf/page_sets/tough_image_cases.py b/tools/perf/page_sets/tough_image_cases.py
index 3acdb32..3489648 100644
--- a/tools/perf/page_sets/tough_image_cases.py
+++ b/tools/perf/page_sets/tough_image_cases.py
@@ -28,4 +28,4 @@ class ToughImageCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(ToughImageCasesPage(url, self))
+      self.AddUserStory(ToughImageCasesPage(url, self))
diff --git a/tools/perf/page_sets/tough_layer_cases.py b/tools/perf/page_sets/tough_layer_cases.py
index 5aedde9..1996fd3 100644
--- a/tools/perf/page_sets/tough_layer_cases.py
+++ b/tools/perf/page_sets/tough_layer_cases.py
@@ -18,5 +18,5 @@ class ToughLayerCasesPageSet(page_set_module.PageSet):
   def __init__(self):
     super(ToughLayerCasesPageSet, self).__init__()
 
-    self.AddPage(ToughLayerCasesPage(
+    self.AddUserStory(ToughLayerCasesPage(
       'file://layer_stress_tests/opacity.html', self))
diff --git a/tools/perf/page_sets/tough_layout_cases.py b/tools/perf/page_sets/tough_layout_cases.py
index 27bb6fa..6e72ae8 100644
--- a/tools/perf/page_sets/tough_layout_cases.py
+++ b/tools/perf/page_sets/tough_layout_cases.py
@@ -46,4 +46,4 @@ class ToughLayoutCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(ToughLayoutCasesPage(url, self))
+      self.AddUserStory(ToughLayoutCasesPage(url, self))
diff --git a/tools/perf/page_sets/tough_memory_multi_tab.py b/tools/perf/page_sets/tough_memory_multi_tab.py
index d3a6c83..f6e6e30 100644
--- a/tools/perf/page_sets/tough_memory_multi_tab.py
+++ b/tools/perf/page_sets/tough_memory_multi_tab.py
@@ -30,4 +30,4 @@ class ToughMemoryMultiTabPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(ToughMemoryMultiTabPage(url, self))
+      self.AddUserStory(ToughMemoryMultiTabPage(url, self))
diff --git a/tools/perf/page_sets/tough_pinch_zoom_cases.py b/tools/perf/page_sets/tough_pinch_zoom_cases.py
index a11f4a4..a3ff30e 100644
--- a/tools/perf/page_sets/tough_pinch_zoom_cases.py
+++ b/tools/perf/page_sets/tough_pinch_zoom_cases.py
@@ -250,40 +250,40 @@ class ToughPinchZoomCasesPageSet(page_set_module.PageSet):
       archive_data_file='data/tough_pinch_zoom_cases.json',
       bucket=page_set_module.PARTNER_BUCKET)
 
-    self.AddPage(GoogleSearchPage(self))
-    self.AddPage(GmailPage(self))
-    self.AddPage(GoogleCalendarPage(self))
-    self.AddPage(GoogleImageSearchPage(self))
-    self.AddPage(GooglePlusPage(self))
-    self.AddPage(YoutubePage(self))
-    self.AddPage(BlogSpotPage(self))
-    self.AddPage(FacebookPage(self))
-    self.AddPage(LinkedinPage(self))
-    self.AddPage(WikipediaPage(self))
-    self.AddPage(TwitterPage(self))
-    self.AddPage(ESPNPage(self))
+    self.AddUserStory(GoogleSearchPage(self))
+    self.AddUserStory(GmailPage(self))
+    self.AddUserStory(GoogleCalendarPage(self))
+    self.AddUserStory(GoogleImageSearchPage(self))
+    self.AddUserStory(GooglePlusPage(self))
+    self.AddUserStory(YoutubePage(self))
+    self.AddUserStory(BlogSpotPage(self))
+    self.AddUserStory(FacebookPage(self))
+    self.AddUserStory(LinkedinPage(self))
+    self.AddUserStory(WikipediaPage(self))
+    self.AddUserStory(TwitterPage(self))
+    self.AddUserStory(ESPNPage(self))
 
     # Why: #1 news worldwide (Alexa global)
-    self.AddPage(ToughPinchZoomCasesPage('http://news.yahoo.com', self))
+    self.AddUserStory(ToughPinchZoomCasesPage('http://news.yahoo.com', self))
 
     # Why: #2 news worldwide
-    self.AddPage(ToughPinchZoomCasesPage('http://www.cnn.com', self))
+    self.AddUserStory(ToughPinchZoomCasesPage('http://www.cnn.com', self))
 
-    self.AddPage(WeatherDotComPage(self))
+    self.AddUserStory(WeatherDotComPage(self))
 
     # Why: #1 world commerce website by visits; #3 commerce in the US by time
     # spent
-    self.AddPage(ToughPinchZoomCasesPage('http://www.amazon.com', self))
+    self.AddUserStory(ToughPinchZoomCasesPage('http://www.amazon.com', self))
 
     # Why: #1 commerce website by time spent by users in US
-    self.AddPage(ToughPinchZoomCasesPage('http://www.ebay.com', self))
+    self.AddUserStory(ToughPinchZoomCasesPage('http://www.ebay.com', self))
 
-    self.AddPage(YahooGamePage(self))
+    self.AddUserStory(YahooGamePage(self))
 
     # Why: #1 Alexa recreation
-    self.AddPage(ToughPinchZoomCasesPage('http://booking.com', self))
+    self.AddUserStory(ToughPinchZoomCasesPage('http://booking.com', self))
 
-    self.AddPage(YahooAnswersPage(self))
+    self.AddUserStory(YahooAnswersPage(self))
 
     # Why: #1 Alexa sports
-    self.AddPage(ToughPinchZoomCasesPage('http://sports.yahoo.com/', self))
+    self.AddUserStory(ToughPinchZoomCasesPage('http://sports.yahoo.com/', self))
diff --git a/tools/perf/page_sets/tough_scheduling_cases.py b/tools/perf/page_sets/tough_scheduling_cases.py
index 4f83caf..d248a2e 100644
--- a/tools/perf/page_sets/tough_scheduling_cases.py
+++ b/tools/perf/page_sets/tough_scheduling_cases.py
@@ -381,69 +381,69 @@ class ToughSchedulingCasesPageSet(page_set_module.PageSet):
         bucket=page_set_module.INTERNAL_BUCKET)
 
     # Why: Simple scrolling baseline
-    self.AddPage(ToughSchedulingCasesPage(
+    self.AddUserStory(ToughSchedulingCasesPage(
       'file://tough_scheduling_cases/simple_text_page.html',
       self))
-    self.AddPage(Page1(self))
-    self.AddPage(Page2(self))
-    self.AddPage(Page3(self))
-    self.AddPage(Page4(self))
+    self.AddUserStory(Page1(self))
+    self.AddUserStory(Page2(self))
+    self.AddUserStory(Page3(self))
+    self.AddUserStory(Page4(self))
     # Disabled until crbug.com/413829 is fixed.
-    # self.AddPage(Page5(self))
+    # self.AddUserStory(Page5(self))
     # Disabled because of crbug.com/413829 and flakiness crbug.com/368532
-    # self.AddPage(Page6(self))
+    # self.AddUserStory(Page6(self))
     # Why: Touch handler scrolling baseline
-    self.AddPage(ToughSchedulingCasesPage(
+    self.AddUserStory(ToughSchedulingCasesPage(
       'file://tough_scheduling_cases/touch_handler_scrolling.html',
       self))
-    self.AddPage(Page7(self))
-    self.AddPage(Page8(self))
-    self.AddPage(Page9(self))
-    self.AddPage(Page10(self))
-    self.AddPage(Page11(self))
-    self.AddPage(Page12(self))
+    self.AddUserStory(Page7(self))
+    self.AddUserStory(Page8(self))
+    self.AddUserStory(Page9(self))
+    self.AddUserStory(Page10(self))
+    self.AddUserStory(Page11(self))
+    self.AddUserStory(Page12(self))
     # Why: requestAnimationFrame scrolling baseline
-    self.AddPage(ToughSchedulingCasesPage(
+    self.AddUserStory(ToughSchedulingCasesPage(
       'file://tough_scheduling_cases/raf.html',
       self))
     # Why: Test canvas blocking behavior
-    self.AddPage(ToughSchedulingCasesPage(
+    self.AddUserStory(ToughSchedulingCasesPage(
       'file://tough_scheduling_cases/raf_canvas.html',
       self))
     # Disabled until crbug.com/413829 is fixed.
-    # self.AddPage(Page13(self))
+    # self.AddUserStory(Page13(self))
     # Disabled because of crbug.com/413829 and flakiness crbug.com/368532
-    # self.AddPage(Page14(self))
-    self.AddPage(Page15(self))
-    self.AddPage(Page16(self))
+    # self.AddUserStory(Page14(self))
+    self.AddUserStory(Page15(self))
+    self.AddUserStory(Page16(self))
     # Why: Test a requestAnimationFrame handler with concurrent CSS animation
-    self.AddPage(ToughSchedulingCasesPage(
+    self.AddUserStory(ToughSchedulingCasesPage(
       'file://tough_scheduling_cases/raf_animation.html',
       self))
     # Why: Stress test for the scheduler
-    self.AddPage(ToughSchedulingCasesPage(
+    self.AddUserStory(ToughSchedulingCasesPage(
       'file://tough_scheduling_cases/raf_touch_animation.html',
       self))
-    self.AddPage(Page17(self))
-    self.AddPage(Page18(self))
-    self.AddPage(Page19(self))
-    self.AddPage(Page20(self))
+    self.AddUserStory(Page17(self))
+    self.AddUserStory(Page18(self))
+    self.AddUserStory(Page19(self))
+    self.AddUserStory(Page20(self))
     # Why: Baseline for scrolling in the presence of a no-op touch handler
-    self.AddPage(EmptyTouchHandlerPage(
+    self.AddUserStory(EmptyTouchHandlerPage(
       name='baseline',
       desktop=False,
       slow_handler=False,
       bounce=False,
       page_set=self))
     # Why: Slow handler blocks scroll start
-    self.AddPage(EmptyTouchHandlerPage(
+    self.AddUserStory(EmptyTouchHandlerPage(
       name='slow_handler',
       desktop=False,
       slow_handler=True,
       bounce=False,
       page_set=self))
     # Why: Slow handler blocks scroll start until touch ACK timeout
-    self.AddPage(EmptyTouchHandlerPage(
+    self.AddUserStory(EmptyTouchHandlerPage(
       name='desktop_slow_handler',
       desktop=True,
       slow_handler=True,
@@ -452,14 +452,14 @@ class ToughSchedulingCasesPageSet(page_set_module.PageSet):
     # Why: Scroll bounce showing repeated transitions between scrolling and
     # sending synchronous touchmove events.  Should be nearly as fast as
     # scroll baseline.
-    self.AddPage(EmptyTouchHandlerPage(
+    self.AddUserStory(EmptyTouchHandlerPage(
       name='bounce',
       desktop=False,
       slow_handler=False,
       bounce=True,
       page_set=self))
     # Why: Scroll bounce with slow handler, repeated blocking.
-    self.AddPage(EmptyTouchHandlerPage(
+    self.AddUserStory(EmptyTouchHandlerPage(
       name='bounce_slow_handler',
       desktop=False,
       slow_handler=True,
@@ -467,18 +467,18 @@ class ToughSchedulingCasesPageSet(page_set_module.PageSet):
       page_set=self))
     # Why: Scroll bounce with slow handler on desktop, blocks only once until
     # ACK timeout.
-    self.AddPage(EmptyTouchHandlerPage(
+    self.AddUserStory(EmptyTouchHandlerPage(
       name='bounce_desktop_slow_handler',
       desktop=True,
       slow_handler=True,
       bounce=True,
       page_set=self))
     # Why: For measuring the latency of scroll-synchronized effects.
-    self.AddPage(SynchronizedScrollOffsetPage(page_set=self))
+    self.AddUserStory(SynchronizedScrollOffsetPage(page_set=self))
     # Why: Good examples of poor initial scrolling
-    self.AddPage(ToughSchedulingCasesPage(
+    self.AddUserStory(ToughSchedulingCasesPage(
       'http://www.latimes.com',
       self))
-    self.AddPage(ToughSchedulingCasesPage(
+    self.AddUserStory(ToughSchedulingCasesPage(
       'http://m.espn.go.com/nhl/rankings',
        self))
diff --git a/tools/perf/page_sets/tough_scrolling_cases.py b/tools/perf/page_sets/tough_scrolling_cases.py
index 954864a..07fa98f 100644
--- a/tools/perf/page_sets/tough_scrolling_cases.py
+++ b/tools/perf/page_sets/tough_scrolling_cases.py
@@ -56,7 +56,7 @@ class ToughScrollingCasesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(ToughScrollingCasesPage(url, self))
+      self.AddUserStory(ToughScrollingCasesPage(url, self))
 
     fast_scrolling_page_name_list = [
       'text',
@@ -69,7 +69,7 @@ class ToughScrollingCasesPageSet(page_set_module.PageSet):
 
     for name in fast_scrolling_page_name_list:
       for speed in fast_scrolling_speed_list:
-        self.AddPage(ToughFastScrollingCasesPage(
+        self.AddUserStory(ToughFastScrollingCasesPage(
           'file://tough_scrolling_cases/' + name + '.html',
           name + '_' + str(speed).zfill(5) + '_pixels_per_second',
           speed,
diff --git a/tools/perf/page_sets/tough_texture_upload_cases.py b/tools/perf/page_sets/tough_texture_upload_cases.py
index 38d1104..fe6cccd 100644
--- a/tools/perf/page_sets/tough_texture_upload_cases.py
+++ b/tools/perf/page_sets/tough_texture_upload_cases.py
@@ -39,5 +39,5 @@ class ToughTextureUploadCasesPageSet(page_set_module.PageSet):
       # pylint: disable=C0301
       'file://tough_texture_upload_cases/background_color_animation_with_gradient_and_transform_animation.html']
     for url in urls_list:
-      self.AddPage(ToughTextureUploadCasesPage(url, self))
+      self.AddUserStory(ToughTextureUploadCasesPage(url, self))
 
diff --git a/tools/perf/page_sets/tough_video_cases.py b/tools/perf/page_sets/tough_video_cases.py
index 094ebb0..2fc4ef5 100644
--- a/tools/perf/page_sets/tough_video_cases.py
+++ b/tools/perf/page_sets/tough_video_cases.py
@@ -494,38 +494,38 @@ class ToughVideoCasesPageSet(page_set_module.PageSet):
     super(ToughVideoCasesPageSet, self).__init__(
             bucket=page_set_module.INTERNAL_BUCKET)
 
-    self.AddPage(Page1(self))
-    self.AddPage(Page2(self))
-    self.AddPage(Page3(self))
-    self.AddPage(Page4(self))
-    self.AddPage(Page5(self))
-    self.AddPage(Page6(self))
-    self.AddPage(Page7(self))
-    self.AddPage(Page8(self))
-    self.AddPage(Page9(self))
-    self.AddPage(Page10(self))
-    self.AddPage(Page11(self))
-    self.AddPage(Page12(self))
-    self.AddPage(Page13(self))
-    self.AddPage(Page14(self))
-    self.AddPage(Page15(self))
-    self.AddPage(Page16(self))
-    self.AddPage(Page17(self))
-    self.AddPage(Page18(self))
-    self.AddPage(Page19(self))
-    self.AddPage(Page20(self))
-    self.AddPage(Page21(self))
-    self.AddPage(Page22(self))
-    self.AddPage(Page23(self))
-    self.AddPage(Page24(self))
-    self.AddPage(Page25(self))
-    self.AddPage(Page26(self))
-    self.AddPage(Page27(self))
-    self.AddPage(Page28(self))
-    self.AddPage(Page29(self))
-    self.AddPage(Page30(self))
-    self.AddPage(Page31(self))
-    self.AddPage(Page32(self))
-    self.AddPage(Page33(self))
-    self.AddPage(Page34(self))
-    self.AddPage(Page35(self))
+    self.AddUserStory(Page1(self))
+    self.AddUserStory(Page2(self))
+    self.AddUserStory(Page3(self))
+    self.AddUserStory(Page4(self))
+    self.AddUserStory(Page5(self))
+    self.AddUserStory(Page6(self))
+    self.AddUserStory(Page7(self))
+    self.AddUserStory(Page8(self))
+    self.AddUserStory(Page9(self))
+    self.AddUserStory(Page10(self))
+    self.AddUserStory(Page11(self))
+    self.AddUserStory(Page12(self))
+    self.AddUserStory(Page13(self))
+    self.AddUserStory(Page14(self))
+    self.AddUserStory(Page15(self))
+    self.AddUserStory(Page16(self))
+    self.AddUserStory(Page17(self))
+    self.AddUserStory(Page18(self))
+    self.AddUserStory(Page19(self))
+    self.AddUserStory(Page20(self))
+    self.AddUserStory(Page21(self))
+    self.AddUserStory(Page22(self))
+    self.AddUserStory(Page23(self))
+    self.AddUserStory(Page24(self))
+    self.AddUserStory(Page25(self))
+    self.AddUserStory(Page26(self))
+    self.AddUserStory(Page27(self))
+    self.AddUserStory(Page28(self))
+    self.AddUserStory(Page29(self))
+    self.AddUserStory(Page30(self))
+    self.AddUserStory(Page31(self))
+    self.AddUserStory(Page32(self))
+    self.AddUserStory(Page33(self))
+    self.AddUserStory(Page34(self))
+    self.AddUserStory(Page35(self))
diff --git a/tools/perf/page_sets/tough_webgl_cases.py b/tools/perf/page_sets/tough_webgl_cases.py
index 5cf6738..f26fd8e 100644
--- a/tools/perf/page_sets/tough_webgl_cases.py
+++ b/tools/perf/page_sets/tough_webgl_cases.py
@@ -56,4 +56,4 @@ class ToughWebglCasesPageSet(page_set_module.PageSet):
       'http://webglsamples.googlecode.com/hg/dynamic-cubemap/dynamic-cubemap.html'
     ]
     for url in urls_list:
-      self.AddPage(ToughWebglCasesPage(url, self))
+      self.AddUserStory(ToughWebglCasesPage(url, self))
diff --git a/tools/perf/page_sets/typical_10_mobile.py b/tools/perf/page_sets/typical_10_mobile.py
index fdc21c0..46bec68 100644
--- a/tools/perf/page_sets/typical_10_mobile.py
+++ b/tools/perf/page_sets/typical_10_mobile.py
@@ -53,4 +53,4 @@ class Typical10MobilePageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(Typical10MobilePage(url, self))
+      self.AddUserStory(Typical10MobilePage(url, self))
diff --git a/tools/perf/page_sets/typical_25.py b/tools/perf/page_sets/typical_25.py
index 6df7860..cbb5387 100644
--- a/tools/perf/page_sets/typical_25.py
+++ b/tools/perf/page_sets/typical_25.py
@@ -71,4 +71,4 @@ class Typical25PageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(Typical25Page(url, self))
+      self.AddUserStory(Typical25Page(url, self))
diff --git a/tools/perf/page_sets/typical_mobile_sites.py b/tools/perf/page_sets/typical_mobile_sites.py
index c8a91f0..0654f48 100644
--- a/tools/perf/page_sets/typical_mobile_sites.py
+++ b/tools/perf/page_sets/typical_mobile_sites.py
@@ -50,4 +50,4 @@ class TypicalMobileSitesPageSet(page_set_module.PageSet):
     ]
 
     for url in urls_list:
-      self.AddPage(TypicalMobileSitesPage(url, self))
+      self.AddUserStory(TypicalMobileSitesPage(url, self))
diff --git a/tools/perf/page_sets/webrtc_cases.py b/tools/perf/page_sets/webrtc_cases.py
index f3d507a..e5db1bd 100644
--- a/tools/perf/page_sets/webrtc_cases.py
+++ b/tools/perf/page_sets/webrtc_cases.py
@@ -73,6 +73,6 @@ class WebrtcCasesPageSet(page_set_module.PageSet):
       archive_data_file='data/webrtc_cases.json',
       bucket=page_set_module.PUBLIC_BUCKET)
 
-    self.AddPage(Page1(self))
-    self.AddPage(Page2(self))
-    self.AddPage(Page3(self))
+    self.AddUserStory(Page1(self))
+    self.AddUserStory(Page2(self))
+    self.AddUserStory(Page3(self))