diff --git a/almanach/adapters/api_route_v1.py b/almanach/adapters/api_route_v1.py
index 4154d51..72202bc 100644
--- a/almanach/adapters/api_route_v1.py
+++ b/almanach/adapters/api_route_v1.py
@@ -22,7 +22,7 @@ from flask import Blueprint, Response, request
 from werkzeug.wrappers import BaseResponse
 
 from almanach import config
-from almanach.common.DateFormatException import DateFormatException
+from almanach.common.date_format_exception import DateFormatException
 
 api = Blueprint("api", __name__)
 controller = None
diff --git a/almanach/adapters/database_adapter.py b/almanach/adapters/database_adapter.py
index 5010e22..9c56890 100644
--- a/almanach/adapters/database_adapter.py
+++ b/almanach/adapters/database_adapter.py
@@ -17,8 +17,8 @@ import pymongo
 
 from pymongo.errors import ConfigurationError
 from almanach import config
-from almanach.common.AlmanachException import AlmanachException
-from almanach.common.VolumeTypeNotFoundException import VolumeTypeNotFoundException
+from almanach.common.almanach_exception import AlmanachException
+from almanach.common.volume_type_not_found_exception import VolumeTypeNotFoundException
 from almanach.core.model import build_entity_from_dict, VolumeType
 from pymongomodem.utils import decode_output, encode_input
 
diff --git a/almanach/common/AlmanachException.py b/almanach/common/almanach_exception.py
similarity index 100%
rename from almanach/common/AlmanachException.py
rename to almanach/common/almanach_exception.py
diff --git a/almanach/common/DateFormatException.py b/almanach/common/date_format_exception.py
similarity index 100%
rename from almanach/common/DateFormatException.py
rename to almanach/common/date_format_exception.py
diff --git a/almanach/common/VolumeTypeNotFoundException.py b/almanach/common/volume_type_not_found_exception.py
similarity index 100%
rename from almanach/common/VolumeTypeNotFoundException.py
rename to almanach/common/volume_type_not_found_exception.py
diff --git a/almanach/config.py b/almanach/config.py
index 64bcc32..d094bc8 100644
--- a/almanach/config.py
+++ b/almanach/config.py
@@ -16,7 +16,7 @@ import ConfigParser
 import pkg_resources
 import os.path as Path
 
-from almanach.common.AlmanachException import AlmanachException
+from almanach.common.almanach_exception import AlmanachException
 
 configuration = ConfigParser.RawConfigParser()
 
diff --git a/almanach/core/controller.py b/almanach/core/controller.py
index 3119485..b61fa32 100644
--- a/almanach/core/controller.py
+++ b/almanach/core/controller.py
@@ -19,7 +19,7 @@ from datetime import timedelta
 from dateutil import parser as date_parser
 from pkg_resources import get_distribution
 
-from almanach.common.DateFormatException import DateFormatException
+from almanach.common.date_format_exception import DateFormatException
 from almanach.core.model import Instance, Volume, VolumeType
 from almanach import config
 
diff --git a/tests/adapters/test_database_adapter.py b/tests/adapters/test_database_adapter.py
index c507aa8..4399d35 100644
--- a/tests/adapters/test_database_adapter.py
+++ b/tests/adapters/test_database_adapter.py
@@ -21,8 +21,8 @@ from hamcrest import assert_that, contains_inanyorder
 from pymongo import MongoClient
 
 from almanach.adapters.database_adapter import DatabaseAdapter
-from almanach.common.VolumeTypeNotFoundException import VolumeTypeNotFoundException
-from almanach.common.AlmanachException import AlmanachException
+from almanach.common.volume_type_not_found_exception import VolumeTypeNotFoundException
+from almanach.common.almanach_exception import AlmanachException
 from almanach import config
 from almanach.core.model import todict
 from tests.builder import a, instance, volume, volume_type
diff --git a/tests/api_test.py b/tests/api_test.py
index e91979f..998042f 100644
--- a/tests/api_test.py
+++ b/tests/api_test.py
@@ -22,8 +22,8 @@ from flexmock import flexmock, flexmock_teardown
 from hamcrest import assert_that, has_key, equal_to, has_length, has_entry, has_entries
 
 from almanach import config
-from almanach.common.DateFormatException import DateFormatException
-from almanach.common.AlmanachException import AlmanachException
+from almanach.common.date_format_exception import DateFormatException
+from almanach.common.almanach_exception import AlmanachException
 from almanach.adapters import api_route_v1 as api_route
 
 from tests.builder import a, instance, volume_type
diff --git a/tests/core/test_controller.py b/tests/core/test_controller.py
index 955b76b..892bb13 100644
--- a/tests/core/test_controller.py
+++ b/tests/core/test_controller.py
@@ -21,7 +21,7 @@ from flexmock import flexmock, flexmock_teardown
 from nose.tools import assert_raises
 
 from almanach import config
-from almanach.common.DateFormatException import DateFormatException
+from almanach.common.date_format_exception import DateFormatException
 from almanach.core.controller import Controller
 from almanach.core.model import Instance, Volume
 from tests.builder import a, instance, volume, volume_type