diff --git a/lib/classes/Service.js b/lib/classes/service.js
similarity index 100%
rename from lib/classes/Service.js
rename to lib/classes/service.js
diff --git a/lib/plugins/aws/lib/naming.js b/lib/plugins/aws/lib/naming.js
index 0fad307f6..d6fdd19c6 100644
--- a/lib/plugins/aws/lib/naming.js
+++ b/lib/plugins/aws/lib/naming.js
@@ -143,7 +143,7 @@ module.exports = {
   extractAuthorizerNameFromArn(functionArn) {
     const splitArn = functionArn.split(':');
     // TODO the following two lines assumes default function naming?  Is there a better way?
-    // TODO (see ~/lib/classes/Service.js:~155)
+    // TODO (see ~/lib/classes/service.js:~155)
     const splitName = splitArn[splitArn.length - 1].split('-');
     return splitName[splitName.length - 1];
   },
diff --git a/lib/serverless.js b/lib/serverless.js
index c5fe13d95..a66eb37be 100644
--- a/lib/serverless.js
+++ b/lib/serverless.js
@@ -13,7 +13,7 @@ const Config = require('./classes/config');
 const YamlParser = require('./classes/YamlParser');
 const PluginManager = require('./classes/PluginManager');
 const Utils = require('./classes/Utils');
-const Service = require('./classes/Service');
+const Service = require('./classes/service');
 const ConfigSchemaHandler = require('./classes/ConfigSchemaHandler');
 const ServerlessError = require('./serverless-error');
 const version = require('./../package.json').version;
diff --git a/test/unit/lib/classes/Service.test.js b/test/unit/lib/classes/service.test.js
similarity index 100%
rename from test/unit/lib/classes/Service.test.js
rename to test/unit/lib/classes/service.test.js
diff --git a/test/unit/lib/serverless.test.js b/test/unit/lib/serverless.test.js
index 3c861fc6f..86e883ae5 100644
--- a/test/unit/lib/serverless.test.js
+++ b/test/unit/lib/serverless.test.js
@@ -12,7 +12,7 @@ const semverRegex = require('semver-regex');
 const YamlParser = require('../../../lib/classes/YamlParser');
 const PluginManager = require('../../../lib/classes/PluginManager');
 const Utils = require('../../../lib/classes/Utils');
-const Service = require('../../../lib/classes/Service');
+const Service = require('../../../lib/classes/service');
 const ConfigSchemaHandler = require('../../../lib/classes/ConfigSchemaHandler');
 const CLI = require('../../../lib/classes/cli');
 const ServerlessError = require('../../../lib/serverless-error');