diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/AlgebraicCurveParser.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/AlgebraicCurveParser.cpp
index c2135fdb54d..ebb4b075249 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/AlgebraicCurveParser.cpp
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/AlgebraicCurveParser.cpp
@@ -146,7 +146,7 @@ AlgebraicCurveParser<Polynomial_d>::operator()(const std::string& expression)
     return {};
 }
 
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
 // don't want to include ArrangementTypes.h
 // makes compilation slower
 // template class
diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoTab.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoTab.cpp
index b1b3ad45297..346772d8a32 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoTab.cpp
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoTab.cpp
@@ -462,7 +462,7 @@ findOtherInterestingPoints(const std::unique_ptr<Arr_>&, const CGAL::Bbox_2&)
   return {};
 }
 
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
 template <typename Coefficient_>
 static const auto&
 getXyCurves(const CGAL::Arr_algebraic_segment_traits_2<Coefficient_>* traits)
@@ -524,7 +524,7 @@ CGAL::Bbox_2 findOtherInterestingPoints<demo_types::Alg_seg_arr>(
   }
   return bb;
 }
-#endif // CGAL_USE_Core
+#endif // CGAL_USE_CORE
 
 template <class Arr_>
 void ArrangementDemoTab<Arr_>::adjustViewport()
diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.cpp
index 8bcb8956595..213b8a1e810 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.cpp
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoWindow.cpp
@@ -223,7 +223,7 @@ void ArrangementDemoWindow::showInsertMethods(demo_types::TraitsType tabType)
     this->ui->actionRay->setVisible(true);
     this->ui->actionLine->setVisible(true);
     break;
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   case TraitsType::CONIC_TRAITS:
     this->ui->actionSegment->setVisible(true);
     this->ui->actionCircle->setVisible(true);
