diff --git a/include/experimental/__p2630_bits/submdspan_extents.hpp b/include/experimental/__p2630_bits/submdspan_extents.hpp
index 429877e7..e597efab 100644
--- a/include/experimental/__p2630_bits/submdspan_extents.hpp
+++ b/include/experimental/__p2630_bits/submdspan_extents.hpp
@@ -266,11 +266,11 @@ struct extents_constructor<0, Extents, NewStaticExtents...> {
 
 } // namespace detail
 
-// submdspan_extents creates new extents given src extents and submdspan slice
+// subextents creates new extents given src extents and submdspan slice
 // specifiers
 template <class IndexType, size_t... Extents, class... SliceSpecifiers>
 MDSPAN_INLINE_FUNCTION
-constexpr auto submdspan_extents(const extents<IndexType, Extents...> &src_exts,
+constexpr auto subextents(const extents<IndexType, Extents...> &src_exts,
                                  SliceSpecifiers... slices) {
 
   using ext_t = extents<IndexType, Extents...>;
diff --git a/include/experimental/__p2630_bits/submdspan_mapping.hpp b/include/experimental/__p2630_bits/submdspan_mapping.hpp
index 9d286a3b..eb58bbaa 100644
--- a/include/experimental/__p2630_bits/submdspan_mapping.hpp
+++ b/include/experimental/__p2630_bits/submdspan_mapping.hpp
@@ -206,7 +206,7 @@ layout_left::mapping<Extents>::submdspan_mapping_impl(
 
   // compute sub extents
   using src_ext_t = Extents;
-  auto dst_ext = submdspan_extents(extents(), slices...);
+  auto dst_ext = subextents(extents(), slices...);
   using dst_ext_t = decltype(dst_ext);
 
   // figure out sub layout type
@@ -272,7 +272,7 @@ layout_left_padded<PaddingValue>::mapping<Extents>::submdspan_mapping_impl(
 
   // compute sub extents
   using src_ext_t = Extents;
-  auto dst_ext = submdspan_extents(extents(), slices...);
+  auto dst_ext = subextents(extents(), slices...);
   using dst_ext_t = decltype(dst_ext);
 
   if constexpr (Extents::rank() == 0) { // rank-0 case
@@ -440,7 +440,7 @@ layout_right::mapping<Extents>::submdspan_mapping_impl(
 
   // compute sub extents
   using src_ext_t = Extents;
-  auto dst_ext = submdspan_extents(extents(), slices...);
+  auto dst_ext = subextents(extents(), slices...);
   using dst_ext_t = decltype(dst_ext);
 
   // figure out sub layout type
@@ -508,7 +508,7 @@ layout_right_padded<PaddingValue>::mapping<Extents>::submdspan_mapping_impl(
 
   // compute sub extents
   using src_ext_t = Extents;
-  auto dst_ext = submdspan_extents(extents(), slices...);
+  auto dst_ext = subextents(extents(), slices...);
   using dst_ext_t = decltype(dst_ext);
 
   if constexpr (Extents::rank() == 0) { // rank-0 case
@@ -585,7 +585,7 @@ layout_stride::mapping<Extents>::submdspan_mapping_impl(
   // Implements mandate check
   detail::check_submdspan_slice_mandates<Extents>(std::make_index_sequence<Extents::rank()>(), slices...);
 
-  auto dst_ext = submdspan_extents(extents(), slices...);
+  auto dst_ext = subextents(extents(), slices...);
   using dst_ext_t = decltype(dst_ext);
   auto inv_map = detail::inv_map_rank(std::integral_constant<size_t, 0>(),
                                       std::index_sequence<>(), slices...);