diff --git a/src/Persistence_matrix/include/gudhi/Matrix.h b/src/Persistence_matrix/include/gudhi/Matrix.h
index 2ff8b46d4..19ebd34f8 100644
--- a/src/Persistence_matrix/include/gudhi/Matrix.h
+++ b/src/Persistence_matrix/include/gudhi/Matrix.h
@@ -313,8 +313,8 @@ class Matrix {
   using Matrix_heap_column = Heap_column<Matrix<PersistenceMatrixOptions> >;
   using Matrix_list_column = List_column<Matrix<PersistenceMatrixOptions> >;
   using Matrix_vector_column = Vector_column<Matrix<PersistenceMatrixOptions> >;
-  using Matrix_naive_vector_column = STD_naive_vector_column<Matrix<PersistenceMatrixOptions> >;
-  using Matrix_small_vector_column = Small_naive_vector_column<Matrix<PersistenceMatrixOptions> >;
+  using Matrix_naive_vector_column = Naive_std_vector_column<Matrix<PersistenceMatrixOptions> >;
+  using Matrix_small_vector_column = Naive_small_vector_column<Matrix<PersistenceMatrixOptions> >;
   using Matrix_set_column = Set_column<Matrix<PersistenceMatrixOptions> >;
   using Matrix_unordered_set_column = Unordered_set_column<Matrix<PersistenceMatrixOptions> >;
   using Matrix_intrusive_list_column = Intrusive_list_column<Matrix<PersistenceMatrixOptions> >;
diff --git a/src/Persistence_matrix/include/gudhi/Persistence_matrix/columns/naive_vector_column.h b/src/Persistence_matrix/include/gudhi/Persistence_matrix/columns/naive_vector_column.h
index 710987a37..d14a150ae 100644
--- a/src/Persistence_matrix/include/gudhi/Persistence_matrix/columns/naive_vector_column.h
+++ b/src/Persistence_matrix/include/gudhi/Persistence_matrix/columns/naive_vector_column.h
@@ -224,9 +224,9 @@ class Naive_vector_column : public Master_matrix::Row_access_option,
 };
 
 template <class Master_matrix>
-using STD_naive_vector_column = Naive_vector_column<Master_matrix, std::vector<typename Master_matrix::Matrix_entry*> >;
+using Naive_std_vector_column = Naive_vector_column<Master_matrix, std::vector<typename Master_matrix::Matrix_entry*> >;
 template <class Master_matrix>
-using Small_naive_vector_column =
+using Naive_small_vector_column =
     Naive_vector_column<Master_matrix, boost::container::small_vector<typename Master_matrix::Matrix_entry*, 8> >;
 
 template <class Master_matrix, class Support>
diff --git a/src/Persistence_matrix/test/pm_column_tests_boost_type_lists.h b/src/Persistence_matrix/test/pm_column_tests_boost_type_lists.h
index dbccb01e7..c015eaa70 100644
--- a/src/Persistence_matrix/test/pm_column_tests_boost_type_lists.h
+++ b/src/Persistence_matrix/test/pm_column_tests_boost_type_lists.h
@@ -30,8 +30,8 @@ using Gudhi::persistence_matrix::Heap_column;
 using Gudhi::persistence_matrix::Intrusive_list_column;
 using Gudhi::persistence_matrix::Intrusive_set_column;
 using Gudhi::persistence_matrix::List_column;
-using Gudhi::persistence_matrix::STD_naive_vector_column;
-using Gudhi::persistence_matrix::Small_naive_vector_column;
+using Gudhi::persistence_matrix::Naive_std_vector_column;
+using Gudhi::persistence_matrix::Naive_small_vector_column;
 using Gudhi::persistence_matrix::Set_column;
 using Gudhi::persistence_matrix::Unordered_set_column;
 using Gudhi::persistence_matrix::Vector_column;
@@ -66,9 +66,9 @@ class column_non_validity {
     } else if constexpr (col_type::Master::Option_list::column_type == Column_types::UNORDERED_SET) {
       return !std::is_same_v<col_type, Unordered_set_column<typename col_type::Master> >;
     } else if constexpr (col_type::Master::Option_list::column_type == Column_types::NAIVE_VECTOR) {
-      return !std::is_same_v<col_type, STD_naive_vector_column<typename col_type::Master> >;
+      return !std::is_same_v<col_type, Naive_std_vector_column<typename col_type::Master> >;
     } else if constexpr (col_type::Master::Option_list::column_type == Column_types::SMALL_VECTOR) {
-      return !std::is_same_v<col_type, Small_naive_vector_column<typename col_type::Master> >;
+      return !std::is_same_v<col_type, Naive_small_vector_column<typename col_type::Master> >;
     } else if constexpr (col_type::Master::Option_list::column_type == Column_types::VECTOR) {
       return !std::is_same_v<col_type, Vector_column<typename col_type::Master> >;
     } else if constexpr (col_type::Master::Option_list::column_type == Column_types::HEAP) {
@@ -90,7 +90,7 @@ using row_col_type_list = boost::mp11::mp_list<ct_intrusive_list, ct_intrusive_s
 //...and add the column name here.
 using column_list =
     mp_list_q<Intrusive_list_column, Intrusive_set_column, List_column, Set_column, Unordered_set_column,
-              STD_naive_vector_column, Small_naive_vector_column, Vector_column, Heap_column>;
+              Naive_std_vector_column, Naive_small_vector_column, Vector_column, Heap_column>;
 using c_matrix_type_list = mp_list_q<Column_mini_matrix>;
 
 template <typename option_name_list, typename bool_is_z2, typename col_t, typename bool_has_row, typename bool_rem_row,