Use PageController without underscore

code/GridFieldTestPage.php

@@ -55,7 +55,7 @@ class GridFieldTestPage extends TestPage
     }
 }
 
-class GridFieldTestPage_Controller extends Page_Controller
+class GridFieldTestPage_Controller extends PageController
 {
 
     private static $allowed_actions = array(

code/TestPage.php

@@ -3,14 +3,7 @@
 namespace SilverStripe\FrameworkTest\Model;
 
 use Page;
-
-
-use Page_Controller;
-
-
-
-
-
+use PageController;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Forms\FormAction;
@@ -77,7 +70,7 @@ class TestPage extends Page
 /**
  * Parent class of all test page controllers
  */
-class TestPage_Controller extends Page_Controller
+class TestPage_Controller extends PageController
 {
     private static $allowed_actions = array(
         'Form',

code/multiform/Page2MultiFormTestPage.php

@@ -4,7 +4,7 @@ class Page2MultiFormTestPage extends Page
 {
 }
 
-class Page2MultiFormTestPage_Controller extends Page_Controller
+class Page2MultiFormTestPage_Controller extends PageController
 {
 
     public function Page2MultiForm()

code/multiform/Page3MultiFormTestPage.php

@@ -4,7 +4,7 @@ class Page3MultiFormTestPage extends Page
 {
 }
 
-class Page3MultiFormTestPage_Controller extends Page_Controller
+class Page3MultiFormTestPage_Controller extends PageController
 {
 
     public function Page3MultiForm()

code/multiform/TestMultiFormPage.php

@@ -3,7 +3,7 @@ class TestMultiFormPage extends Page
 {
 }
 
-class TestMultiFormPage_Controller extends Page_Controller
+class TestMultiFormPage_Controller extends PageController
 {
 
     public function Form()

code/recaptcha/RecaptchaTestPage.php

@@ -11,7 +11,7 @@ class RecaptchaTestPage extends Page
 {
 }
 
-class RecaptchaTestPage_Controller extends Page_Controller
+class RecaptchaTestPage_Controller extends PageController
 {
 
     public function Form()

code/sifr/SifrPage.php

@@ -13,7 +13,7 @@ class SifrPage extends Page
     }
 }
 
-class SifrPage_Controller extends Page_Controller
+class SifrPage_Controller extends PageController
 {
 
     public function init()

code/tagfield/TestTagFieldPage.php

@@ -37,4 +37,4 @@
 
 // }
 
-// class TestTagFieldPage_Controller extends Page_Controller {}
+// class TestTagFieldPage_Controller extends PageController {}