diff --git a/lib/Cake/Console/Command/BakeShell.php b/lib/Cake/Console/Command/BakeShell.php
index 32e71e2a159..592b5f9be02 100644
--- a/lib/Cake/Console/Command/BakeShell.php
+++ b/lib/Cake/Console/Command/BakeShell.php
@@ -14,8 +14,8 @@
  */
 namespace Cake\Console\Command;
 
-use Cake\Console\Shell;
 use Cake\Cache\Cache;
+use Cake\Console\Shell;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Model\Model;
diff --git a/lib/Cake/Console/Command/UpgradeShell.php b/lib/Cake/Console/Command/UpgradeShell.php
index 2a7887d6eeb..24b8bc7ae06 100644
--- a/lib/Cake/Console/Command/UpgradeShell.php
+++ b/lib/Cake/Console/Command/UpgradeShell.php
@@ -134,7 +134,7 @@ protected function _replaceUses($file) {
 			$matches = $this->_mapClassName($matches);
 			if (count($matches) === 4) {
 				$use = $matches[3] . '\\' . $matches[2] . '\\' . $matches[1];
-			} else if ($matches[2] == 'Vendor') {
+			} elseif ($matches[2] == 'Vendor') {
 				$this->out(
 					__d('cake_console', '<info>Skip %s as it is a vendor library.</info>', $matches[1]),
 					1,