diff --git a/Orthtree/examples/Orthtree/octree_find_nearest_neighbor.cpp b/Orthtree/examples/Orthtree/octree_find_nearest_neighbor.cpp
index f5c151749eb..2d687aa4215 100644
--- a/Orthtree/examples/Orthtree/octree_find_nearest_neighbor.cpp
+++ b/Orthtree/examples/Orthtree/octree_find_nearest_neighbor.cpp
@@ -57,7 +57,7 @@ int main(int argc, char** argv) {
 
   typename Octree::Sphere s(points_to_find[0], 0.0375);
   std::cout << std::endl << "Closest points within the sphere around " << s.center() << " with squared radius of " << s.squared_radius() << ":" << std::endl;
-  octree.neighbors_in_radius
+  octree.neighbors_within_radius
   (s,
     boost::make_function_output_iterator
     ([&](const Point_set::Index& nearest)
@@ -67,7 +67,7 @@ int main(int argc, char** argv) {
 
   std::size_t k = 3;
   std::cout << std::endl << "The up to " << k << " closest points to(" << s.center() << ") within a squared radius of " << s.squared_radius() << " are:" << std::endl;
-  octree.nearest_k_neighbors_in_radius
+  octree.nearest_k_neighbors_within_radius
   (s, k,
     boost::make_function_output_iterator
     ([&](const Point_set::Index& nearest)
diff --git a/Orthtree/include/CGAL/Orthtree.h b/Orthtree/include/CGAL/Orthtree.h
index 2028c9f72a8..2ea9f85f115 100644
--- a/Orthtree/include/CGAL/Orthtree.h
+++ b/Orthtree/include/CGAL/Orthtree.h
@@ -688,7 +688,7 @@ public:
     Sphere query_sphere(query, (std::numeric_limits<FT>::max)());
     CGAL_precondition(k > 0);
 
-    return nearest_k_neighbors_in_radius(query_sphere, k, output);
+    return nearest_k_neighbors_within_radius(query_sphere, k, output);
   }
 
   /*!
@@ -705,8 +705,8 @@ public:
   \warning Nearest neighbor searches requires `GeomTraits` to be a model of `CollectionPartitioningOrthtreeTraits`.
  */
   template<typename OutputIterator>
-  auto neighbors_in_radius(const Sphere& query, OutputIterator output) const -> std::enable_if_t<supports_neighbor_search, OutputIterator> {
-    return nearest_k_neighbors_in_radius(query, (std::numeric_limits<std::size_t>::max)(), output);
+  auto neighbors_within_radius(const Sphere& query, OutputIterator output) const -> std::enable_if_t<supports_neighbor_search, OutputIterator> {
+    return nearest_k_neighbors_within_radius(query, (std::numeric_limits<std::size_t>::max)(), output);
   }
 
   /*!
@@ -727,7 +727,7 @@ public:
   \warning Nearest neighbor searches requires `GeomTraits` to be a model of `CollectionPartitioningOrthtreeTraits`.
  */
   template <typename OutputIterator>
-  auto nearest_k_neighbors_in_radius(
+  auto nearest_k_neighbors_within_radius(
     const Sphere& query,
     std::size_t k,
     OutputIterator output