diff --git a/src/Template/Bake/Template/add.ctp b/src/Template/Bake/Template/add.ctp
index 39c6370b6..32557b62d 100644
--- a/src/Template/Bake/Template/add.ctp
+++ b/src/Template/Bake/Template/add.ctp
@@ -15,7 +15,7 @@
 %>
 <?php
 /**
-  * @var \<%= $namespace %>\View\AppView $this
-  */
+ * @var \<%= $namespace %>\View\AppView $this
+ */
 ?>
 <%= $this->element('form');
diff --git a/src/Template/Bake/Template/edit.ctp b/src/Template/Bake/Template/edit.ctp
index 39c6370b6..32557b62d 100644
--- a/src/Template/Bake/Template/edit.ctp
+++ b/src/Template/Bake/Template/edit.ctp
@@ -15,7 +15,7 @@
 %>
 <?php
 /**
-  * @var \<%= $namespace %>\View\AppView $this
-  */
+ * @var \<%= $namespace %>\View\AppView $this
+ */
 ?>
 <%= $this->element('form');
diff --git a/src/Template/Bake/Template/index.ctp b/src/Template/Bake/Template/index.ctp
index 90c0c08ef..c7a73e3be 100644
--- a/src/Template/Bake/Template/index.ctp
+++ b/src/Template/Bake/Template/index.ctp
@@ -15,9 +15,9 @@
 %>
 <?php
 /**
-  * @var \<%= $namespace %>\View\AppView $this
-  * @var \<%= $entityClass %>[]|\Cake\Collection\CollectionInterface $<%= $pluralVar %>
-  */
+ * @var \<%= $namespace %>\View\AppView $this
+ * @var \<%= $entityClass %>[]|\Cake\Collection\CollectionInterface $<%= $pluralVar %>
+ */
 ?>
 <%
 use Cake\Utility\Inflector;
diff --git a/src/Template/Bake/Template/login.ctp b/src/Template/Bake/Template/login.ctp
index 8e8a5224c..0ac157a4d 100644
--- a/src/Template/Bake/Template/login.ctp
+++ b/src/Template/Bake/Template/login.ctp
@@ -15,8 +15,8 @@
 %>
 <?php
 /**
-  * @var \<%= $namespace %>\View\AppView $this
-  */
+ * @var \<%= $namespace %>\View\AppView $this
+ */
 ?>
 <div class="<%= $pluralVar %> form">
 <?= $this->Flash->render('auth') ?>
diff --git a/src/Template/Bake/Template/view.ctp b/src/Template/Bake/Template/view.ctp
index 129421720..af2eab33b 100644
--- a/src/Template/Bake/Template/view.ctp
+++ b/src/Template/Bake/Template/view.ctp
@@ -15,9 +15,9 @@
 %>
 <?php
 /**
-  * @var \<%= $namespace %>\View\AppView $this
-  * @var \<%= $entityClass %> $<%= $singularVar %>
-  */
+ * @var \<%= $namespace %>\View\AppView $this
+ * @var \<%= $entityClass %> $<%= $singularVar %>
+ */
 ?>
 <%
 use Cake\Utility\Inflector;
diff --git a/tests/comparisons/Template/testBakeEdit.ctp b/tests/comparisons/Template/testBakeEdit.ctp
index 9fe6b3639..95b995f44 100644
--- a/tests/comparisons/Template/testBakeEdit.ctp
+++ b/tests/comparisons/Template/testBakeEdit.ctp
@@ -1,7 +1,7 @@
 <?php
 /**
-  * @var \Bake\Test\App\View\AppView $this
-  */
+ * @var \Bake\Test\App\View\AppView $this
+ */
 ?>
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
     <ul class="side-nav">
diff --git a/tests/comparisons/Template/testBakeIndex.ctp b/tests/comparisons/Template/testBakeIndex.ctp
index 9be9b6c9e..9618783a5 100644
--- a/tests/comparisons/Template/testBakeIndex.ctp
+++ b/tests/comparisons/Template/testBakeIndex.ctp
@@ -1,8 +1,8 @@
 <?php
 /**
-  * @var \Bake\Test\App\View\AppView $this
-  * @var \Cake\Datasource\EntityInterface[]|\Cake\Collection\CollectionInterface $templateTaskComments
-  */
+ * @var \Bake\Test\App\View\AppView $this
+ * @var \Cake\Datasource\EntityInterface[]|\Cake\Collection\CollectionInterface $templateTaskComments
+ */
 ?>
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
     <ul class="side-nav">
