diff --git a/plugins/bake/templates/bake/element/Controller/add.twig b/plugins/bake/templates/bake/element/Controller/add.twig
index 222f5e9..1074a0c 100644
--- a/plugins/bake/templates/bake/element/Controller/add.twig
+++ b/plugins/bake/templates/bake/element/Controller/add.twig
@@ -8,7 +8,7 @@
      * Add method
      *
      * @return \Cake\Http\Response|null|void HTTP 200 on successful add
-     * @throws \Cake\Datasource\Exception\MethodNotAllowedException When invalid method
+     * @throws \Cake\Http\Exception\MethodNotAllowedException When invalid method
      * @throws \Exception
      */
     public function add()
diff --git a/plugins/bake/templates/bake/element/Controller/delete.twig b/plugins/bake/templates/bake/element/Controller/delete.twig
index 98522b7..ba3bb1f 100644
--- a/plugins/bake/templates/bake/element/Controller/delete.twig
+++ b/plugins/bake/templates/bake/element/Controller/delete.twig
@@ -9,7 +9,7 @@
      * @param string|null $id {{ singularHumanName }} id.
      * @return \Cake\Http\Response|null|void HTTP 204 on success
      * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
-     * @throws \Cake\Datasource\Exception\MethodNotAllowedException When invalid method
+     * @throws \Cake\Http\Exception\MethodNotAllowedException When invalid method
      * @throws \Exception
      */
     public function delete($id = null)
diff --git a/plugins/bake/templates/bake/element/Controller/edit.twig b/plugins/bake/templates/bake/element/Controller/edit.twig
index 273c018..da36b0c 100644
--- a/plugins/bake/templates/bake/element/Controller/edit.twig
+++ b/plugins/bake/templates/bake/element/Controller/edit.twig
@@ -12,7 +12,7 @@
      * @param string|null $id {{ singularHumanName }} id.
      * @return \Cake\Http\Response|null|void HTTP 200 on successful edit
      * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
-     * @throws \Cake\Datasource\Exception\MethodNotAllowedException When invalid method
+     * @throws \Cake\Http\Exception\MethodNotAllowedException When invalid method
      * @throws \Exception
      */
     public function edit($id = null)
diff --git a/plugins/bake/templates/bake/element/Controller/index.twig b/plugins/bake/templates/bake/element/Controller/index.twig
index 6491ed0..8b4bd49 100644
--- a/plugins/bake/templates/bake/element/Controller/index.twig
+++ b/plugins/bake/templates/bake/element/Controller/index.twig
@@ -7,7 +7,7 @@
      * Index method
      *
      * @return \Cake\Http\Response|null|void Renders view
-     * @throws \Cake\Datasource\Exception\MethodNotAllowedException When invalid method
+     * @throws \Cake\Http\Exception\MethodNotAllowedException When invalid method
      */
     public function index()
     {
diff --git a/plugins/bake/templates/bake/element/Controller/view.twig b/plugins/bake/templates/bake/element/Controller/view.twig
index e1835ed..a172e84 100644
--- a/plugins/bake/templates/bake/element/Controller/view.twig
+++ b/plugins/bake/templates/bake/element/Controller/view.twig
@@ -13,7 +13,7 @@
      * @param string|null $id {{ singularHumanName }} id.
      * @return \Cake\Http\Response|null|void Renders view
      * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
-     * @throws \Cake\Datasource\Exception\MethodNotAllowedException When invalid method
+     * @throws \Cake\Http\Exception\MethodNotAllowedException When invalid method
      */
     public function view($id = null)
     {
diff --git a/plugins/bake/tests/assets/DepartmentsController.php b/plugins/bake/tests/assets/DepartmentsController.php
index d248df0..f5a7c10 100644
--- a/plugins/bake/tests/assets/DepartmentsController.php
+++ b/plugins/bake/tests/assets/DepartmentsController.php
@@ -16,7 +16,7 @@ class DepartmentsController extends AppController
      * Index method
      *
      * @return \Cake\Http\Response|null|void Renders view
-     * @throws \Cake\Datasource\Exception\MethodNotAllowedException When invalid method
+     * @throws \Cake\Http\Exception\MethodNotAllowedException When invalid method
      */
     public function index()
     {
@@ -33,7 +33,7 @@ public function index()
      * @param string|null $id Department id.
      * @return \Cake\Http\Response|null|void Renders view
      * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
-     * @throws \Cake\Datasource\Exception\MethodNotAllowedException When invalid method
+     * @throws \Cake\Http\Exception\MethodNotAllowedException When invalid method
      */
     public function view($id = null)
     {
@@ -51,7 +51,7 @@ public function view($id = null)
      * Add method
      *
      * @return \Cake\Http\Response|null|void HTTP 200 on successful add
-     * @throws \Cake\Datasource\Exception\MethodNotAllowedException When invalid method
+     * @throws \Cake\Http\Exception\MethodNotAllowedException When invalid method
      * @throws \Exception
      */
     public function add()
@@ -74,7 +74,7 @@ public function add()
      * @param string|null $id Department id.
      * @return \Cake\Http\Response|null|void HTTP 200 on successful edit
      * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
-     * @throws \Cake\Datasource\Exception\MethodNotAllowedException When invalid method
+     * @throws \Cake\Http\Exception\MethodNotAllowedException When invalid method
      * @throws \Exception
      */
     public function edit($id = null)
@@ -99,7 +99,7 @@ public function edit($id = null)
      * @param string|null $id Department id.
      * @return \Cake\Http\Response|null|void HTTP 204 on success
      * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
-     * @throws \Cake\Datasource\Exception\MethodNotAllowedException When invalid method
+     * @throws \Cake\Http\Exception\MethodNotAllowedException When invalid method
      * @throws \Exception
      */
     public function delete($id = null)