diff --git a/Alpha_shapes_2/include/CGAL/internal/Lazy_alpha_nt_2.h b/Alpha_shapes_2/include/CGAL/internal/Lazy_alpha_nt_2.h
index fa811c49222..07504bb2a2e 100644
--- a/Alpha_shapes_2/include/CGAL/internal/Lazy_alpha_nt_2.h
+++ b/Alpha_shapes_2/include/CGAL/internal/Lazy_alpha_nt_2.h
@@ -75,7 +75,7 @@ class Lazy_alpha_nt_2{
 //NT & kernels
   typedef CGAL::Interval_nt<mode>                                                               NT_approx;
   //Gmpq or Quotient<MP_float>
-  typedef Exact_type_selector<double>::Type                                                     NT_exact; 
+  typedef Exact_field_selector<double>::Type                                                    NT_exact;
   typedef CGAL::Simple_cartesian<NT_approx>                                                     Kernel_approx;
   typedef CGAL::Simple_cartesian<NT_exact>                                                      Kernel_exact;
   typedef typename Kernel_traits<typename Input_traits::Point_2>::Kernel                        Kernel_input;
diff --git a/Alpha_shapes_3/include/CGAL/internal/Lazy_alpha_nt_3.h b/Alpha_shapes_3/include/CGAL/internal/Lazy_alpha_nt_3.h
index 634342de55c..7ded7ec6ef0 100644
--- a/Alpha_shapes_3/include/CGAL/internal/Lazy_alpha_nt_3.h
+++ b/Alpha_shapes_3/include/CGAL/internal/Lazy_alpha_nt_3.h
@@ -74,7 +74,7 @@ class Lazy_alpha_nt_3{
 //NT & kernels
   typedef CGAL::Interval_nt<mode>                                                               NT_approx;
   //Gmpq or Quotient<MP_float>
-  typedef Exact_type_selector<double>::Type                                                     NT_exact; 
+  typedef Exact_field_selector<double>::Type                                                    NT_exact;
   typedef CGAL::Simple_cartesian<NT_approx>                                                     Kernel_approx;
   typedef CGAL::Simple_cartesian<NT_exact>                                                      Kernel_exact;
 //Helper class for weighted and non-weighted case  
diff --git a/Convex_hull_3/include/CGAL/convex_hull_3.h b/Convex_hull_3/include/CGAL/convex_hull_3.h
index bd26b6d9b1b..3bd79501c0e 100644
--- a/Convex_hull_3/include/CGAL/convex_hull_3.h
+++ b/Convex_hull_3/include/CGAL/convex_hull_3.h
@@ -123,7 +123,7 @@ public:
 //and in case of failure, exact arithmetic is used.
 template <class Kernel>
 class Is_on_positive_side_of_plane_3<Convex_hull_traits_3<Kernel>,Tag_true>{
-  typedef Simple_cartesian<CGAL::internal::Exact_type_selector<double>::Type>         PK;
+  typedef Simple_cartesian<CGAL::internal::Exact_field_selector<double>::Type>         PK;
   typedef Simple_cartesian<Interval_nt_advanced >                               CK;  
   typedef Convex_hull_traits_3<Kernel>                                          Traits;
   typedef typename Traits::Point_3                                              Point_3;
diff --git a/Filtered_kernel/include/CGAL/Filtered_kernel.h b/Filtered_kernel/include/CGAL/Filtered_kernel.h
index 992ba9db30e..5fe15176be1 100644
--- a/Filtered_kernel/include/CGAL/Filtered_kernel.h
+++ b/Filtered_kernel/include/CGAL/Filtered_kernel.h
@@ -54,7 +54,7 @@ template < typename CK >
 struct Filtered_kernel_base
   : public CK
 {
-    typedef typename internal::Exact_type_selector<typename CK::RT>::Type  Exact_nt;
+    typedef typename internal::Exact_field_selector<typename CK::RT>::Type  Exact_nt;
     typedef Simple_cartesian<Exact_nt>                           Exact_kernel;
     typedef Simple_cartesian<Interval_nt_advanced>               Approximate_kernel;
     typedef Cartesian_converter<CK, Exact_kernel>                C2E;
diff --git a/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h b/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
index 87208dbe19b..b29b5505076 100644
--- a/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
+++ b/Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
@@ -37,8 +37,8 @@
 
 namespace CGAL {
 
-// Epeck_ft is either Gmpq of Quotient<MP_float>
-typedef internal::Exact_type_selector<double>::Type Epeck_ft;
+// Epeck_ft is either Gmpq or Quotient<MP_float>
+typedef internal::Exact_field_selector<double>::Type Epeck_ft;
 
 // The following are redefined kernels instead of simple typedefs in order to shorten
 // template name length (for error messages, mangling...).
diff --git a/Number_types/include/CGAL/internal/Exact_type_selector.h b/Number_types/include/CGAL/internal/Exact_type_selector.h
index d5c57e350ff..05f873fa94b 100644
--- a/Number_types/include/CGAL/internal/Exact_type_selector.h
+++ b/Number_types/include/CGAL/internal/Exact_type_selector.h
@@ -58,7 +58,7 @@ namespace CGAL { namespace internal {
 // The default template chooses Gmpq or Quotient<MP_Float>.
 // It should support the built-in types.
 template < typename >
-struct Exact_type_selector
+struct Exact_field_selector
 #ifdef CGAL_USE_GMP
 { typedef Gmpq Type; };
 #else
@@ -66,56 +66,56 @@ struct Exact_type_selector
 #endif
 
 template <>
-struct Exact_type_selector<MP_Float>
+struct Exact_field_selector<MP_Float>
 { typedef Quotient<MP_Float> Type; };
 
 template <>
-struct Exact_type_selector<Quotient<MP_Float> >
+struct Exact_field_selector<Quotient<MP_Float> >
 { typedef Quotient<MP_Float> Type; };
 
 // And we specialize for the following types :
 #ifdef CGAL_USE_GMP
 template <>
-struct Exact_type_selector<Gmpz>
+struct Exact_field_selector<Gmpz>
 { typedef Gmpq  Type; };
 
 template <>
-struct Exact_type_selector<Gmpq>
+struct Exact_field_selector<Gmpq>
 { typedef Gmpq  Type; };
 #endif
 
 #ifdef CGAL_USE_GMPXX
 template <>
-struct Exact_type_selector< ::mpz_class>
+struct Exact_field_selector< ::mpz_class>
 { typedef ::mpq_class  Type; };
 
 template <>
-struct Exact_type_selector< ::mpq_class>
+struct Exact_field_selector< ::mpq_class>
 { typedef ::mpq_class  Type; };
 #endif
 
 #ifdef CGAL_USE_LEDA
 template <>
-struct Exact_type_selector<leda_integer>
+struct Exact_field_selector<leda_integer>
 { typedef leda_rational  Type; };
 
 template <>
-struct Exact_type_selector<leda_rational>
+struct Exact_field_selector<leda_rational>
 { typedef leda_rational  Type; };
 
 template <>
-struct Exact_type_selector<leda_real>
+struct Exact_field_selector<leda_real>
 { typedef leda_real  Type; };
 #endif
 
 #ifdef CGAL_USE_CORE
 template <>
-struct Exact_type_selector<CORE::Expr>
+struct Exact_field_selector<CORE::Expr>
 { typedef CORE::Expr  Type; };
 #endif
 
 template < typename ET >
-struct Exact_type_selector<Lazy_exact_nt<ET> >
+struct Exact_field_selector<Lazy_exact_nt<ET> >
 {
   // We have a choice here :
   // - using ET gets rid of the DAG computation as well as redoing the interval
diff --git a/Number_types/test/Number_types/Sqrt_extension.cpp b/Number_types/test/Number_types/Sqrt_extension.cpp
index 52696fc389c..c67f9235b75 100644
--- a/Number_types/test/Number_types/Sqrt_extension.cpp
+++ b/Number_types/test/Number_types/Sqrt_extension.cpp
@@ -732,7 +732,7 @@ void sqrt_extension_test(){
 #include <CGAL/internal/Exact_type_selector.h>
 void test_nt_converter()
 {
-  typedef CGAL::internal::Exact_type_selector<int>::Type NT;
+  typedef CGAL::internal::Exact_field_selector<int>::Type NT;
   typedef CGAL::Sqrt_extension<double,double> Source;
   typedef CGAL::Sqrt_extension<NT,NT> Target;
   
diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
index a9af1f4fff5..affeb39c2df 100644
--- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
@@ -215,7 +215,7 @@ public:
       const Geometric_traits & gt = Geometric_traits())
     : _gt(gt), _tds(), _domain(domain), too_long_edge_counter(0) {
     _gt.set_domain(_domain);
-    typedef typename internal::Exact_type_selector<FT>::Type EFT;
+    typedef typename internal::Exact_field_selector<FT>::Type EFT;
     typedef NT_converter<FT,EFT> NTC;
     CGAL_triangulation_assertion_code( NTC ntc; )
     CGAL_triangulation_precondition(ntc(_domain.xmax())-ntc(_domain.xmin())