diff --git a/src/Shell/CommandListShell.php b/src/Shell/CommandListShell.php
index fb96bc127a1..ce4aac0f422 100644
--- a/src/Shell/CommandListShell.php
+++ b/src/Shell/CommandListShell.php
@@ -139,7 +139,7 @@ public function getOptionParser()
     {
         $parser = parent::getOptionParser();
 
-        $parser->description(
+        $parser->setDescription(
             'Get the list of available shells for this CakePHP application.'
         )->addOption('xml', [
             'help' => 'Get the listing as XML.',
diff --git a/src/Shell/CompletionShell.php b/src/Shell/CompletionShell.php
index 3e8bf106d09..12b45cd23c4 100644
--- a/src/Shell/CompletionShell.php
+++ b/src/Shell/CompletionShell.php
@@ -116,7 +116,7 @@ public function getOptionParser()
     {
         $parser = parent::getOptionParser();
 
-        $parser->description(
+        $parser->setDescription(
             'Used by shells like bash to autocomplete command name, options and arguments'
         )->addSubcommand('commands', [
             'help' => 'Output a list of available commands',
@@ -151,7 +151,7 @@ public function getOptionParser()
             ]
         ])->addSubcommand('fuzzy', [
             'help' => 'Guess autocomplete'
-        ])->epilog([
+        ])->setEpilog([
             'This command is not intended to be called manually',
         ]);
 
diff --git a/src/Shell/I18nShell.php b/src/Shell/I18nShell.php
index c6180f5975d..639ff0865ac 100644
--- a/src/Shell/I18nShell.php
+++ b/src/Shell/I18nShell.php
@@ -147,7 +147,7 @@ public function getOptionParser()
             ]
         ];
 
-        $parser->description(
+        $parser->setDescription(
             'I18n Shell generates .pot files(s) with translations.'
         )->addSubcommand('extract', [
             'help' => 'Extract the po translations from your application',
diff --git a/src/Shell/OrmCacheShell.php b/src/Shell/OrmCacheShell.php
index b056870289d..71e814c0174 100644
--- a/src/Shell/OrmCacheShell.php
+++ b/src/Shell/OrmCacheShell.php
@@ -71,7 +71,7 @@ public function clear($name = null)
         if (empty($name)) {
             $tables = $schema->listTables();
         }
-        $configName = $schema->cacheMetadata();
+        $configName = $schema->getCacheMetadata();
 
         foreach ($tables as $table) {
             $this->_io->verbose(sprintf(
@@ -102,7 +102,7 @@ protected function _getSchema()
                 'as it does not implement a "schemaCollection()" method.',
                 $this->params['connection']
             );
-            $this->error($msg);
+            $this->abort($msg);
 
             return false;
         }
@@ -112,7 +112,7 @@ protected function _getSchema()
             $source->cacheMetadata(true);
         }
 
-        return $source->schemaCollection();
+        return $source->getSchemaCollection();
     }
 
     /**
diff --git a/src/Shell/RoutesShell.php b/src/Shell/RoutesShell.php
index 003cc1b149d..451cd295b14 100644
--- a/src/Shell/RoutesShell.php
+++ b/src/Shell/RoutesShell.php
@@ -109,7 +109,7 @@ public function generate()
     public function getOptionParser()
     {
         $parser = parent::getOptionParser();
-        $parser->description(
+        $parser->setDescription(
             'Get the list of routes connected in this application. ' .
             'This tool also lets you test URL generation and URL parsing.'
         )->addSubcommand('check', [
diff --git a/src/Shell/ServerShell.php b/src/Shell/ServerShell.php
index 3775b80b7de..c379db23869 100644
--- a/src/Shell/ServerShell.php
+++ b/src/Shell/ServerShell.php
@@ -150,7 +150,7 @@ public function getOptionParser()
     {
         $parser = parent::getOptionParser();
 
-        $parser->description([
+        $parser->setDescription([
             'PHP Built-in Server for CakePHP',
             '<warning>[WARN] Don\'t use this in a production environment</warning>',
         ])->addOption('host', [