diff --git a/lib/utils/config/index.js b/lib/utils/config/index.js
index 806664f04..33753dcf9 100644
--- a/lib/utils/config/index.js
+++ b/lib/utils/config/index.js
@@ -9,10 +9,12 @@ const fileExistsSync = require('../fs/fileExistsSync');
 const readFileSync = require('../fs/readFileSync');
 const initialSetup = require('./initialSetup');
 
-let serverlessrcPath = p.join(os.homedir(), '.serverlessrc');
+let rcFileBase = 'serverless';
+let serverlessrcPath = p.join(os.homedir(), `.${rcFileBase}rc`);
 
 if (process.env.SERVERLESS_PLATFORM_STAGE && process.env.SERVERLESS_PLATFORM_STAGE !== 'prod') {
-  serverlessrcPath = p.join(os.homedir(), '.serverlessdevrc');
+  rcFileBase = 'serverlessdev';
+  serverlessrcPath = p.join(os.homedir(), `.${rcFileBase}rc`);
 }
 
 function createConfig() {
@@ -48,7 +50,8 @@ function getConfig() {
     createConfig();
   }
   // then return config merged via rc module
-  return require('rc')('serverless'); // eslint-disable-line
+
+  return require('rc')(rcFileBase); // eslint-disable-line
 }
 
 function getGlobalConfig() {