diff --git a/lib/actions/CodeDeployLambda.js b/lib/actions/CodeDeployLambda.js
index 2f82acf30..898e20bfa 100644
--- a/lib/actions/CodeDeployLambda.js
+++ b/lib/actions/CodeDeployLambda.js
@@ -9,7 +9,7 @@
 
 module.exports   = function(SPlugin, serverlessPath) {
   const path     = require('path'),
-    SError       = require(path.join(serverlessPath, 'ServerlessError')),
+    SError       = require(path.join(serverlessPath, 'Error')),
     SUtils       = require(path.join(serverlessPath, 'utils/index')),
     BbPromise    = require('bluebird'),
     Zip          = require('node-zip'),
diff --git a/lib/actions/CodePackageLambda.js b/lib/actions/CodePackageLambda.js
index 6b303783f..a581c2b27 100644
--- a/lib/actions/CodePackageLambda.js
+++ b/lib/actions/CodePackageLambda.js
@@ -11,7 +11,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path     = require('path'),
-    SError       = require(path.join(serverlessPath, 'ServerlessError')),
+    SError       = require(path.join(serverlessPath, 'Error')),
     SUtils       = require(path.join(serverlessPath, 'utils/index')),
     BbPromise    = require('bluebird'),
     fs           = require('fs'),
diff --git a/lib/actions/ComponentCreate.js b/lib/actions/ComponentCreate.js
index 0bc8b7709..b8c23478a 100644
--- a/lib/actions/ComponentCreate.js
+++ b/lib/actions/ComponentCreate.js
@@ -13,7 +13,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path   = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     SUtils     = require(path.join(serverlessPath, 'utils')),
     BbPromise  = require('bluebird'),
diff --git a/lib/actions/DashDeploy.js b/lib/actions/DashDeploy.js
index 9eea89d16..bd53f924b 100644
--- a/lib/actions/DashDeploy.js
+++ b/lib/actions/DashDeploy.js
@@ -19,7 +19,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path     = require('path'),
-    SError       = require(path.join(serverlessPath, 'ServerlessError')),
+    SError       = require(path.join(serverlessPath, 'Error')),
     SUtils       = require(path.join(serverlessPath, 'utils/index')),
     SCli         = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise    = require('bluebird'),
diff --git a/lib/actions/EndpointBuildApiGateway.js b/lib/actions/EndpointBuildApiGateway.js
index 2700641b1..d2ece72c3 100644
--- a/lib/actions/EndpointBuildApiGateway.js
+++ b/lib/actions/EndpointBuildApiGateway.js
@@ -8,7 +8,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path        = require('path'),
-    SError          = require(path.join(serverlessPath, 'ServerlessError')),
+    SError          = require(path.join(serverlessPath, 'Error')),
     SUtils          = require(path.join(serverlessPath, 'utils/index')),
     BbPromise       = require('bluebird'),
     async           = require('async'),
diff --git a/lib/actions/EndpointDeploy.js b/lib/actions/EndpointDeploy.js
index 4f64dbfdd..da3c7443b 100644
--- a/lib/actions/EndpointDeploy.js
+++ b/lib/actions/EndpointDeploy.js
@@ -20,7 +20,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path     = require('path'),
-    SError       = require(path.join(serverlessPath, 'ServerlessError')),
+    SError       = require(path.join(serverlessPath, 'Error')),
     SUtils       = require(path.join(serverlessPath, 'utils/index')),
     SCli         = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise    = require('bluebird'),
diff --git a/lib/actions/EndpointDeployApiGateway.js b/lib/actions/EndpointDeployApiGateway.js
index d7aca13d7..665d600b8 100644
--- a/lib/actions/EndpointDeployApiGateway.js
+++ b/lib/actions/EndpointDeployApiGateway.js
@@ -8,7 +8,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path     = require('path'),
-      SError     = require(path.join(serverlessPath, 'ServerlessError')),
+      SError     = require(path.join(serverlessPath, 'Error')),
       SUtils     = require(path.join(serverlessPath, 'utils/index')),
       BbPromise  = require('bluebird'),
       fs         = require('fs');
diff --git a/lib/actions/EnvGet.js b/lib/actions/EnvGet.js
index 6e683fb30..de0c4d74f 100644
--- a/lib/actions/EnvGet.js
+++ b/lib/actions/EnvGet.js
@@ -12,7 +12,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path     = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     SUtils     = require(path.join(serverlessPath, 'utils/index')),
     chalk      = require('chalk'),
diff --git a/lib/actions/EnvList.js b/lib/actions/EnvList.js
index 5028c9b24..faa71b7a5 100644
--- a/lib/actions/EnvList.js
+++ b/lib/actions/EnvList.js
@@ -11,7 +11,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path     = require('path'),
-      SError     = require(path.join(serverlessPath, 'ServerlessError')),
+      SError     = require(path.join(serverlessPath, 'Error')),
       SCli       = require(path.join(serverlessPath, 'utils/cli')),
       chalk      = require('chalk'),
       BbPromise  = require('bluebird'),
diff --git a/lib/actions/EnvSet.js b/lib/actions/EnvSet.js
index e95d0b7e9..513603d3a 100644
--- a/lib/actions/EnvSet.js
+++ b/lib/actions/EnvSet.js
@@ -7,7 +7,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path = require('path'),
-      SError  = require(path.join(serverlessPath, 'ServerlessError')),
+      SError  = require(path.join(serverlessPath, 'Error')),
       SCli    = require(path.join(serverlessPath, 'utils/cli')),
       BbPromise  = require('bluebird'),
       SUtils  = require(path.join(serverlessPath, 'utils'));
diff --git a/lib/actions/EnvUnset.js b/lib/actions/EnvUnset.js
index 085ea1d5d..a9175a545 100644
--- a/lib/actions/EnvUnset.js
+++ b/lib/actions/EnvUnset.js
@@ -7,7 +7,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path = require('path'),
-      SError  = require(path.join(serverlessPath, 'ServerlessError')),
+      SError  = require(path.join(serverlessPath, 'Error')),
       SCli    = require(path.join(serverlessPath, 'utils/cli')),
       BbPromise  = require('bluebird'),
       SUtils  = require(path.join(serverlessPath, 'utils'));
diff --git a/lib/actions/EventDeploy.js b/lib/actions/EventDeploy.js
index 8fe0b458c..01d9e902d 100644
--- a/lib/actions/EventDeploy.js
+++ b/lib/actions/EventDeploy.js
@@ -18,7 +18,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path     = require('path'),
-    SError       = require(path.join(serverlessPath, 'ServerlessError')),
+    SError       = require(path.join(serverlessPath, 'Error')),
     SUtils       = require(path.join(serverlessPath, 'utils/index')),
     SCli         = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise    = require('bluebird'),
diff --git a/lib/actions/EventDeployS3Lambda.js b/lib/actions/EventDeployS3Lambda.js
index ebc992026..de613e32a 100644
--- a/lib/actions/EventDeployS3Lambda.js
+++ b/lib/actions/EventDeployS3Lambda.js
@@ -13,7 +13,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path     = require('path'),
-    SError       = require(path.join(serverlessPath, 'ServerlessError')),
+    SError       = require(path.join(serverlessPath, 'Error')),
     SUtils       = require(path.join(serverlessPath, 'utils/index')),
     BbPromise    = require('bluebird');
 
diff --git a/lib/actions/EventDeploySNSLambda.js b/lib/actions/EventDeploySNSLambda.js
index beb403f6c..90bd547fc 100644
--- a/lib/actions/EventDeploySNSLambda.js
+++ b/lib/actions/EventDeploySNSLambda.js
@@ -13,7 +13,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path     = require('path'),
-    SError       = require(path.join(serverlessPath, 'ServerlessError')),
+    SError       = require(path.join(serverlessPath, 'Error')),
     SUtils       = require(path.join(serverlessPath, 'utils/index')),
     BbPromise    = require('bluebird');
 
diff --git a/lib/actions/EventDeployScheduledLambda.js b/lib/actions/EventDeployScheduledLambda.js
index b65b9db94..40590bd27 100644
--- a/lib/actions/EventDeployScheduledLambda.js
+++ b/lib/actions/EventDeployScheduledLambda.js
@@ -13,7 +13,7 @@
 module.exports = function (SPlugin, serverlessPath) {
 
   const path      = require('path'),
-        SError    = require(path.join(serverlessPath, 'ServerlessError')),
+        SError    = require(path.join(serverlessPath, 'Error')),
         SUtils    = require(path.join(serverlessPath, 'utils/index')),
         BbPromise = require('bluebird');
 
diff --git a/lib/actions/EventDeployStreamLambda.js b/lib/actions/EventDeployStreamLambda.js
index 2021dc1da..c9b4b2c64 100644
--- a/lib/actions/EventDeployStreamLambda.js
+++ b/lib/actions/EventDeployStreamLambda.js
@@ -14,7 +14,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path     = require('path'),
-    SError       = require(path.join(serverlessPath, 'ServerlessError')),
+    SError       = require(path.join(serverlessPath, 'Error')),
     SUtils       = require(path.join(serverlessPath, 'utils/index')),
     BbPromise    = require('bluebird');
 
diff --git a/lib/actions/FunctionCreate.js b/lib/actions/FunctionCreate.js
index 91ffab3b7..1b9cd1b99 100644
--- a/lib/actions/FunctionCreate.js
+++ b/lib/actions/FunctionCreate.js
@@ -13,7 +13,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path   = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise  = require('bluebird'),
     SUtils     = require(path.join(serverlessPath, 'utils'));
diff --git a/lib/actions/FunctionDeploy.js b/lib/actions/FunctionDeploy.js
index b0308b540..98c2b8a22 100644
--- a/lib/actions/FunctionDeploy.js
+++ b/lib/actions/FunctionDeploy.js
@@ -12,7 +12,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path     = require('path'),
-    SError       = require(path.join(serverlessPath, 'ServerlessError')),
+    SError       = require(path.join(serverlessPath, 'Error')),
     SUtils       = require(path.join(serverlessPath, 'utils/index')),
     SCli         = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise    = require('bluebird'),
diff --git a/lib/actions/FunctionLogs.js b/lib/actions/FunctionLogs.js
index b23558870..ed4d2c476 100644
--- a/lib/actions/FunctionLogs.js
+++ b/lib/actions/FunctionLogs.js
@@ -16,7 +16,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path     = require('path'),
-    SError       = require(path.join(serverlessPath, 'ServerlessError')),
+    SError       = require(path.join(serverlessPath, 'Error')),
     SUtils       = require(path.join(serverlessPath, 'utils/index')),
     SCli         = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise    = require('bluebird'),
diff --git a/lib/actions/FunctionRun.js b/lib/actions/FunctionRun.js
index 461488210..6cc91dd85 100644
--- a/lib/actions/FunctionRun.js
+++ b/lib/actions/FunctionRun.js
@@ -7,7 +7,7 @@
 
 module.exports    = function(SPlugin, serverlessPath) {
     const path      = require('path'),
-        SError      = require(path.join(serverlessPath, 'ServerlessError')),
+        SError      = require(path.join(serverlessPath, 'Error')),
         BbPromise   = require('bluebird'),
         chalk       = require('chalk'),
         SCli        = require( path.join( serverlessPath, 'utils', 'cli'));
diff --git a/lib/actions/FunctionRunLambdaNodeJs.js b/lib/actions/FunctionRunLambdaNodeJs.js
index 81fc146da..2f43959db 100644
--- a/lib/actions/FunctionRunLambdaNodeJs.js
+++ b/lib/actions/FunctionRunLambdaNodeJs.js
@@ -7,7 +7,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path    = require('path'),
-    SError      = require(path.join(serverlessPath, 'ServerlessError')),
+    SError      = require(path.join(serverlessPath, 'Error')),
     SUtils      = require(path.join(serverlessPath, 'utils')),
     SCli        = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise   = require('bluebird'),
diff --git a/lib/actions/FunctionRunLambdaPython2.js b/lib/actions/FunctionRunLambdaPython2.js
index 721e94135..558bcaadb 100644
--- a/lib/actions/FunctionRunLambdaPython2.js
+++ b/lib/actions/FunctionRunLambdaPython2.js
@@ -6,7 +6,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path    = require('path'),
-    SError      = require(path.join(serverlessPath, 'ServerlessError')),
+    SError      = require(path.join(serverlessPath, 'Error')),
     SUtils      = require(path.join(serverlessPath, 'utils')),
     spawnSync   = require('child_process').spawnSync,
     SCli        = require(path.join(serverlessPath, 'utils/cli')),
diff --git a/lib/actions/ModuleInstall.js b/lib/actions/ModuleInstall.js
index fb9eca01f..08218ad1f 100644
--- a/lib/actions/ModuleInstall.js
+++ b/lib/actions/ModuleInstall.js
@@ -14,7 +14,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path   = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     URL        = require('url'),
     Download   = require('download'),
diff --git a/lib/actions/PluginCreate.js b/lib/actions/PluginCreate.js
index a3df150f3..f84cecab4 100644
--- a/lib/actions/PluginCreate.js
+++ b/lib/actions/PluginCreate.js
@@ -12,7 +12,7 @@
 
 module.exports = function(SPlugin, serverlessPath) {
   const path   = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise  = require('bluebird'),
     SUtils     = require(path.join(serverlessPath, 'utils')),
diff --git a/lib/actions/ProjectInit.js b/lib/actions/ProjectInit.js
index 166bd168a..30189e027 100644
--- a/lib/actions/ProjectInit.js
+++ b/lib/actions/ProjectInit.js
@@ -19,7 +19,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path   = require('path'),
-    SError     = require( path.join( serverlessPath, 'ServerlessError' ) ),
+    SError     = require( path.join( serverlessPath, 'Error' ) ),
     SCli       = require( path.join( serverlessPath, 'utils/cli' ) ),
     SUtils     = require( path.join( serverlessPath, 'utils' ) ),
     BbPromise  = require('bluebird'),
diff --git a/lib/actions/ProjectInstall.js b/lib/actions/ProjectInstall.js
index 162329f2c..845b7a112 100644
--- a/lib/actions/ProjectInstall.js
+++ b/lib/actions/ProjectInstall.js
@@ -23,7 +23,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path   = require('path'),
-    SError     = require( path.join( serverlessPath, 'ServerlessError' ) ),
+    SError     = require( path.join( serverlessPath, 'Error' ) ),
     SCli       = require( path.join( serverlessPath, 'utils/cli' ) ),
     SUtils     = require( path.join( serverlessPath, 'utils' ) ),
     BbPromise  = require('bluebird'),
diff --git a/lib/actions/ProjectRemove.js b/lib/actions/ProjectRemove.js
index b14796cab..635f8ac16 100644
--- a/lib/actions/ProjectRemove.js
+++ b/lib/actions/ProjectRemove.js
@@ -11,7 +11,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path   = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     fs         = require('fs'),
     BbPromise  = require('bluebird'),
diff --git a/lib/actions/RegionCreate.js b/lib/actions/RegionCreate.js
index 943c4fa2c..400b2dc47 100644
--- a/lib/actions/RegionCreate.js
+++ b/lib/actions/RegionCreate.js
@@ -17,7 +17,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path   = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise  = require('bluebird'),
     SUtils     = require(path.join(serverlessPath, 'utils'));
diff --git a/lib/actions/RegionRemove.js b/lib/actions/RegionRemove.js
index 85a351157..b4c07a1f6 100644
--- a/lib/actions/RegionRemove.js
+++ b/lib/actions/RegionRemove.js
@@ -16,7 +16,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path     = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise  = require('bluebird'),
     fs         = BbPromise.promisifyAll(require('fs')),
diff --git a/lib/actions/ResourcesDeploy.js b/lib/actions/ResourcesDeploy.js
index 81f67cd35..8e6620eea 100644
--- a/lib/actions/ResourcesDeploy.js
+++ b/lib/actions/ResourcesDeploy.js
@@ -9,7 +9,7 @@ module.exports = function(SPlugin, serverlessPath) {
 
   const path     = require('path'),
     replaceall   = require('replaceall'),
-    SError       = require(path.join(serverlessPath, 'ServerlessError')),
+    SError       = require(path.join(serverlessPath, 'Error')),
     SCli         = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise    = require('bluebird'),
     _            = require('lodash'),
diff --git a/lib/actions/ResourcesDiff.js b/lib/actions/ResourcesDiff.js
index e229b9986..c819549bb 100644
--- a/lib/actions/ResourcesDiff.js
+++ b/lib/actions/ResourcesDiff.js
@@ -13,7 +13,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path     = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise  = require('bluebird'),
     fs         = BbPromise.promisifyAll(require('fs')),
diff --git a/lib/actions/ResourcesRemove.js b/lib/actions/ResourcesRemove.js
index 27967bc03..a89460847 100644
--- a/lib/actions/ResourcesRemove.js
+++ b/lib/actions/ResourcesRemove.js
@@ -8,7 +8,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path   = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     BbPromise  = require('bluebird'),
     SUtils     = require(path.join(serverlessPath, 'utils/index')),
diff --git a/lib/actions/StageCreate.js b/lib/actions/StageCreate.js
index dd1f06fab..a78c4ca98 100644
--- a/lib/actions/StageCreate.js
+++ b/lib/actions/StageCreate.js
@@ -14,7 +14,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path   = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     os         = require('os'),
     fs         = require('fs'),
diff --git a/lib/actions/StageRemove.js b/lib/actions/StageRemove.js
index 77209b1a0..588320cab 100644
--- a/lib/actions/StageRemove.js
+++ b/lib/actions/StageRemove.js
@@ -11,7 +11,7 @@
 module.exports = function(SPlugin, serverlessPath) {
 
   const path   = require('path'),
-    SError     = require(path.join(serverlessPath, 'ServerlessError')),
+    SError     = require(path.join(serverlessPath, 'Error')),
     SCli       = require(path.join(serverlessPath, 'utils/cli')),
     fs         = require('fs'),
     BbPromise  = require('bluebird'),