diff --git a/tests/comparisons/Template/testBakeIndexWithIndexLimit.ctp b/tests/comparisons/Template/testBakeIndexWithIndexLimit.ctp
index 156008254..ab78eb7f1 100644
--- a/tests/comparisons/Template/testBakeIndexWithIndexLimit.ctp
+++ b/tests/comparisons/Template/testBakeIndexWithIndexLimit.ctp
@@ -1,8 +1,8 @@
 <?php
 /**
-  * @var \Bake\Test\App\View\AppView $this
-  * @var \Cake\Datasource\EntityInterface[]|\Cake\Collection\CollectionInterface $templateTaskComments
-  */
+ * @var \Bake\Test\App\View\AppView $this
+ * @var \Cake\Datasource\EntityInterface[]|\Cake\Collection\CollectionInterface $templateTaskComments
+ */
 ?>
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
     <ul class="side-nav">
diff --git a/tests/comparisons/Template/testBakeView.ctp b/tests/comparisons/Template/testBakeView.ctp
index 4ffe6a988..c5c4f5020 100644
--- a/tests/comparisons/Template/testBakeView.ctp
+++ b/tests/comparisons/Template/testBakeView.ctp
@@ -1,8 +1,8 @@
 <?php
 /**
-  * @var \Bake\Test\App\View\AppView $this
-  * @var \Cake\Datasource\EntityInterface $author
-  */
+ * @var \Bake\Test\App\View\AppView $this
+ * @var \Cake\Datasource\EntityInterface $author
+ */
 ?>
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
     <ul class="side-nav">
diff --git a/tests/comparisons/Template/testGetContent.ctp b/tests/comparisons/Template/testGetContent.ctp
index 447cb5b6c..18cb98211 100644
--- a/tests/comparisons/Template/testGetContent.ctp
+++ b/tests/comparisons/Template/testGetContent.ctp
@@ -1,8 +1,8 @@
 <?php
 /**
-  * @var \Bake\Test\App\View\AppView $this
-  * @var \Bake\Test\App\Model\Entity\TestTemplateModel $testTemplateModel
-  */
+ * @var \Bake\Test\App\View\AppView $this
+ * @var \Bake\Test\App\Model\Entity\TestTemplateModel $testTemplateModel
+ */
 ?>
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
     <ul class="side-nav">
diff --git a/tests/comparisons/Template/testGetContentAssociations.ctp b/tests/comparisons/Template/testGetContentAssociations.ctp
index d4658320b..499476f7b 100644
--- a/tests/comparisons/Template/testGetContentAssociations.ctp
+++ b/tests/comparisons/Template/testGetContentAssociations.ctp
@@ -1,8 +1,8 @@
 <?php
 /**
-  * @var \Bake\Test\App\View\AppView $this
-  * @var \Bake\Test\App\Model\Entity\TemplateTaskComment $templateTaskComment
-  */
+ * @var \Bake\Test\App\View\AppView $this
+ * @var \Bake\Test\App\Model\Entity\TemplateTaskComment $templateTaskComment
+ */
 ?>
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
     <ul class="side-nav">
diff --git a/tests/comparisons/Template/testGetContentWithRoutingPrefix-add.ctp b/tests/comparisons/Template/testGetContentWithRoutingPrefix-add.ctp
index 11a49957d..244f13f06 100644
--- a/tests/comparisons/Template/testGetContentWithRoutingPrefix-add.ctp
+++ b/tests/comparisons/Template/testGetContentWithRoutingPrefix-add.ctp
@@ -1,7 +1,7 @@
 <?php
 /**
-  * @var \Bake\Test\App\View\AppView $this
-  */
+ * @var \Bake\Test\App\View\AppView $this
+ */
 ?>
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
     <ul class="side-nav">
diff --git a/tests/comparisons/Template/testGetContentWithRoutingPrefix-view.ctp b/tests/comparisons/Template/testGetContentWithRoutingPrefix-view.ctp
index 447cb5b6c..18cb98211 100644
--- a/tests/comparisons/Template/testGetContentWithRoutingPrefix-view.ctp
+++ b/tests/comparisons/Template/testGetContentWithRoutingPrefix-view.ctp
@@ -1,8 +1,8 @@
 <?php
 /**
-  * @var \Bake\Test\App\View\AppView $this
-  * @var \Bake\Test\App\Model\Entity\TestTemplateModel $testTemplateModel
-  */
+ * @var \Bake\Test\App\View\AppView $this
+ * @var \Bake\Test\App\Model\Entity\TestTemplateModel $testTemplateModel
+ */
 ?>
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
     <ul class="side-nav">