diff --git a/Algorithms/douglas_peucker.cpp b/Algorithms/douglas_peucker.cpp
index 789983e68f3..7e11c7970fe 100644
--- a/Algorithms/douglas_peucker.cpp
+++ b/Algorithms/douglas_peucker.cpp
@@ -27,8 +27,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "douglas_peucker.hpp"
 
-#include "../DataStructures/Range.h"
 #include "../DataStructures/SegmentInformation.h"
+#include "../Util/integer_range.hpp"
 
 #include <osrm/Coordinate.h>
 
diff --git a/Algorithms/tiny_components.hpp b/Algorithms/tiny_components.hpp
index 666aad9cf18..8e7b8f01871 100644
--- a/Algorithms/tiny_components.hpp
+++ b/Algorithms/tiny_components.hpp
@@ -34,10 +34,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../DataStructures/ImportEdge.h"
 #include "../DataStructures/QueryNode.h"
 #include "../DataStructures/Percent.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/Restriction.h"
 #include "../DataStructures/TurnInstructions.h"
 
+#include "../Util/integer_range.hpp"
 #include "../Util/OSRMException.h"
 #include "../Util/simple_logger.hpp"
 #include "../Util/StdHashExtensions.h"
diff --git a/Contractor/Contractor.h b/Contractor/Contractor.h
index 9e1214f630d..06e2c1139cd 100644
--- a/Contractor/Contractor.h
+++ b/Contractor/Contractor.h
@@ -33,9 +33,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../DataStructures/DynamicGraph.h"
 #include "../DataStructures/Percent.h"
 #include "../DataStructures/QueryEdge.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/XORFastHash.h"
 #include "../DataStructures/XORFastHashStorage.h"
+#include "../Util/integer_range.hpp"
 #include "../Util/simple_logger.hpp"
 #include "../Util/StringUtil.h"
 #include "../Util/TimingUtil.h"
diff --git a/Contractor/EdgeBasedGraphFactory.cpp b/Contractor/EdgeBasedGraphFactory.cpp
index 64681210e0a..5dcb7fd4fc2 100644
--- a/Contractor/EdgeBasedGraphFactory.cpp
+++ b/Contractor/EdgeBasedGraphFactory.cpp
@@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "EdgeBasedGraphFactory.h"
 #include "../Algorithms/bfs_components.hpp"
 #include "../DataStructures/Percent.h"
-#include "../DataStructures/Range.h"
 #include "../Util/compute_angle.hpp"
+#include "../Util/integer_range.hpp"
 #include "../Util/LuaUtil.h"
 #include "../Util/simple_logger.hpp"
 #include "../Util/TimingUtil.h"
diff --git a/Contractor/Prepare.cpp b/Contractor/Prepare.cpp
index 23606f1c21d..29329cc801e 100644
--- a/Contractor/Prepare.cpp
+++ b/Contractor/Prepare.cpp
@@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "../Algorithms/crc32_processor.hpp"
 #include "../DataStructures/DeallocatingVector.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/StaticRTree.h"
 #include "../DataStructures/RestrictionMap.h"
 
 #include "../Util/GitDescription.h"
+#include "../Util/integer_range.hpp"
 #include "../Util/LuaUtil.h"
 #include "../Util/make_unique.hpp"
 #include "../Util/OSRMException.h"
diff --git a/DataStructures/DeallocatingVector.h b/DataStructures/DeallocatingVector.h
index 422dd5f19d9..415fa69d3fe 100644
--- a/DataStructures/DeallocatingVector.h
+++ b/DataStructures/DeallocatingVector.h
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef DEALLOCATINGVECTOR_H_
 #define DEALLOCATINGVECTOR_H_
 
-#include "Range.h"
+#include "../Util/integer_range.hpp"
 
 #include <boost/iterator/iterator_facade.hpp>
 
diff --git a/DataStructures/DynamicGraph.h b/DataStructures/DynamicGraph.h
index fcdd620bca5..d9917407ba3 100644
--- a/DataStructures/DynamicGraph.h
+++ b/DataStructures/DynamicGraph.h
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define DYNAMICGRAPH_H
 
 #include "DeallocatingVector.h"
-#include "Range.h"
+#include "../Util/integer_range.hpp"
 
 #include <boost/assert.hpp>
 
diff --git a/DataStructures/RangeTable.h b/DataStructures/RangeTable.h
index 46333aefb5c..0c235b4eddd 100644
--- a/DataStructures/RangeTable.h
+++ b/DataStructures/RangeTable.h
@@ -1,7 +1,7 @@
 #ifndef RANGE_TABLE_H_
 #define RANGE_TABLE_H_
 
-#include "Range.h"
+#include "../Util/integer_range.hpp"
 #include "SharedMemoryFactory.h"
 #include "SharedMemoryVectorWrapper.h"
 
diff --git a/DataStructures/StaticGraph.h b/DataStructures/StaticGraph.h
index 456acfe32e9..d57d0b2ee3d 100644
--- a/DataStructures/StaticGraph.h
+++ b/DataStructures/StaticGraph.h
@@ -29,8 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define STATIC_GRAPH_H
 
 #include "Percent.h"
-#include "Range.h"
 #include "SharedMemoryVectorWrapper.h"
