diff --git a/code/GoogleSitemap.php b/code/GoogleSitemap.php
index 947117a..6f9234b 100644
--- a/code/GoogleSitemap.php
+++ b/code/GoogleSitemap.php
@@ -244,7 +244,7 @@ class GoogleSitemap extends Object
             }
 
             if($redirector) {
-                foreach (ClassInfo::subclassesFor('RedirectorPage') as $redirectorClass) {
+                foreach (ClassInfo::subclassesFor('SilverStripe\\CMS\\Model\\RedirectorPage') as $redirectorClass) {
                     $instances = $instances->exclude('ClassName', $redirectorClass);
                 }
             }
diff --git a/code/controllers/GoogleSitemapController.php b/code/controllers/GoogleSitemapController.php
index 75d86a7..faebef3 100644
--- a/code/controllers/GoogleSitemapController.php
+++ b/code/controllers/GoogleSitemapController.php
@@ -38,7 +38,7 @@ class GoogleSitemapController extends Controller
     public function index($url)
     {
         if (GoogleSitemap::enabled()) {
-            Config::inst()->update('SSViewer', 'set_source_file_comments', false);
+            Config::inst()->update('SilverStripe\\View\\SSViewer', 'set_source_file_comments', false);
 
             $this->getResponse()->addHeader('Content-Type', 'application/xml; charset="utf-8"');
             $this->getResponse()->addHeader('X-Robots-Tag', 'noindex');
@@ -66,7 +66,7 @@ class GoogleSitemapController extends Controller
         $page = $this->request->param('OtherID');
 
         if (GoogleSitemap::enabled() && $class && $page && ($class == SiteTree::class || $class == 'GoogleSitemapRoute' || GoogleSitemap::is_registered($class))) {
-            Config::inst()->update('SSViewer', 'set_source_file_comments', false);
+            Config::inst()->update('SilverStripe\\View\\SSViewer', 'set_source_file_comments', false);
 
             $this->getResponse()->addHeader('Content-Type', 'application/xml; charset="utf-8"');
             $this->getResponse()->addHeader('X-Robots-Tag', 'noindex');
diff --git a/tests/GoogleSitemapTest.php b/tests/GoogleSitemapTest.php
index 2abbe90..ac2d34d 100644
--- a/tests/GoogleSitemapTest.php
+++ b/tests/GoogleSitemapTest.php
@@ -405,7 +405,7 @@ class GoogleSitemapTest_OtherDataObject extends DataObject implements TestOnly
 class GoogleSitemapTest_UnviewableDataObject extends DataObject implements TestOnly
 {
 
-    public static $db = array(
+    private static $db = array(
         'Priority' => 'Varchar(10)'
     );