diff --git a/index/test/algorithms/content.cpp b/index/test/algorithms/content.cpp
index 0d8cc0818..07644656c 100644
--- a/index/test/algorithms/content.cpp
+++ b/index/test/algorithms/content.cpp
@@ -13,7 +13,7 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/box.hpp>
 
-//#define GEOMETRY_TEST_DEBUG
+//#define BOOST_GEOMETRY_TEST_DEBUG
 
 void test_large_integers()
 {
diff --git a/index/test/algorithms/intersection_content.cpp b/index/test/algorithms/intersection_content.cpp
index b53873bcd..a668af790 100644
--- a/index/test/algorithms/intersection_content.cpp
+++ b/index/test/algorithms/intersection_content.cpp
@@ -13,7 +13,7 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/box.hpp>
 
-//#define GEOMETRY_TEST_DEBUG
+//#define BOOST_GEOMETRY_TEST_DEBUG
 
 void test_large_integers()
 {
diff --git a/index/test/algorithms/is_valid.cpp b/index/test/algorithms/is_valid.cpp
index ff3dae0ba..4c0584a0f 100644
--- a/index/test/algorithms/is_valid.cpp
+++ b/index/test/algorithms/is_valid.cpp
@@ -17,14 +17,14 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/box.hpp>
 
-//#define GEOMETRY_TEST_DEBUG
+//#define BOOST_GEOMETRY_TEST_DEBUG
 
 template <typename Geometry>
 void test(Geometry const& geometry, bool expected_value)
 {
     bool value = bgi::detail::is_valid(geometry);
 
-#ifdef GEOMETRY_TEST_DEBUG
+#ifdef BOOST_GEOMETRY_TEST_DEBUG
     std::ostringstream out;
     out << typeid(typename bg::coordinate_type<Geometry>::type).name()
         << " "
diff --git a/index/test/algorithms/margin.cpp b/index/test/algorithms/margin.cpp
index cd83ded93..e1e9eab09 100644
--- a/index/test/algorithms/margin.cpp
+++ b/index/test/algorithms/margin.cpp
@@ -13,7 +13,7 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/box.hpp>
 
-//#define GEOMETRY_TEST_DEBUG
+//#define BOOST_GEOMETRY_TEST_DEBUG
 
 void test_large_integers()
 {
diff --git a/index/test/algorithms/minmaxdist.cpp b/index/test/algorithms/minmaxdist.cpp
index dd7e8e5e2..4534b2f3c 100644
--- a/index/test/algorithms/minmaxdist.cpp
+++ b/index/test/algorithms/minmaxdist.cpp
@@ -17,7 +17,7 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/box.hpp>
 
-#define GEOMETRY_TEST_DEBUG
+#define BOOST_GEOMETRY_TEST_DEBUG
 
 template <typename Point, typename Indexable>
 void test(Point const& pt, Indexable const& indexable,
@@ -25,7 +25,7 @@ void test(Point const& pt, Indexable const& indexable,
 {
     typename bg::default_distance_result<Point, Indexable>::type value = bgi::detail::minmaxdist(pt, indexable);
 
-#ifdef GEOMETRY_TEST_DEBUG
+#ifdef BOOST_GEOMETRY_TEST_DEBUG
     std::ostringstream out;
     out << typeid(typename bg::coordinate_type<Point>::type).name()
         << " "
diff --git a/index/test/algorithms/test_content.hpp b/index/test/algorithms/test_content.hpp
index 226bbcd36..92282f8bb 100644
--- a/index/test/algorithms/test_content.hpp
+++ b/index/test/algorithms/test_content.hpp
@@ -23,7 +23,7 @@ void test_content(Geometry const& geometry,
 {
     typename bgi::detail::default_content_result<Geometry>::type value = bgi::detail::content(geometry);
 
-#ifdef GEOMETRY_TEST_DEBUG
+#ifdef BOOST_GEOMETRY_TEST_DEBUG
     std::ostringstream out;
     out << typeid(typename bg::coordinate_type<Geometry>::type).name()
         << " "
diff --git a/index/test/algorithms/test_intersection_content.hpp b/index/test/algorithms/test_intersection_content.hpp
index 5a074b7c1..1445f8f40 100644
--- a/index/test/algorithms/test_intersection_content.hpp
+++ b/index/test/algorithms/test_intersection_content.hpp
@@ -20,7 +20,7 @@ void test_intersection_content(Geometry const& geometry1, Geometry const& geomet
 {
     typename bgi::detail::default_content_result<Geometry>::type value = bgi::detail::intersection_content(geometry1, geometry2);
 
-#ifdef GEOMETRY_TEST_DEBUG
+#ifdef BOOST_GEOMETRY_TEST_DEBUG
     std::ostringstream out;
     out << typeid(typename bg::coordinate_type<Geometry>::type).name()
         << " "
diff --git a/index/test/algorithms/test_margin.hpp b/index/test/algorithms/test_margin.hpp
index 45d10dfe9..8146b7fe0 100644
--- a/index/test/algorithms/test_margin.hpp
+++ b/index/test/algorithms/test_margin.hpp
@@ -22,7 +22,7 @@ void test_margin(Geometry const& geometry,
 {
     typename bgi::detail::default_margin_result<Geometry>::type value = bgi::detail::comparable_margin(geometry);
 
-#ifdef GEOMETRY_TEST_DEBUG
+#ifdef BOOST_GEOMETRY_TEST_DEBUG
     std::ostringstream out;
     out << typeid(typename bg::coordinate_type<Geometry>::type).name()
         << " "
diff --git a/index/test/algorithms/test_union_content.hpp b/index/test/algorithms/test_union_content.hpp
index fe0268795..b2648c471 100644
--- a/index/test/algorithms/test_union_content.hpp
+++ b/index/test/algorithms/test_union_content.hpp
@@ -20,7 +20,7 @@ void test_union_content(Geometry const& geometry1, Geometry const& geometry2,
 {
     typename bgi::detail::default_content_result<Geometry>::type value = bgi::detail::union_content(geometry1, geometry2);
 
-#ifdef GEOMETRY_TEST_DEBUG
+#ifdef BOOST_GEOMETRY_TEST_DEBUG
     std::ostringstream out;
     out << typeid(typename bg::coordinate_type<Geometry>::type).name()
         << " "
diff --git a/index/test/algorithms/union_content.cpp b/index/test/algorithms/union_content.cpp
index 4939e57ad..beaa17136 100644
--- a/index/test/algorithms/union_content.cpp
+++ b/index/test/algorithms/union_content.cpp
@@ -13,7 +13,7 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/box.hpp>
 
-//#define GEOMETRY_TEST_DEBUG
+//#define BOOST_GEOMETRY_TEST_DEBUG
 
 void test_large_integers()
 {