@@ -284,7 +284,7 @@ void ArrangementDemoWindow::updateInputType(QAction* a)
 // should refactor this to GraphicsViewCurveInput if any other use case arises
 void ArrangementDemoWindow::on_actionAddAlgebraicCurve_triggered()
 {
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   AlgebraicCurveInputDialog newDialog;
 
   if (newDialog.exec() == QDialog::Accepted)
@@ -328,7 +328,7 @@ void ArrangementDemoWindow::on_actionAddAlgebraicCurve_triggered()
 
 void ArrangementDemoWindow::on_actionAddRationalCurve_triggered()
 {
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   RationalCurveInputDialog newDialog;
 
   if (newDialog.exec() == QDialog::Accepted)
diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementIO.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementIO.cpp
index 8b37f8c2104..83ea9e11da0 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementIO.cpp
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementIO.cpp
@@ -38,7 +38,7 @@ struct ArrReader
     return arr;
   }
 
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   auto operator()(demo_types::TypeHolder<demo_types::Conic_arr>)
   {
     using namespace demo_types;
@@ -99,7 +99,7 @@ struct ArrWriter
     CGAL::write(*arr, ofs, arrFormatter);
   }
 
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   void operator()(demo_types::Conic_arr* arr)
   {
     Conic_reader<demo_types::Conic_arr::Geometry_traits_2> conicReader;
diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementTypes.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementTypes.h
index 8f4233141a0..fa94d7241ab 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementTypes.h
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementTypes.h
@@ -20,7 +20,7 @@
 #include <CGAL/Arr_linear_traits_2.h>
 #include <CGAL/Arr_polyline_traits_2.h>
 
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   #include <CGAL/CORE_algebraic_number_traits.h>
   #include <CGAL/Arr_conic_traits_2.h>
   #include <CGAL/Arr_algebraic_segment_traits_2.h>
@@ -75,7 +75,7 @@ public:
 
 // use same rational type across arrangements
 // less specializations, and makes PointSnapper untemplated
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   typedef CORE::BigRat                                  Rational;
 #else
   typedef CGAL::Exact_rational                          Rational;
@@ -102,7 +102,7 @@ typedef Dcel<Lin_traits>                                Lin_dcel;
 typedef CGAL::Arrangement_with_history_2<Lin_traits, Lin_dcel>
                                                         Lin_arr;
 
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   typedef CGAL::CORE_algebraic_number_traits            Core_nt_traits;
   typedef Core_nt_traits::Integer                       Core_integer;
   typedef Core_nt_traits::Rational                      Core_rational;
@@ -141,7 +141,7 @@ typedef CGAL::Arrangement_with_history_2<Lin_traits, Lin_dcel>
 #endif
 }
 
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   #define ARRANGEMENT_DEMO_SPECIALIZE_ARR_CORE(class_name)                     \
     template class class_name<demo_types::Conic_arr>;                          \
     template class class_name<demo_types::Alg_seg_arr>;                        \
diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementTypesUtils.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementTypesUtils.h
index cda4a6d49e6..0b28df6e232 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementTypesUtils.h
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementTypesUtils.h
@@ -23,7 +23,7 @@ enum class TraitsType : int
   SEGMENT_TRAITS,
   POLYLINE_TRAITS,
   LINEAR_TRAITS,
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   CONIC_TRAITS,
   ALGEBRAIC_TRAITS,
   BEZIER_TRAITS,
@@ -46,7 +46,7 @@ static constexpr TraitsType enumFromArrType()
   if (is_same<T, Seg_arr>::value) return TraitsType::SEGMENT_TRAITS;
   else if (is_same<T, Pol_arr>::value) return TraitsType::POLYLINE_TRAITS;
   else if (is_same<T, Lin_arr>::value) return TraitsType::LINEAR_TRAITS;
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   else if (is_same<T, Conic_arr>::value) return TraitsType::CONIC_TRAITS;
   else if (is_same<T, Alg_seg_arr>::value) return TraitsType::ALGEBRAIC_TRAITS;
   else if (is_same<T, Bezier_arr>::value) return TraitsType::BEZIER_TRAITS;
@@ -70,7 +70,7 @@ static void visitArrangementType(TraitsType tt, Lambda lambda)
   case TraitsType::LINEAR_TRAITS:
     lambda(TypeHolder<Lin_arr>{});
     break;
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   case TraitsType::CONIC_TRAITS:
     lambda(TypeHolder<Conic_arr>{});
     break;
@@ -93,7 +93,7 @@ static void forEachArrangementType(Lambda lambda)
   lambda(TypeHolder<Seg_arr>{});
   lambda(TypeHolder<Pol_arr>{});
   lambda(TypeHolder<Lin_arr>{});
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   lambda(TypeHolder<Conic_arr>{});
   lambda(TypeHolder<Alg_seg_arr>{});
   lambda(TypeHolder<Bezier_arr>{});
diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ConstructBoundingBox.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ConstructBoundingBox.cpp
index ceba90a5bca..aaa4f64f6fb 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ConstructBoundingBox.cpp
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ConstructBoundingBox.cpp
@@ -35,10 +35,8 @@ struct ConstructBoundingBox_impl
   CGAL::Bbox_2
   operator()(const X_monotone_curve_2& curve)
   {
-#ifdef CGAL_USE_Core
     using Zero_resultant_exception = CGAL::internal::Zero_resultant_exception<
       typename demo_types::Alg_seg_traits::Polynomial_2>;
-#endif
 
     CGAL::Bbox_2 bbox;
     try
@@ -53,14 +51,12 @@ struct ConstructBoundingBox_impl
       std::cerr << __FILE__ << ':' << __LINE__ << '\n';
       bbox = inf_bbox;
     }
-#ifdef CGAL_USE_Core
     catch (Zero_resultant_exception& ex)
     {
       std::cerr << "Exception thrown of type \"Zero_resultant_exception\"\n";
       std::cerr << __FILE__ << ':' << __LINE__ << '\n';
       bbox = inf_bbox;
     }
-#endif
     catch (...)
     {
       std::cerr << "Exception thrown of unknown type!\n";
diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp
index 7bb4f0c5bc7..a5a9128c968 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp
@@ -32,7 +32,7 @@ NewTabDialog::NewTabDialog( QWidget* parent ) :
     static_cast<int>(TraitsType::POLYLINE_TRAITS));
   this->buttonGroup->addButton(
     this->ui->linearRadioButton, static_cast<int>(TraitsType::LINEAR_TRAITS));
-#ifdef CGAL_USE_Core
+#ifdef CGAL_USE_CORE
   this->buttonGroup->addButton(
     this->ui->conicRadioButton, static_cast<int>(TraitsType::CONIC_TRAITS));
   this->buttonGroup->addButton(