diff --git a/include/engine/datafacade/datafacade_base.hpp b/include/engine/datafacade/datafacade_base.hpp
index e737f2def..d64d7cb1c 100644
--- a/include/engine/datafacade/datafacade_base.hpp
+++ b/include/engine/datafacade/datafacade_base.hpp
@@ -8,7 +8,7 @@
 #include "engine/phantom_node.hpp"
 #include "extractor/turn_instructions.hpp"
 #include "util/integer_range.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/string_util.hpp"
 #include "util/typedefs.hpp"
 
diff --git a/include/extractor/raster_source.hpp b/include/extractor/raster_source.hpp
index 104462619..499e9a262 100644
--- a/include/extractor/raster_source.hpp
+++ b/include/extractor/raster_source.hpp
@@ -1,7 +1,7 @@
 #ifndef RASTER_SOURCE_HPP
 #define RASTER_SOURCE_HPP
 
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
diff --git a/include/storage/shared_datatype.hpp b/include/storage/shared_datatype.hpp
index 69e409e42..22f7bdec2 100644
--- a/include/storage/shared_datatype.hpp
+++ b/include/storage/shared_datatype.hpp
@@ -1,7 +1,7 @@
 #ifndef SHARED_DATA_TYPE_HPP
 #define SHARED_DATA_TYPE_HPP
 
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 
 #include <cstdint>
diff --git a/include/storage/shared_memory.hpp b/include/storage/shared_memory.hpp
index 7f14482e3..47238cfdf 100644
--- a/include/storage/shared_memory.hpp
+++ b/include/storage/shared_memory.hpp
@@ -1,7 +1,7 @@
 #ifndef SHARED_MEMORY_HPP
 #define SHARED_MEMORY_HPP
 
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>
diff --git a/include/util/osrm_exception.hpp b/include/util/exception.hpp
similarity index 88%
rename from include/util/osrm_exception.hpp
rename to include/util/exception.hpp
index 6c7c5e2f6..837bbfe87 100644
--- a/include/util/osrm_exception.hpp
+++ b/include/util/exception.hpp
@@ -1,5 +1,5 @@
-#ifndef OSRM_EXCEPTION_HPP
-#define OSRM_EXCEPTION_HPP
+#ifndef EXCEPTION_HPP
+#define EXCEPTION_HPP
 
 #include <exception>
 #include <string>
@@ -27,4 +27,4 @@ class exception final : public std::exception
 }
 }
 
-#endif /* OSRM_EXCEPTION_HPP */
+#endif /* EXCEPTION_HPP */
diff --git a/include/util/fingerprint_impl.hpp.in b/include/util/fingerprint_impl.hpp.in
index 1a52269d1..7b31d6dd7 100644
--- a/include/util/fingerprint_impl.hpp.in
+++ b/include/util/fingerprint_impl.hpp.in
@@ -1,4 +1,4 @@
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 
 #include <boost/uuid/name_generator.hpp>
 #include <boost/uuid/uuid_generators.hpp>
diff --git a/include/util/graph_loader.hpp b/include/util/graph_loader.hpp
index 224fb375b..233d7aa70 100644
--- a/include/util/graph_loader.hpp
+++ b/include/util/graph_loader.hpp
@@ -2,7 +2,7 @@
 #define GRAPH_LOADER_HPP
 
 #include "util/fingerprint.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "extractor/external_memory_node.hpp"
 #include "extractor/node_based_edge.hpp"
diff --git a/include/util/routed_options.hpp b/include/util/routed_options.hpp
index 070b0d694..c0b83b45b 100644
--- a/include/util/routed_options.hpp
+++ b/include/util/routed_options.hpp
@@ -3,7 +3,7 @@
 
 #include "util/ini_file.hpp"
 #include "util/version.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 
 #include <boost/any.hpp>
diff --git a/include/util/static_rtree.hpp b/include/util/static_rtree.hpp
index dbf0ca18c..e59948052 100644
--- a/include/util/static_rtree.hpp
+++ b/include/util/static_rtree.hpp
@@ -8,7 +8,7 @@
 
 #include "util/bearing.hpp"
 #include "util/integer_range.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/typedefs.hpp"
 
 #include "osrm/coordinate.hpp"
diff --git a/src/contractor/contractor.cpp b/src/contractor/contractor.cpp
index 6b01c564a..291ced449 100644
--- a/src/contractor/contractor.cpp
+++ b/src/contractor/contractor.cpp
@@ -10,7 +10,7 @@
 #include "util/io.hpp"
 #include "util/integer_range.hpp"
 #include "util/lua_util.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/string_util.hpp"
 #include "util/timing_util.hpp"
