diff --git a/.gitignore b/.gitignore
index b905eeafb..6a154a4b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,7 @@ Thumbs.db
 # build related files #
 #######################
 /build/
-/Util/finger_print.cpp
+/Util/fingerprint.cpp
 /Util/git_sha.cpp
 /cmake/postinst
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc8264cb5..02a353564 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,15 +33,15 @@ OPTION(BUILD_TOOLS "Build OSRM tools" OFF)
 include_directories(${CMAKE_SOURCE_DIR}/Include/)
 include_directories(${CMAKE_SOURCE_DIR}/third_party/)
 
-add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp finger_print.cpp.alwaysbuild
+add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/Util/fingerprint.cpp fingerprint.cpp.alwaysbuild
   COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
     -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FingerPrint-Config.cmake
   DEPENDS
-    ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp.in
-  COMMENT "Configuring finger_print.cpp"
+    ${CMAKE_SOURCE_DIR}/Util/fingerprint.cpp.in
+  COMMENT "Configuring fingerprint.cpp"
   VERBATIM)
 
-add_custom_target(FingerPrintConfigure DEPENDS ${CMAKE_SOURCE_DIR}/Util/finger_print.cpp)
+add_custom_target(FingerPrintConfigure DEPENDS ${CMAKE_SOURCE_DIR}/Util/fingerprint.cpp)
 add_custom_target(tests DEPENDS datastructure-tests algorithm-tests)
 add_custom_target(benchmarks DEPENDS rtree-bench)
 
@@ -88,7 +88,7 @@ set(
   ${HttpGlob}
 )
 add_library(COORDINATE OBJECT ${CoordinateGlob})
-add_library(FINGERPRINT OBJECT Util/finger_print.cpp)
+add_library(FINGERPRINT OBJECT Util/fingerprint.cpp)
 add_library(GITDESCRIPTION OBJECT Util/git_sha.cpp)
 add_library(OSRM ${OSRMSources} $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE> $<TARGET_OBJECTS:EXCEPTION>)
 add_dependencies(FINGERPRINT FingerPrintConfigure)
diff --git a/Util/finger_print.cpp.in b/Util/fingerprint.cpp.in
similarity index 99%
rename from Util/finger_print.cpp.in
rename to Util/fingerprint.cpp.in
index 989138417..6f9a6658f 100644
--- a/Util/finger_print.cpp.in
+++ b/Util/fingerprint.cpp.in
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "finger_print.hpp"
+#include "fingerprint.hpp"
 
 #include "osrm_exception.hpp"
 
diff --git a/Util/finger_print.hpp b/Util/fingerprint.hpp
similarity index 100%
rename from Util/finger_print.hpp
rename to Util/fingerprint.hpp
diff --git a/Util/graph_loader.hpp b/Util/graph_loader.hpp
index 948b1ec39..bbf9d5fbb 100644
--- a/Util/graph_loader.hpp
+++ b/Util/graph_loader.hpp
@@ -33,8 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../data_structures/import_edge.hpp"
 #include "../data_structures/query_node.hpp"
 #include "../data_structures/restriction.hpp"
+#include "../Util/fingerprint.hpp"
 #include "../Util/simple_logger.hpp"
-#include "../Util/finger_print.hpp"
 #include "../typedefs.h"
 
 #include <boost/assert.hpp>
diff --git a/cmake/FingerPrint-Config.cmake b/cmake/FingerPrint-Config.cmake
index 710368d7b..7d0de9122 100644
--- a/cmake/FingerPrint-Config.cmake
+++ b/cmake/FingerPrint-Config.cmake
@@ -1,4 +1,4 @@
-set(OLDFILE ${SOURCE_DIR}/Util/FingerPrint.cpp)
+set(OLDFILE ${SOURCE_DIR}/Util/fingerprint.cpp)
 if (EXISTS ${OLDFILE})
 	file(REMOVE_RECURSE ${OLDFILE})
 endif()
@@ -7,4 +7,4 @@ file(MD5 ${SOURCE_DIR}/data_structures/static_rtree.hpp MD5RTREE)
 file(MD5 ${SOURCE_DIR}/Util/graph_loader.hpp MD5GRAPH)
 file(MD5 ${SOURCE_DIR}/Server/DataStructures/InternalDataFacade.h MD5OBJECTS)
 
-CONFIGURE_FILE( ${SOURCE_DIR}/Util/finger_print.cpp.in ${SOURCE_DIR}/Util/finger_print.cpp )
+CONFIGURE_FILE( ${SOURCE_DIR}/Util/fingerprint.cpp.in ${SOURCE_DIR}/Util/fingerprint.cpp )
diff --git a/datastore.cpp b/datastore.cpp
index 758013b44..011fa09b6 100644
--- a/datastore.cpp
+++ b/datastore.cpp
@@ -40,7 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Util/DataStoreOptions.h"
 #include "Util/simple_logger.hpp"
 #include "Util/osrm_exception.hpp"
-#include "Util/finger_print.hpp"
+#include "Util/fingerprint.hpp"
 #include "typedefs.h"
 
 #include <osrm/coordinate.hpp>
diff --git a/extractor/extraction_containers.hpp b/extractor/extraction_containers.hpp
index 2dfbcd523..68df14cff 100644
--- a/extractor/extraction_containers.hpp
+++ b/extractor/extraction_containers.hpp
@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "first_and_last_segment_of_way.hpp"
 #include "../data_structures/external_memory_node.hpp"
 #include "../data_structures/restriction.hpp"
-#include "../Util/finger_print.hpp"
+#include "../Util/fingerprint.hpp"
 
 #include <stxxl/vector>
 
diff --git a/tools/components.cpp b/tools/components.cpp
index 79d301762..3618258ee 100644
--- a/tools/components.cpp
+++ b/tools/components.cpp
@@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../typedefs.h"
 #include "../algorithms/tiny_components.hpp"
 #include "../data_structures/dynamic_graph.hpp"
+#include "../Util/fingerprint.hpp"
 #include "../Util/graph_loader.hpp"
 #include "../Util/make_unique.hpp"
 #include "../Util/osrm_exception.hpp"
 #include "../Util/simple_logger.hpp"
-#include "../Util/finger_print.hpp"
 
 #include <boost/filesystem.hpp>