diff --git a/packages/unleash-api/lib/db/dbPool.js b/packages/unleash-api/lib/db/db-pool.js
similarity index 100%
rename from packages/unleash-api/lib/db/dbPool.js
rename to packages/unleash-api/lib/db/db-pool.js
diff --git a/packages/unleash-api/lib/db/feature.js b/packages/unleash-api/lib/db/feature.js
index 296e77f391..0c8f56451b 100644
--- a/packages/unleash-api/lib/db/feature.js
+++ b/packages/unleash-api/lib/db/feature.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const eventType = require('../eventType');
+const eventType = require('../event-type');
 const logger = require('../logger');
-const NotFoundError = require('../error/NotFoundError');
+const NotFoundError = require('../error/notfound-error');
 const FEATURE_COLUMNS = ['name', 'description', 'enabled', 'strategies'];
 
 module.exports = function (db, eventStore) {
diff --git a/packages/unleash-api/lib/db/strategy.js b/packages/unleash-api/lib/db/strategy.js
index e53abfc4a7..cc582d3df1 100644
--- a/packages/unleash-api/lib/db/strategy.js
+++ b/packages/unleash-api/lib/db/strategy.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const eventType = require('../eventType');
+const eventType = require('../event-type');
 const logger = require('../logger');
-const NotFoundError = require('../error/NotFoundError');
+const NotFoundError = require('../error/notfound-error');
 const STRATEGY_COLUMNS = ['name', 'description', 'parameters_template'];
 
 module.exports = function (db, eventStore) {
diff --git a/packages/unleash-api/lib/error/NameExistsError.js b/packages/unleash-api/lib/error/name-exists-error.js
similarity index 100%
rename from packages/unleash-api/lib/error/NameExistsError.js
rename to packages/unleash-api/lib/error/name-exists-error.js
diff --git a/packages/unleash-api/lib/error/NotFoundError.js b/packages/unleash-api/lib/error/notfound-error.js
similarity index 100%
rename from packages/unleash-api/lib/error/NotFoundError.js
rename to packages/unleash-api/lib/error/notfound-error.js
diff --git a/packages/unleash-api/lib/error/validateRequest.js b/packages/unleash-api/lib/error/validate-request.js
similarity index 85%
rename from packages/unleash-api/lib/error/validateRequest.js
rename to packages/unleash-api/lib/error/validate-request.js
index 2430e5cc33..bbc51e1543 100644
--- a/packages/unleash-api/lib/error/validateRequest.js
+++ b/packages/unleash-api/lib/error/validate-request.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const BPromise = require('bluebird');
-const ValidationError = require('./ValidationError');
+const ValidationError = require('./validation-error');
 
 function validateRequest (req) {
     return new BPromise((resolve, reject) => {
diff --git a/packages/unleash-api/lib/error/ValidationError.js b/packages/unleash-api/lib/error/validation-error.js
similarity index 100%
rename from packages/unleash-api/lib/error/ValidationError.js
rename to packages/unleash-api/lib/error/validation-error.js
diff --git a/packages/unleash-api/lib/eventDiffer.js b/packages/unleash-api/lib/event-differ.js
similarity index 97%
rename from packages/unleash-api/lib/eventDiffer.js
rename to packages/unleash-api/lib/event-differ.js
index 9b12edb5b5..4d87028728 100644
--- a/packages/unleash-api/lib/eventDiffer.js
+++ b/packages/unleash-api/lib/event-differ.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const eventType = require('./eventType');
+const eventType = require('./event-type');
 const diff = require('deep-diff').diff;
 
 const strategyTypes = [
diff --git a/packages/unleash-api/lib/eventStore.js b/packages/unleash-api/lib/event-store.js
similarity index 100%
rename from packages/unleash-api/lib/eventStore.js
rename to packages/unleash-api/lib/event-store.js
diff --git a/packages/unleash-api/lib/eventType.js b/packages/unleash-api/lib/event-type.js
similarity index 100%
rename from packages/unleash-api/lib/eventType.js
rename to packages/unleash-api/lib/event-type.js
diff --git a/packages/unleash-api/lib/extractUser.js b/packages/unleash-api/lib/extract-user.js
similarity index 100%
rename from packages/unleash-api/lib/extractUser.js
rename to packages/unleash-api/lib/extract-user.js
diff --git a/packages/unleash-api/lib/routes/event.js b/packages/unleash-api/lib/routes/event.js
index 94cb2974ae..7f77507511 100644
--- a/packages/unleash-api/lib/routes/event.js
+++ b/packages/unleash-api/lib/routes/event.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const eventDiffer = require('../eventDiffer');
+const eventDiffer = require('../event-differ');
 const version = 1;
 
 module.exports = function (app, config) {
diff --git a/packages/unleash-api/lib/routes/feature-archive.js b/packages/unleash-api/lib/routes/feature-archive.js
index e6fd6a8893..56504c3455 100644
--- a/packages/unleash-api/lib/routes/feature-archive.js
+++ b/packages/unleash-api/lib/routes/feature-archive.js
@@ -1,9 +1,9 @@
 'use strict';
 
 const logger = require('../logger');
-const eventType = require('../eventType');
-const ValidationError = require('../error/ValidationError');
-const validateRequest = require('../error/validateRequest');
+const eventType = require('../event-type');
+const ValidationError = require('../error/validation-error');
+const validateRequest = require('../error/validate-request');
 
 module.exports = function (app, config) {
     const featureDb = config.featureDb;
diff --git a/packages/unleash-api/lib/routes/feature.js b/packages/unleash-api/lib/routes/feature.js
index 0bf8582c02..0c03044d4e 100644
--- a/packages/unleash-api/lib/routes/feature.js
+++ b/packages/unleash-api/lib/routes/feature.js
@@ -2,12 +2,12 @@
 
 const BPromise = require('bluebird');
 const logger = require('../logger');
-const eventType = require('../eventType');
-const NameExistsError = require('../error/NameExistsError');
-const NotFoundError = require('../error/NotFoundError');
-const ValidationError = require('../error/ValidationError');
-const validateRequest = require('../error/validateRequest');
-const extractUser = require('../extractUser');
+const eventType = require('../event-type');
+const NameExistsError = require('../error/name-exists-error');
+const NotFoundError = require('../error/notfound-error');
+const ValidationError = require('../error/validation-error.js');
+const validateRequest = require('../error/validate-request');
+const extractUser = require('../extract-user');
 
 const legacyFeatureMapper = require('../helper/legacy-feature-mapper');
 const version = 1;
diff --git a/packages/unleash-api/lib/routes/strategy.js b/packages/unleash-api/lib/routes/strategy.js
index 61ed76257f..2c3eeeb2d6 100644
--- a/packages/unleash-api/lib/routes/strategy.js
+++ b/packages/unleash-api/lib/routes/strategy.js
@@ -1,13 +1,13 @@
 'use strict';
 
 const BPromise = require('bluebird');
-const eventType = require('../eventType');
+const eventType = require('../event-type');
 const logger = require('../logger');
-const NameExistsError = require('../error/NameExistsError');
-const ValidationError = require('../error/ValidationError');
-const NotFoundError = require('../error/NotFoundError');
-const validateRequest = require('../error/validateRequest');
-const extractUser = require('../extractUser');
+const NameExistsError = require('../error/name-exists-error');
+const ValidationError = require('../error/validation-error.js');
+const NotFoundError = require('../error/notfound-error');
+const validateRequest = require('../error/validate-request');
+const extractUser = require('../extract-user');
 const version = 1;
 
 module.exports = function (app, config) {
diff --git a/packages/unleash-api/server-impl.js b/packages/unleash-api/server-impl.js
index ef18610da8..1c228e4096 100644
--- a/packages/unleash-api/server-impl.js
+++ b/packages/unleash-api/server-impl.js
@@ -10,11 +10,11 @@ const DEFAULT_OPTIONS = {
 };
 
 function createApp (options) {
-    const db = require('./lib/db/dbPool')(options.databaseUri);
+    const db = require('./lib/db/db-pool')(options.databaseUri);
 
     // Database dependecies (statefull)
     const eventDb = require('./lib/db/event')(db);
-    const EventStore = require('./lib/eventStore');
+    const EventStore = require('./lib/event-store');
     const eventStore = new EventStore(eventDb);
     const featureDb = require('./lib/db/feature')(db, eventStore);
     const strategyDb = require('./lib/db/strategy')(db, eventStore);
diff --git a/packages/unleash-api/test/e2e/databaseConfig.js b/packages/unleash-api/test/e2e/database-config.js
similarity index 100%
rename from packages/unleash-api/test/e2e/databaseConfig.js
rename to packages/unleash-api/test/e2e/database-config.js
diff --git a/packages/unleash-api/test/e2e/eventApiSpec.js b/packages/unleash-api/test/e2e/event-api.test.js
similarity index 88%
rename from packages/unleash-api/test/e2e/eventApiSpec.js
rename to packages/unleash-api/test/e2e/event-api.test.js
index 9a1986b4e2..a8298fba4a 100644
--- a/packages/unleash-api/test/e2e/eventApiSpec.js
+++ b/packages/unleash-api/test/e2e/event-api.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('./specHelper').request;
+const request = require('./test-helper').request;
 
 describe('The event api', () => {
     it('returns events', done => {
diff --git a/packages/unleash-api/test/e2e/featureApiSpec.js b/packages/unleash-api/test/e2e/feature-api.test.js
similarity index 99%
rename from packages/unleash-api/test/e2e/featureApiSpec.js
rename to packages/unleash-api/test/e2e/feature-api.test.js
index 1226ec308c..2b338af228 100644
--- a/packages/unleash-api/test/e2e/featureApiSpec.js
+++ b/packages/unleash-api/test/e2e/feature-api.test.js
@@ -2,7 +2,7 @@
 
 const logger = require('../../lib/logger');
 const assert     = require('assert');
-const specHelper = require('./specHelper');
+const specHelper = require('./test-helper');
 const request    = specHelper.request;
 const stringify  = function (o) {
     return JSON.stringify(o, null, ' ');
diff --git a/packages/unleash-api/test/e2e/featureArchiveApiSpec.js b/packages/unleash-api/test/e2e/feature-archive-api.test.js
similarity index 96%
rename from packages/unleash-api/test/e2e/featureArchiveApiSpec.js
rename to packages/unleash-api/test/e2e/feature-archive-api.test.js
index 20957599ea..fcfe4d4d87 100644
--- a/packages/unleash-api/test/e2e/featureArchiveApiSpec.js
+++ b/packages/unleash-api/test/e2e/feature-archive-api.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const assert     = require('assert');
-const specHelper = require('./specHelper');
+const specHelper = require('./test-helper');
 const request    = specHelper.request;
 const stringify  = function (o) {
     return JSON.stringify(o, null, ' ');
diff --git a/packages/unleash-api/test/e2e/routerSpec.js b/packages/unleash-api/test/e2e/router.test.js
similarity index 88%
rename from packages/unleash-api/test/e2e/routerSpec.js
rename to packages/unleash-api/test/e2e/router.test.js
index 48b2e3971f..c5d853778c 100644
--- a/packages/unleash-api/test/e2e/routerSpec.js
+++ b/packages/unleash-api/test/e2e/router.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const specHelper = require('./specHelper');
+const specHelper = require('./test-helper');
 const request = specHelper.request;
 
 describe('The routes', () => {
diff --git a/packages/unleash-api/test/e2e/strategyApiSpec.js b/packages/unleash-api/test/e2e/strategy-api.test.js
similarity index 97%
rename from packages/unleash-api/test/e2e/strategyApiSpec.js
rename to packages/unleash-api/test/e2e/strategy-api.test.js
index 82b80a7f31..82b8fcb5d9 100644
--- a/packages/unleash-api/test/e2e/strategyApiSpec.js
+++ b/packages/unleash-api/test/e2e/strategy-api.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const specHelper = require('./specHelper');
+const specHelper = require('./test-helper');
 const request    = specHelper.request;
 
 describe('The strategy api', () => {
diff --git a/packages/unleash-api/test/e2e/specHelper.js b/packages/unleash-api/test/e2e/test-helper.js
similarity index 94%
rename from packages/unleash-api/test/e2e/specHelper.js
rename to packages/unleash-api/test/e2e/test-helper.js
index e6bc71fe77..9d83c78e12 100644
--- a/packages/unleash-api/test/e2e/specHelper.js
+++ b/packages/unleash-api/test/e2e/test-helper.js
@@ -4,10 +4,10 @@ process.env.NODE_ENV = 'test';
 
 const BPromise = require('bluebird');
 let request = require('supertest');
-const databaseUri = require('./databaseConfig').getDatabaseUri();
-const knex = require('../../lib/db/dbPool')(databaseUri);
+const databaseUri = require('./database-config').getDatabaseUri();
+const knex = require('../../lib/db/db-pool')(databaseUri);
 const eventDb = require('../../lib/db/event')(knex);
-const EventStore = require('../../lib/eventStore');
+const EventStore = require('../../lib/event-store');
 const eventStore = new EventStore(eventDb);
 const featureDb = require('../../lib/db/feature')(knex, eventStore);
 const strategyDb = require('../../lib/db/strategy')(knex, eventStore);
diff --git a/packages/unleash-api/test/unit/eventDiffer.test.js b/packages/unleash-api/test/unit/event-differ.test.js
similarity index 96%
rename from packages/unleash-api/test/unit/eventDiffer.test.js
rename to packages/unleash-api/test/unit/event-differ.test.js
index 38b6597900..ba607677e5 100644
--- a/packages/unleash-api/test/unit/eventDiffer.test.js
+++ b/packages/unleash-api/test/unit/event-differ.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const eventDiffer = require('../../lib/eventDiffer');
-const eventType   = require('../../lib/eventType');
+const eventDiffer = require('../../lib/event-differ');
+const eventType   = require('../../lib/event-type');
 const assert      = require('assert');
 
 describe('eventDiffer', () => {