diff --git a/src/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp
index cc615c905..6ffbb4bea 100644
--- a/src/extractor/edge_based_graph_factory.cpp
+++ b/src/extractor/edge_based_graph_factory.cpp
@@ -6,7 +6,7 @@
 #include "util/lua_util.hpp"
 #include "util/simple_logger.hpp"
 #include "util/timing_util.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 
 #include "util/debug_geometry.hpp"
 
diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp
index 26f8d7eb8..ed9e259ea 100644
--- a/src/extractor/extraction_containers.cpp
+++ b/src/extractor/extraction_containers.cpp
@@ -4,7 +4,7 @@
 #include "util/coordinate_calculation.hpp"
 #include "util/range_table.hpp"
 
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/timing_util.hpp"
 #include "util/fingerprint.hpp"
diff --git a/src/extractor/restriction_parser.cpp b/src/extractor/restriction_parser.cpp
index 3df9e0754..3f1648563 100644
--- a/src/extractor/restriction_parser.cpp
+++ b/src/extractor/restriction_parser.cpp
@@ -3,7 +3,7 @@
 
 #include "extractor/external_memory_node.hpp"
 #include "util/lua_util.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 
 #include <boost/algorithm/string.hpp>
diff --git a/src/extractor/scripting_environment.cpp b/src/extractor/scripting_environment.cpp
index 247291f74..4fd77c1e1 100644
--- a/src/extractor/scripting_environment.cpp
+++ b/src/extractor/scripting_environment.cpp
@@ -7,7 +7,7 @@
 #include "extractor/external_memory_node.hpp"
 #include "extractor/raster_source.hpp"
 #include "util/lua_util.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/typedefs.hpp"
 
diff --git a/src/storage/storage.cpp b/src/storage/storage.cpp
index d5439c8c5..663b3a688 100644
--- a/src/storage/storage.cpp
+++ b/src/storage/storage.cpp
@@ -13,7 +13,7 @@
 #include "storage/shared_barriers.hpp"
 #include "storage/shared_memory.hpp"
 #include "util/fingerprint.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/typedefs.hpp"
 
diff --git a/src/tools/components.cpp b/src/tools/components.cpp
index 69e92cb3c..06baea021 100644
--- a/src/tools/components.cpp
+++ b/src/tools/components.cpp
@@ -6,7 +6,7 @@
 #include "util/fingerprint.hpp"
 #include "util/graph_loader.hpp"
 #include "util/make_unique.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 
 #include <boost/filesystem.hpp>
diff --git a/src/tools/io-benchmark.cpp b/src/tools/io-benchmark.cpp
index 8c08288a5..0ccf97ece 100644
--- a/src/tools/io-benchmark.cpp
+++ b/src/tools/io-benchmark.cpp
@@ -1,4 +1,4 @@
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/timing_util.hpp"
 
diff --git a/src/tools/store.cpp b/src/tools/store.cpp
index 7065cbb10..a1dc17c4a 100644
--- a/src/tools/store.cpp
+++ b/src/tools/store.cpp
@@ -1,5 +1,5 @@
 #include "storage/storage.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 #include "util/simple_logger.hpp"
 #include "util/typedefs.hpp"
 #include "util/ini_file.hpp"
diff --git a/src/util/osrm_exception.cpp b/src/util/exception.cpp
similarity index 95%
rename from src/util/osrm_exception.cpp
rename to src/util/exception.cpp
index 91ca7c4f5..394d8c07c 100644
--- a/src/util/osrm_exception.cpp
+++ b/src/util/exception.cpp
@@ -1,4 +1,4 @@
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 
 // This function exists to 'anchor' the class, and stop the compiler from
 // copying vtable and RTTI info into every object file that includes
diff --git a/unit_tests/extractor/raster_source.cpp b/unit_tests/extractor/raster_source.cpp
index 2160372f1..5ce93514e 100644
--- a/unit_tests/extractor/raster_source.cpp
+++ b/unit_tests/extractor/raster_source.cpp
@@ -1,6 +1,6 @@
 #include "extractor/raster_source.hpp"
 #include "util/typedefs.hpp"
-#include "util/osrm_exception.hpp"
+#include "util/exception.hpp"
 
 #include <osrm/coordinate.hpp>