diff --git a/mozdownload/scraper.py b/mozdownload/scraper.py
index 950de0d9..f1bb26cd 100755
--- a/mozdownload/scraper.py
+++ b/mozdownload/scraper.py
@@ -613,7 +613,7 @@ def candidate_build_list_regex(self):
            a candidate build."""
 
         # Regex for possible builds for the given date
-        return r'nightly/%(VERSION)s-candidates/' % {
+        return r'candidates/%(VERSION)s-candidates/' % {
             'VERSION': self.version}
 
     @property
diff --git a/tests/data/firefox/nightly/21.0-candidates/build1/linux-i686/en-US/firefox-21.0.tar.bz2 b/tests/data/firefox/candidates/21.0-candidates/build1/linux-i686/en-US/firefox-21.0.tar.bz2
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build1/linux-i686/en-US/firefox-21.0.tar.bz2
rename to tests/data/firefox/candidates/21.0-candidates/build1/linux-i686/en-US/firefox-21.0.tar.bz2
diff --git a/tests/data/firefox/nightly/21.0-candidates/build1/linux-x86_64/en-US/firefox-21.0.tar.bz2 b/tests/data/firefox/candidates/21.0-candidates/build1/linux-x86_64/en-US/firefox-21.0.tar.bz2
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build1/linux-x86_64/en-US/firefox-21.0.tar.bz2
rename to tests/data/firefox/candidates/21.0-candidates/build1/linux-x86_64/en-US/firefox-21.0.tar.bz2
diff --git a/tests/data/firefox/nightly/21.0-candidates/build1/mac/en-US/Firefox 21.0.dmg b/tests/data/firefox/candidates/21.0-candidates/build1/mac/en-US/Firefox 21.0.dmg
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build1/mac/en-US/Firefox 21.0.dmg
rename to tests/data/firefox/candidates/21.0-candidates/build1/mac/en-US/Firefox 21.0.dmg
diff --git a/tests/data/firefox/nightly/21.0-candidates/build1/win32/cs/Firefox Setup 21.0.exe b/tests/data/firefox/candidates/21.0-candidates/build1/win32/cs/Firefox Setup 21.0.exe
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build1/win32/cs/Firefox Setup 21.0.exe
rename to tests/data/firefox/candidates/21.0-candidates/build1/win32/cs/Firefox Setup 21.0.exe
diff --git a/tests/data/firefox/nightly/21.0-candidates/build1/win32/en-GB/Firefox Setup 21.0.exe b/tests/data/firefox/candidates/21.0-candidates/build1/win32/en-GB/Firefox Setup 21.0.exe
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build1/win32/en-GB/Firefox Setup 21.0.exe
rename to tests/data/firefox/candidates/21.0-candidates/build1/win32/en-GB/Firefox Setup 21.0.exe
diff --git a/tests/data/firefox/nightly/21.0-candidates/build1/win32/en-US/Firefox Setup 21.0.exe b/tests/data/firefox/candidates/21.0-candidates/build1/win32/en-US/Firefox Setup 21.0.exe
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build1/win32/en-US/Firefox Setup 21.0.exe
rename to tests/data/firefox/candidates/21.0-candidates/build1/win32/en-US/Firefox Setup 21.0.exe
diff --git a/tests/data/firefox/nightly/21.0-candidates/build1/win32/en-US/Firefox Setup Stub 21.0.exe b/tests/data/firefox/candidates/21.0-candidates/build1/win32/en-US/Firefox Setup Stub 21.0.exe
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build1/win32/en-US/Firefox Setup Stub 21.0.exe
rename to tests/data/firefox/candidates/21.0-candidates/build1/win32/en-US/Firefox Setup Stub 21.0.exe
diff --git a/tests/data/firefox/nightly/21.0-candidates/build3/linux-i686/en-US/firefox-21.0.tar.bz2 b/tests/data/firefox/candidates/21.0-candidates/build3/linux-i686/en-US/firefox-21.0.tar.bz2
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build3/linux-i686/en-US/firefox-21.0.tar.bz2
rename to tests/data/firefox/candidates/21.0-candidates/build3/linux-i686/en-US/firefox-21.0.tar.bz2
diff --git a/tests/data/firefox/nightly/21.0-candidates/build3/linux-x86_64/en-US/firefox-21.0.tar.bz2 b/tests/data/firefox/candidates/21.0-candidates/build3/linux-x86_64/en-US/firefox-21.0.tar.bz2
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build3/linux-x86_64/en-US/firefox-21.0.tar.bz2
rename to tests/data/firefox/candidates/21.0-candidates/build3/linux-x86_64/en-US/firefox-21.0.tar.bz2
diff --git a/tests/data/firefox/nightly/21.0-candidates/build3/mac/en-US/Firefox 21.0.dmg b/tests/data/firefox/candidates/21.0-candidates/build3/mac/en-US/Firefox 21.0.dmg
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build3/mac/en-US/Firefox 21.0.dmg
rename to tests/data/firefox/candidates/21.0-candidates/build3/mac/en-US/Firefox 21.0.dmg
diff --git a/tests/data/firefox/nightly/21.0-candidates/build3/win32/cs/Firefox Setup 21.0.exe b/tests/data/firefox/candidates/21.0-candidates/build3/win32/cs/Firefox Setup 21.0.exe
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build3/win32/cs/Firefox Setup 21.0.exe
rename to tests/data/firefox/candidates/21.0-candidates/build3/win32/cs/Firefox Setup 21.0.exe
diff --git a/tests/data/firefox/nightly/21.0-candidates/build3/win32/en-GB/Firefox Setup 21.0.exe b/tests/data/firefox/candidates/21.0-candidates/build3/win32/en-GB/Firefox Setup 21.0.exe
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build3/win32/en-GB/Firefox Setup 21.0.exe
rename to tests/data/firefox/candidates/21.0-candidates/build3/win32/en-GB/Firefox Setup 21.0.exe
diff --git a/tests/data/firefox/nightly/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe b/tests/data/firefox/candidates/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe
rename to tests/data/firefox/candidates/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe
diff --git a/tests/data/firefox/nightly/21.0-candidates/build3/win32/en-US/Firefox Setup Stub 21.0.exe b/tests/data/firefox/candidates/21.0-candidates/build3/win32/en-US/Firefox Setup Stub 21.0.exe
similarity index 100%
rename from tests/data/firefox/nightly/21.0-candidates/build3/win32/en-US/Firefox Setup Stub 21.0.exe
rename to tests/data/firefox/candidates/21.0-candidates/build3/win32/en-US/Firefox Setup Stub 21.0.exe
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2 b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2 b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/mac/en-US/Thunderbird 10.0.5esr.dmg b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/mac/en-US/Thunderbird 10.0.5esr.dmg
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/mac/en-US/Thunderbird 10.0.5esr.dmg
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/mac/en-US/Thunderbird 10.0.5esr.dmg
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/win32/cs/Thunderbird Setup 10.0.5esr.exe b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/win32/cs/Thunderbird Setup 10.0.5esr.exe
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/win32/cs/Thunderbird Setup 10.0.5esr.exe
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/win32/cs/Thunderbird Setup 10.0.5esr.exe
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/win32/en-GB/Thunderbird Setup 10.0.5esr.exe b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/win32/en-GB/Thunderbird Setup 10.0.5esr.exe
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/win32/en-GB/Thunderbird Setup 10.0.5esr.exe
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/win32/en-GB/Thunderbird Setup 10.0.5esr.exe
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/win32/en-US/Thunderbird Setup 10.0.5esr.exe b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/win32/en-US/Thunderbird Setup 10.0.5esr.exe
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build1/win32/en-US/Thunderbird Setup 10.0.5esr.exe
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build1/win32/en-US/Thunderbird Setup 10.0.5esr.exe
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2 b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2 b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/mac/en-US/Thunderbird 10.0.5esr.dmg b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/mac/en-US/Thunderbird 10.0.5esr.dmg
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/mac/en-US/Thunderbird 10.0.5esr.dmg
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/mac/en-US/Thunderbird 10.0.5esr.dmg
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/win32/cs/Thunderbird Setup 10.0.5esr.exe b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/win32/cs/Thunderbird Setup 10.0.5esr.exe
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/win32/cs/Thunderbird Setup 10.0.5esr.exe
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/win32/cs/Thunderbird Setup 10.0.5esr.exe
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/win32/en-GB/Thunderbird Setup 10.0.5esr.exe b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/win32/en-GB/Thunderbird Setup 10.0.5esr.exe
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/win32/en-GB/Thunderbird Setup 10.0.5esr.exe
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/win32/en-GB/Thunderbird Setup 10.0.5esr.exe
diff --git a/tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/win32/en-US/Thunderbird Setup 10.0.5esr.exe b/tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/win32/en-US/Thunderbird Setup 10.0.5esr.exe
similarity index 100%
rename from tests/data/thunderbird/nightly/10.0.5esr-candidates/build3/win32/en-US/Thunderbird Setup 10.0.5esr.exe
rename to tests/data/thunderbird/candidates/10.0.5esr-candidates/build3/win32/en-US/Thunderbird Setup 10.0.5esr.exe
diff --git a/tests/release_candidate_scraper/test_release_candidate_scraper.py b/tests/release_candidate_scraper/test_release_candidate_scraper.py
index 26df07db..f5f87d03 100644
--- a/tests/release_candidate_scraper/test_release_candidate_scraper.py
+++ b/tests/release_candidate_scraper/test_release_candidate_scraper.py
@@ -17,59 +17,59 @@
     {'args': {'platform': 'win32',
               'version': '21.0'},
      'target': 'firefox-21.0-build3.en-US.win32.exe',
-     'target_url': 'firefox/nightly/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe'},
+     'target_url': 'firefox/candidates/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe'},
     # -a firefox -p linux -v 21.0
     {'args': {'application': 'firefox',
               'platform': 'linux',
               'version': '21.0'},
      'target': 'firefox-21.0-build3.en-US.linux.tar.bz2',
-     'target_url': 'firefox/nightly/21.0-candidates/build3/linux-i686/en-US/firefox-21.0.tar.bz2'},
+     'target_url': 'firefox/candidates/21.0-candidates/build3/linux-i686/en-US/firefox-21.0.tar.bz2'},
     # -a firefox -p linux64 -v 21.0
     {'args': {'application': 'firefox',
               'platform': 'linux64',
               'version': '21.0'},
      'target': 'firefox-21.0-build3.en-US.linux64.tar.bz2',
-     'target_url': 'firefox/nightly/21.0-candidates/build3/linux-x86_64/en-US/firefox-21.0.tar.bz2'},
+     'target_url': 'firefox/candidates/21.0-candidates/build3/linux-x86_64/en-US/firefox-21.0.tar.bz2'},
     # -a firefox -p mac -v 21.0
     {'args': {'application': 'firefox',
               'platform': 'mac',
               'version': '21.0'},
      'target': 'firefox-21.0-build3.en-US.mac.dmg',
-     'target_url': 'firefox/nightly/21.0-candidates/build3/mac/en-US/Firefox 21.0.dmg'},
+     'target_url': 'firefox/candidates/21.0-candidates/build3/mac/en-US/Firefox 21.0.dmg'},
     # -a firefox -p win32 -v 21.0
     {'args': {'application': 'firefox',
               'platform': 'win32',
               'version': '21.0'},
      'target': 'firefox-21.0-build3.en-US.win32.exe',
-     'target_url': 'firefox/nightly/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe'},
+     'target_url': 'firefox/candidates/21.0-candidates/build3/win32/en-US/Firefox Setup 21.0.exe'},
     # -a firefox -p win32 -v 21.0 -l cs
     {'args': {'application': 'firefox',
               'locale': 'cs',
               'platform': 'win32',
               'version': '21.0'},
      'target': 'firefox-21.0-build3.cs.win32.exe',
-     'target_url': 'firefox/nightly/21.0-candidates/build3/win32/cs/Firefox Setup 21.0.exe'},
+     'target_url': 'firefox/candidates/21.0-candidates/build3/win32/cs/Firefox Setup 21.0.exe'},
     # -a firefox -p win32 -v 21.0 -l en-GB
     {'args': {'application': 'firefox',
               'locale': 'en-GB',
               'platform': 'win32',
               'version': '21.0'},
      'target': 'firefox-21.0-build3.en-GB.win32.exe',
-     'target_url': 'firefox/nightly/21.0-candidates/build3/win32/en-GB/Firefox Setup 21.0.exe'},
+     'target_url': 'firefox/candidates/21.0-candidates/build3/win32/en-GB/Firefox Setup 21.0.exe'},
     # -a firefox -p win32 -v 21.0 --build-number=1
     {'args': {'application': 'firefox',
               'build_number': '1',
               'platform': 'win32',
               'version': '21.0'},
      'target': 'firefox-21.0-build1.en-US.win32.exe',
-     'target_url': 'firefox/nightly/21.0-candidates/build1/win32/en-US/Firefox Setup 21.0.exe'},
+     'target_url': 'firefox/candidates/21.0-candidates/build1/win32/en-US/Firefox Setup 21.0.exe'},
     # -a firefox -p win32 -v 21.0 --stub
     {'args': {'application': 'firefox',
               'is_stub_installer': True,
               'platform': 'win32',
               'version': '21.0'},
      'target': 'firefox-21.0-build3.en-US.win32.exe',
-     'target_url': 'firefox/nightly/21.0-candidates/build3/win32/en-US/Firefox Setup Stub 21.0.exe'},
+     'target_url': 'firefox/candidates/21.0-candidates/build3/win32/en-US/Firefox Setup Stub 21.0.exe'},
 ]
 
 thunderbird_tests = [
@@ -78,46 +78,46 @@
               'platform': 'linux',
               'version': '10.0.5esr'},
      'target': 'thunderbird-10.0.5esr-build3.en-US.linux.tar.bz2',
-     'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2'},
+     'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/linux-i686/en-US/thunderbird-10.0.5esr.tar.bz2'},
     # -a thunderbird -p linux64 -v 10.0.5esr
     {'args': {'application': 'thunderbird',
               'platform': 'linux64',
               'version': '10.0.5esr'},
      'target': 'thunderbird-10.0.5esr-build3.en-US.linux64.tar.bz2',
-     'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2'},
+     'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/linux-x86_64/en-US/thunderbird-10.0.5esr.tar.bz2'},
     # -a thunderbird -p mac -v 10.0.5esr
     {'args': {'application': 'thunderbird',
               'platform': 'mac',
               'version': '10.0.5esr'},
      'target': 'thunderbird-10.0.5esr-build3.en-US.mac.dmg',
-     'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/mac/en-US/Thunderbird 10.0.5esr.dmg'},
+     'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/mac/en-US/Thunderbird 10.0.5esr.dmg'},
     # -a thunderbird -p win32 -v 10.0.5esr
     {'args': {'application': 'thunderbird',
               'platform': 'win32',
               'version': '10.0.5esr'},
      'target': 'thunderbird-10.0.5esr-build3.en-US.win32.exe',
-     'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/win32/en-US/Thunderbird Setup 10.0.5esr.exe'},
+     'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/win32/en-US/Thunderbird Setup 10.0.5esr.exe'},
     # -a thunderbird -p win32 -v 10.0.5esr -l cs
     {'args': {'application': 'thunderbird',
               'locale': 'cs',
               'platform': 'win32',
               'version': '10.0.5esr'},
      'target': 'thunderbird-10.0.5esr-build3.cs.win32.exe',
-     'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/win32/cs/Thunderbird Setup 10.0.5esr.exe'},
+     'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/win32/cs/Thunderbird Setup 10.0.5esr.exe'},
     # -a thunderbird -p win32 -v 10.0.5esr -l en-GB
     {'args': {'application': 'thunderbird',
               'locale': 'en-GB',
               'platform': 'win32',
               'version': '10.0.5esr'},
      'target': 'thunderbird-10.0.5esr-build3.en-GB.win32.exe',
-     'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build3/win32/en-GB/Thunderbird Setup 10.0.5esr.exe'},
+     'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build3/win32/en-GB/Thunderbird Setup 10.0.5esr.exe'},
     # -a thunderbird -p win32 -v 10.0.5esr
     {'args': {'application': 'thunderbird',
               'build_number': '1',
               'platform': 'win32',
               'version': '10.0.5esr'},
      'target': 'thunderbird-10.0.5esr-build1.en-US.win32.exe',
-     'target_url': 'thunderbird/nightly/10.0.5esr-candidates/build1/win32/en-US/Thunderbird Setup 10.0.5esr.exe'},
+     'target_url': 'thunderbird/candidates/10.0.5esr-candidates/build1/win32/en-US/Thunderbird Setup 10.0.5esr.exe'},
 ]
 
 tests = firefox_tests + thunderbird_tests
@@ -127,7 +127,7 @@ class ReleaseCandidateScraperTest(mhttpd.MozHttpdBaseTest):
     """test mozdownload scraper class"""
 
     def test_scraper(self):
-        """Testing various download scenarios for ReleaseScraper"""
+        """Testing various download scenarios for ReleaseCandidateScraper"""
 
         for entry in tests:
             scraper = ReleaseCandidateScraper(directory=self.temp_dir,