+#include "../Util/integer_range.hpp"
 #include "../typedefs.h"
 
 #include <boost/assert.hpp>
diff --git a/Descriptors/JSONDescriptor.h b/Descriptors/JSONDescriptor.h
index 19ba59ba5fd..8f1bbdac5f8 100644
--- a/Descriptors/JSONDescriptor.h
+++ b/Descriptors/JSONDescriptor.h
@@ -33,10 +33,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Algorithms/object_encoder.hpp"
 #include "../Algorithms/route_name_extraction.hpp"
 #include "../DataStructures/JSONContainer.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/SegmentInformation.h"
 #include "../DataStructures/TurnInstructions.h"
 #include "../Util/bearing.hpp"
+#include "../Util/integer_range.hpp"
 #include "../Util/json_renderer.hpp"
 #include "../Util/simple_logger.hpp"
 #include "../Util/StringUtil.h"
diff --git a/Plugins/NearestPlugin.h b/Plugins/NearestPlugin.h
index 954bf2e6109..11d291b55d6 100644
--- a/Plugins/NearestPlugin.h
+++ b/Plugins/NearestPlugin.h
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BasePlugin.h"
 #include "../DataStructures/JSONContainer.h"
 #include "../DataStructures/phantom_node.hpp"
-#include "../DataStructures/Range.h"
+#include "../Util/integer_range.hpp"
 #include "../Util/json_renderer.hpp"
 
 #include <string>
diff --git a/Plugins/ViaRoutePlugin.h b/Plugins/ViaRoutePlugin.h
index 2164efed387..6b3c745c1b9 100644
--- a/Plugins/ViaRoutePlugin.h
+++ b/Plugins/ViaRoutePlugin.h
@@ -31,11 +31,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BasePlugin.h"
 
 #include "../Algorithms/object_encoder.hpp"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/SearchEngine.h"
 #include "../Descriptors/BaseDescriptor.h"
 #include "../Descriptors/GPXDescriptor.h"
 #include "../Descriptors/JSONDescriptor.h"
+#include "../Util/integer_range.hpp"
 #include "../Util/json_renderer.hpp"
 #include "../Util/make_unique.hpp"
 #include "../Util/simple_logger.hpp"
diff --git a/RoutingAlgorithms/AlternativePathRouting.h b/RoutingAlgorithms/AlternativePathRouting.h
index 83875f3d040..5d9cb1395bf 100644
--- a/RoutingAlgorithms/AlternativePathRouting.h
+++ b/RoutingAlgorithms/AlternativePathRouting.h
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define ALTERNATIVE_PATH_ROUTING_H
 
 #include "BasicRoutingInterface.h"
-#include "../DataStructures/Range.h"
+#include "../Util/integer_range.hpp"
 #include "../DataStructures/SearchEngineData.h"
 #include "../Util/container.hpp"
 
diff --git a/RoutingAlgorithms/ShortestPathRouting.h b/RoutingAlgorithms/ShortestPathRouting.h
index 63aa47c74d1..05d391ad1bb 100644
--- a/RoutingAlgorithms/ShortestPathRouting.h
+++ b/RoutingAlgorithms/ShortestPathRouting.h
@@ -31,8 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/assert.hpp>
 
 #include "BasicRoutingInterface.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/SearchEngineData.h"
+#include "../Util/integer_range.hpp"
 #include "../typedefs.h"
 
 template <class DataFacadeT> class ShortestPathRouting final : public BasicRoutingInterface<DataFacadeT>
diff --git a/Server/DataStructures/BaseDataFacade.h b/Server/DataStructures/BaseDataFacade.h
index 016a7fa0c7e..04dc77d0e23 100644
--- a/Server/DataStructures/BaseDataFacade.h
+++ b/Server/DataStructures/BaseDataFacade.h
@@ -33,8 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../../DataStructures/EdgeBasedNode.h"
 #include "../../DataStructures/ExternalMemoryNode.h"
 #include "../../DataStructures/phantom_node.hpp"
-#include "../../DataStructures/Range.h"
 #include "../../DataStructures/TurnInstructions.h"
+#include "../../Util/integer_range.hpp"
 #include "../../Util/OSRMException.h"
 #include "../../Util/StringUtil.h"
 #include "../../typedefs.h"
diff --git a/Tools/check-hsgr.cpp b/Tools/check-hsgr.cpp
index b3b157ad119..1f7d2ca0ff7 100644
--- a/Tools/check-hsgr.cpp
+++ b/Tools/check-hsgr.cpp
@@ -26,8 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "../DataStructures/Percent.h"
 #include "../DataStructures/QueryEdge.h"
-#include "../DataStructures/Range.h"
 #include "../DataStructures/StaticGraph.h"
+#include "../Util/integer_range.hpp"
 #include "../Util/GraphLoader.h"
 #include "../Util/simple_logger.hpp"
 #include "../Util/OSRMException.h"
diff --git a/DataStructures/Range.h b/Util/integer_range.hpp
similarity index 100%
rename from DataStructures/Range.h
rename to Util/integer_range.hpp
diff --git a/Util/range.hpp b/Util/iterator_range.hpp
similarity index 100%
rename from Util/range.hpp
rename to Util/iterator_range.hpp