diff --git a/Documentation/doc/Documentation/packages.txt b/Documentation/doc/Documentation/packages.txt
index d780e5bef56..3c14337683a 100644
--- a/Documentation/doc/Documentation/packages.txt
+++ b/Documentation/doc/Documentation/packages.txt
@@ -90,7 +90,7 @@
 \package_listing{Mesh_2}
 \package_listing{Surface_mesher}
 \package_listing{Skin_surface_3}
-\package_listing{TMDS_3}
+\package_listing{SMDS_3}
 \package_listing{Mesh_3}
 \package_listing{Tetrahedral_remeshing}
 \package_listing{Periodic_3_mesh_3}
diff --git a/Installation/CHANGES.md b/Installation/CHANGES.md
index d1345d49d4e..2cbfe263a3b 100644
--- a/Installation/CHANGES.md
+++ b/Installation/CHANGES.md
@@ -24,6 +24,13 @@ Release date: June 2022
 -   Added the function
     [`remove_isolated_vertices()`](https://doc.cgal.org/5.5/Mesh_3/classCGAL_1_1Mesh__complex__3__in__triangulation__3.html#ace57c4e777da457c6e33b4f6e89949ce)
     as a post-processing step for the tetrahedral mesh generation.
+    
+### [3D Simplicial Mesh Data Structure](https://doc.cgal.org/5.4/Manual/packages.html#PkgSMDS3) (new package)
+
+- This new package wraps all the existing code that deals with a ` MeshComplex_3InTriangulation_3`
+   to describe 3D simplicial meshess, and makes the data structure independant
+   from the tetrahedral mesh generation package.    
+
 
 [Release 5.4](https://github.com/CGAL/cgal/releases/tag/v5.4)
 -----------
@@ -202,12 +209,6 @@ Release date: January 2022
 -   Added support for the [OSQP solver](https://osqp.org/). This solver enables to efficiently compute
     the convex Quadratic Programming (QP) problems arising in the context of several packages.
 
-### [Tetrahedral Mesh Data Structure 3](https://doc.cgal.org/5.4/Manual/packages.html#PkgTMDS3) (new package)
-
-- This new package wraps all the existing code that deals with a
-` MeshComplex_3InTriangulation_3`, and makes the data structure independant
-from the tetrahedral mesh generation package.
-
 
 [Release 5.3](https://github.com/CGAL/cgal/releases/tag/v5.3)
 -----------
diff --git a/Installation/include/CGAL/TMDS_3/Mesh_complex_3_in_triangulation_3_fwd.h b/Installation/include/CGAL/TMDS_3/Mesh_complex_3_in_triangulation_3_fwd.h
index 7fb5f00e04e..631e85211b4 100644
--- a/Installation/include/CGAL/TMDS_3/Mesh_complex_3_in_triangulation_3_fwd.h
+++ b/Installation/include/CGAL/TMDS_3/Mesh_complex_3_in_triangulation_3_fwd.h
@@ -7,11 +7,11 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later OR LicenseRef-Commercial
 //
 
-#ifndef CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
-#define CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
+#ifndef CGAL_SMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
+#define CGAL_SMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H
 
 /// \file Mesh_complex_3_in_triangulation_3_fwd.h
-/// Forward declarations of the TMDS_3 package.
+/// Forward declarations of the SMDS_3 package.
 
 #ifndef DOXYGEN_RUNNING
 namespace CGAL {
@@ -35,7 +35,7 @@ namespace IO {
   );
 } //namespace IO
 
-namespace TMDS_3 {
+namespace SMDS_3 {
 
   template<class Tr>
   bool build_triangulation_from_file(std::istream& is,
@@ -43,10 +43,10 @@ namespace TMDS_3 {
                                      bool verbose = false,
                                      bool replace_domain_0 = false);
 
-} // namespace TMDS_3
+} // namespace SMDS_3
 } // namespace CGAL
 #endif
 
-#endif /* CGAL_TMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H */
+#endif /* CGAL_SMDS_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_FWD_H */
 
 
diff --git a/Installation/include/CGAL/license/TMDS_3.h b/Installation/include/CGAL/license/TMDS_3.h
index 10b70875894..4884ec499e4 100644
--- a/Installation/include/CGAL/license/TMDS_3.h
+++ b/Installation/include/CGAL/license/TMDS_3.h
@@ -39,13 +39,13 @@
 
 #  if defined(CGAL_LICENSE_WARNING)
      CGAL_pragma_warning("\nThe macro CGAL_TMDS_3_COMMERCIAL_LICENSE is not defined."
-                          "\nYou use the CGAL 3D Tetrahedral Mesh Data Structure package under "
+                          "\nYou use the CGAL 3D Simplicial Mesh Data Structure package under "
                           "the terms of the GPLv3+.")
 #  endif // CGAL_LICENSE_WARNING
 
 #  ifdef CGAL_LICENSE_ERROR
 #    error "The macro CGAL_TMDS_3_COMMERCIAL_LICENSE is not defined.\
-            You use the CGAL 3D Tetrahedral Mesh Data Structure package under the terms of \
+            You use the CGAL 3D Simplicial Mesh Data Structure package under the terms of \
             the GPLv3+. You get this error, as you defined CGAL_LICENSE_ERROR."
 #  endif // CGAL_LICENSE_ERROR
 
diff --git a/Installation/include/CGAL/license/gpl_package_list.txt b/Installation/include/CGAL/license/gpl_package_list.txt
index 7a31fd9a643..7f3733dcb90 100644
--- a/Installation/include/CGAL/license/gpl_package_list.txt
+++ b/Installation/include/CGAL/license/gpl_package_list.txt
@@ -90,7 +90,7 @@ Surface_sweep_2 2D Intersection of Curves
 TDS_2 2D Triangulation Data Structure
 TDS_3 3D Triangulation Data Structure
 Three Three
-TMDS_3 3D Tetrahedral Mesh Data Structure
+SMDS_3 3D Simplicial Mesh Data Structure
 Triangulation_2 2D Triangulation
 Triangulation_on_sphere_2 2D Triangulation on Sphere
 Triangulation_3 3D Triangulations
diff --git a/Mesh_3/doc/Mesh_3/PackageDescription.txt b/Mesh_3/doc/Mesh_3/PackageDescription.txt
index b73ea0ddb0e..08462c8341c 100644
--- a/Mesh_3/doc/Mesh_3/PackageDescription.txt
+++ b/Mesh_3/doc/Mesh_3/PackageDescription.txt
@@ -29,7 +29,7 @@
 
 /// \defgroup PkgMesh3IOFunctions Input/Output Functions
 /// \ingroup PkgMesh3Ref
-/// See \ref PkgTMDS3IOFunctions from \ref PkgTMDS3
+/// See \ref PkgSMDS3IOFunctions from \ref PkgSMDS3
 
 /*!
 \addtogroup PkgMesh3Ref
diff --git a/Mesh_3/doc/Mesh_3/dependencies b/Mesh_3/doc/Mesh_3/dependencies
index 88a2e6a144d..be614f85b31 100644
--- a/Mesh_3/doc/Mesh_3/dependencies
+++ b/Mesh_3/doc/Mesh_3/dependencies
@@ -13,5 +13,5 @@ Polyhedron
 Miscellany
 Mesh_2
 Polygon_mesh_processing
-TMDS_3
+SMDS_3
 
diff --git a/Mesh_3/examples/Mesh_3/mesh_3D_image_with_custom_initialization.cpp b/Mesh_3/examples/Mesh_3/mesh_3D_image_with_custom_initialization.cpp
index e22eaa8c6b5..fcf5d94744d 100644
--- a/Mesh_3/examples/Mesh_3/mesh_3D_image_with_custom_initialization.cpp
+++ b/Mesh_3/examples/Mesh_3/mesh_3D_image_with_custom_initialization.cpp
@@ -11,7 +11,7 @@
 #include <CGAL/make_mesh_3.h>
 #include <CGAL/Image_3.h>
 
-#include <CGAL/TMDS_3/Dump_c3t3.h>
+#include <CGAL/SMDS_3/Dump_c3t3.h>
 
 // Domain
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
diff --git a/Mesh_3/examples/Mesh_3/mesh_hybrid_mesh_domain.cpp b/Mesh_3/examples/Mesh_3/mesh_hybrid_mesh_domain.cpp
index 393efd43f20..c0ba926d412 100644
--- a/Mesh_3/examples/Mesh_3/mesh_hybrid_mesh_domain.cpp
+++ b/Mesh_3/examples/Mesh_3/mesh_hybrid_mesh_domain.cpp
@@ -13,7 +13,7 @@
 #include <CGAL/make_mesh_3.h>
 
 // Ouput
-#include <CGAL/TMDS_3/Dump_c3t3.h>
+#include <CGAL/SMDS_3/Dump_c3t3.h>
 
 // Read 1D features from input file
 #include "read_polylines.h"
diff --git a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
index 8d78dcae2cc..2dffa51af0d 100644
--- a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
@@ -33,8 +33,8 @@
 
 #include <functional>
 
-#include <CGAL/TMDS_3/internal/Handle_IO_for_pair_of_int.h>
-#include <CGAL/TMDS_3/internal/indices_management.h>
+#include <CGAL/SMDS_3/internal/Handle_IO_for_pair_of_int.h>
+#include <CGAL/SMDS_3/internal/indices_management.h>
 
 // support for `CGAL::Image_3`
 #include <CGAL/Image_3.h>
diff --git a/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h b/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h
index a1e9455c087..47f6d237051 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h
@@ -13,8 +13,8 @@
 #ifndef CGAL_MESH_3_DUMP_C3T3_H
 #define CGAL_MESH_3_DUMP_C3T3_H
 
-#include <CGAL/license/TMDS_3.h>
+#include <CGAL/license/SMDS_3.h>
 
-#include <CGAL/TMDS_3/Dump_c3t3.h>
+#include <CGAL/SMDS_3/Dump_c3t3.h>
 
 #endif // CGAL_MESH_3_DUMP_C3T3_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h b/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
index 5d598f30e3e..1a13e725a44 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
@@ -36,7 +36,7 @@
 
 #include <CGAL/Mesh_error_code.h>
 
-#include <CGAL/TMDS_3/Dump_c3t3.h>
+#include <CGAL/SMDS_3/Dump_c3t3.h>
 
 #include <CGAL/Mesh_3/Refine_facets_3.h>
 #include <CGAL/Mesh_3/Refine_facets_manifold_base.h>
diff --git a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
index 110de21733a..767240429c2 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
@@ -28,11 +28,11 @@
 #include <CGAL/disable_warnings.h>
 #include <CGAL/Mesh_3/config.h>
 
-#include <CGAL/TMDS_3/io_signature.h>
+#include <CGAL/SMDS_3/io_signature.h>
 #ifdef CGAL_MESH_3_DUMP_FEATURES_PROTECTION_ITERATIONS
 #  include <CGAL/IO/File_binary_mesh_3.h>
 #endif
-#include <CGAL/TMDS_3/utilities.h>
+#include <CGAL/SMDS_3/utilities.h>
 #include <CGAL/Mesh_3/Triangulation_helpers.h>
 #include <CGAL/iterator.h>
 #include <CGAL/Mesh_error_code.h>
@@ -108,7 +108,7 @@ void debug_dump_c3t3(const std::string filename, const C3t3& c3t3)
 
 template <typename C3T3, typename MeshDomain, typename SizingFunction>
 class Protect_edges_sizing_field
-  : public CGAL::TMDS_3::internal::Debug_messages_tools
+  : public CGAL::SMDS_3::internal::Debug_messages_tools
 {
   typedef Protect_edges_sizing_field          Self;
 
diff --git a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
index 3f1a4925a92..2f0db096e09 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
@@ -38,7 +38,7 @@
 #ifdef CGAL_MESH_3_PROFILING
   #include <CGAL/Mesh_3/Profiling_tools.h>
 #endif
-#include <CGAL/TMDS_3/Dump_c3t3.h>
+#include <CGAL/SMDS_3/Dump_c3t3.h>
 
 #include <CGAL/Object.h>
 
diff --git a/Mesh_3/include/CGAL/Mesh_3/config.h b/Mesh_3/include/CGAL/Mesh_3/config.h
index a73dbf2fdd8..eae04a3765f 100644
--- a/Mesh_3/include/CGAL/Mesh_3/config.h
+++ b/Mesh_3/include/CGAL/Mesh_3/config.h
@@ -16,7 +16,7 @@
 
 
 #include <CGAL/config.h>
-#include <CGAL/TMDS_3/config.h>
+#include <CGAL/SMDS_3/config.h>
 
 //#define CGAL_MESH_3_VERBOSE 1
 
diff --git a/Mesh_3/include/CGAL/Mesh_3/internal/check_weights.h b/Mesh_3/include/CGAL/Mesh_3/internal/check_weights.h
index 20793d0d338..4d228953ad5 100644
--- a/Mesh_3/include/CGAL/Mesh_3/internal/check_weights.h
+++ b/Mesh_3/include/CGAL/Mesh_3/internal/check_weights.h
@@ -22,7 +22,7 @@
 
 #include <CGAL/enum.h>
 #include <CGAL/tags.h>
-#include <CGAL/TMDS_3/Has_features.h>
+#include <CGAL/SMDS_3/Has_features.h>
 #include <boost/type_traits/is_same.hpp>
 
 namespace CGAL {
diff --git a/Mesh_3/include/CGAL/Mesh_3/io_signature.h b/Mesh_3/include/CGAL/Mesh_3/io_signature.h
index ef59e6ed51f..5b43ac9c69b 100644
--- a/Mesh_3/include/CGAL/Mesh_3/io_signature.h
+++ b/Mesh_3/include/CGAL/Mesh_3/io_signature.h
@@ -13,8 +13,8 @@
 #ifndef CGAL_MESH_3_IO_SIGNATURE_H
 #define CGAL_MESH_3_IO_SIGNATURE_H
 
-#include <CGAL/license/TMDS_3.h>
+#include <CGAL/license/SMDS_3.h>
 
-#include <CGAL/TMDS_3/io_signature.h>
+#include <CGAL/SMDS_3/io_signature.h>
 
 #endif // CGAL_MESH_3_IO_SIGNATURE_H
diff --git a/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h b/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
index 61b3ba5a904..e9a58de83d5 100644
--- a/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
+++ b/Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
@@ -29,7 +29,7 @@
 #include <CGAL/is_streamable.h>
 #include <CGAL/Real_timer.h>
 #include <CGAL/property_map.h>
-#include <CGAL/TMDS_3/internal/indices_management.h>
+#include <CGAL/SMDS_3/internal/indices_management.h>
 
 #include <vector>
 #include <set>
diff --git a/Mesh_3/include/CGAL/Mesh_triangulation_3.h b/Mesh_3/include/CGAL/Mesh_triangulation_3.h
index f637b3f6dc2..8d8012806c7 100644
--- a/Mesh_3/include/CGAL/Mesh_triangulation_3.h
+++ b/Mesh_3/include/CGAL/Mesh_triangulation_3.h
@@ -28,7 +28,7 @@
 
 #include <CGAL/Mesh_vertex_base_3.h>
 #include <CGAL/Compact_mesh_cell_base_3.h>
-#include <CGAL/TMDS_3/io_signature.h>
+#include <CGAL/SMDS_3/io_signature.h>
 
 namespace CGAL {
 
diff --git a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
index 3abadd354b1..96743cc70e3 100644
--- a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
@@ -59,9 +59,9 @@
 
 // To handle I/O for Surface_patch_index if that is a pair of `int` (the
 // default)
-#include <CGAL/TMDS_3/internal/Handle_IO_for_pair_of_int.h>
+#include <CGAL/SMDS_3/internal/Handle_IO_for_pair_of_int.h>
 
-#include <CGAL/TMDS_3/internal/indices_management.h>
+#include <CGAL/SMDS_3/internal/indices_management.h>
 
 namespace CGAL {
 
diff --git a/Mesh_3/include/CGAL/make_mesh_3.h b/Mesh_3/include/CGAL/make_mesh_3.h
index 708916e3ef7..39acb952459 100644
--- a/Mesh_3/include/CGAL/make_mesh_3.h
+++ b/Mesh_3/include/CGAL/make_mesh_3.h
@@ -26,7 +26,7 @@
 #include <CGAL/refine_mesh_3.h>
 #include <CGAL/tags.h>
 #include <CGAL/Mesh_3/Protect_edges_sizing_field.h>
-#include <CGAL/TMDS_3/Has_features.h>
+#include <CGAL/SMDS_3/Has_features.h>
 #include <CGAL/Mesh_3/C3T3_helpers.h>
 
 #include <boost/mpl/has_xxx.hpp>
diff --git a/Mesh_3/include/CGAL/refine_mesh_3.h b/Mesh_3/include/CGAL/refine_mesh_3.h
index b9b4c7ede9c..bfa15f78f06 100644
--- a/Mesh_3/include/CGAL/refine_mesh_3.h
+++ b/Mesh_3/include/CGAL/refine_mesh_3.h
@@ -27,7 +27,7 @@
 #include <CGAL/Mesh_3/Mesher_3.h>
 #include <CGAL/Mesh_error_code.h>
 #include <CGAL/optimize_mesh_3.h>
-#include <CGAL/TMDS_3/Dump_c3t3.h>
+#include <CGAL/SMDS_3/Dump_c3t3.h>
 
 #include <boost/parameter/preprocessor.hpp>
 
diff --git a/Mesh_3/package_info/Mesh_3/dependencies b/Mesh_3/package_info/Mesh_3/dependencies
index fa688756df4..78670db3b00 100644
--- a/Mesh_3/package_info/Mesh_3/dependencies
+++ b/Mesh_3/package_info/Mesh_3/dependencies
@@ -36,7 +36,7 @@ Solver_interface
 Spatial_searching
 Spatial_sorting
 Stream_support
-TMDS_3
+SMDS_3
 TDS_3
 Triangulation_3
 Union_find
diff --git a/Mesh_3/test/Mesh_3/test_mesh_cell_base_3.cpp b/Mesh_3/test/Mesh_3/test_mesh_cell_base_3.cpp
index 50da33220ee..8e3e650625c 100644
--- a/Mesh_3/test/Mesh_3/test_mesh_cell_base_3.cpp
+++ b/Mesh_3/test/Mesh_3/test_mesh_cell_base_3.cpp
@@ -4,7 +4,7 @@
 
 #include <CGAL/Mesh_triangulation_3.h>
 #include <CGAL/Mesh_complex_3_in_triangulation_3.h>
-#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
+#include <CGAL/SMDS_3/tet_soup_to_c3t3.h>
 #include <CGAL/Mesh_3/Robust_intersection_traits_3.h>
 #include <CGAL/Polyhedral_mesh_domain_with_features_3.h>
 #include <CGAL/Mesh_cell_base_3.h>
@@ -49,7 +49,7 @@ int main (int argc, char** argv){
     return 1;
   }
   C3t3 c3t3;
-  if(CGAL::TMDS_3::build_triangulation_from_file(in, c3t3.triangulation()))
+  if(CGAL::SMDS_3::build_triangulation_from_file(in, c3t3.triangulation()))
   {
     for( C3t3::Triangulation::Finite_cells_iterator
          cit = c3t3.triangulation().finite_cells_begin();
diff --git a/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp b/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
index 4b869145ac0..3f8b51cf7c4 100644
--- a/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
+++ b/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
@@ -15,14 +15,14 @@
 // File Description :
 //******************************************************************************
 
-#include <CGAL/TMDS_3/io_signature.h>
+#include <CGAL/SMDS_3/io_signature.h>
 #include "test_meshing_utilities.h"
 #include <CGAL/Polyhedral_mesh_domain_3.h>
 #include <CGAL/IO/Polyhedron_iostream.h>
 
 #include <boost/type_traits/is_same.hpp>
 
-#include <CGAL/TMDS_3/Dump_c3t3.h>
+#include <CGAL/SMDS_3/Dump_c3t3.h>
 
 #include <CGAL/disable_warnings.h>
 
diff --git a/Mesh_3/test/Mesh_3/test_meshing_unit_tetrahedron.cpp b/Mesh_3/test/Mesh_3/test_meshing_unit_tetrahedron.cpp
index b9e46d35900..5781f445050 100644
--- a/Mesh_3/test/Mesh_3/test_meshing_unit_tetrahedron.cpp
+++ b/Mesh_3/test/Mesh_3/test_meshing_unit_tetrahedron.cpp
@@ -6,7 +6,7 @@
 #include <CGAL/Mesh_criteria_3.h>
 #include <CGAL/Polyhedral_mesh_domain_with_features_3.h>
 #include <CGAL/make_mesh_3.h>
-#include <CGAL/TMDS_3/Dump_c3t3.h>
+#include <CGAL/SMDS_3/Dump_c3t3.h>
 
 #include <sstream>
 
diff --git a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h
index 77eff5443cc..260f521d03b 100644
--- a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h
+++ b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/IO/File_medit.h
@@ -308,7 +308,7 @@ void output_to_medit(std::ostream& os,
 #endif
   CGAL_precondition(c3t3.triangulation().is_1_cover());
 
-  typedef CGAL::TMDS_3::Medit_pmap_generator<C3T3, rebind, no_patch>  Generator;
+  typedef CGAL::SMDS_3::Medit_pmap_generator<C3T3, rebind, no_patch>  Generator;
   typedef typename Generator::Cell_pmap                               Cell_pmap;
   typedef typename Generator::Facet_pmap                              Facet_pmap;
   typedef typename Generator::Facet_pmap_twice                        Facet_pmap_twice;
diff --git a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h
index bd120a6e7db..9c4d91afea9 100644
--- a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h
+++ b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h
@@ -31,12 +31,12 @@
 
 #include <CGAL/license/Periodic_3_mesh_3.h>
 
-#include <CGAL/TMDS_3/io_signature.h>
+#include <CGAL/SMDS_3/io_signature.h>
 #ifdef CGAL_MESH_3_DUMP_FEATURES_PROTECTION_ITERATIONS
 #include <CGAL/IO/File_binary_mesh_3.h>
 #endif
 #include <CGAL/Mesh_3/Protect_edges_sizing_field.h>
-#include <CGAL/TMDS_3/utilities.h>
+#include <CGAL/SMDS_3/utilities.h>
 #include <CGAL/Mesh_3/Triangulation_helpers.h>
 
 #include <CGAL/enum.h>
@@ -75,7 +75,7 @@ namespace Periodic_3_mesh_3 {
 
 template <typename C3T3, typename MeshDomain, typename SizingFunction>
 class Protect_edges_sizing_field
-  : public CGAL::TMDS_3::internal::Debug_messages_tools
+  : public CGAL::SMDS_3::internal::Debug_messages_tools
 {
   typedef Protect_edges_sizing_field          Self;
 
diff --git a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_triangulation_3.h b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_triangulation_3.h
index 560ecac3aca..64f113fa331 100644
--- a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_triangulation_3.h
+++ b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_triangulation_3.h
@@ -38,7 +38,7 @@
 #include <CGAL/Cartesian_converter.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Kernel_traits.h>
-#include <CGAL/TMDS_3/io_signature.h>
+#include <CGAL/SMDS_3/io_signature.h>
 #include <CGAL/tags.h>
 
 #include <iostream>
diff --git a/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h b/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h
index e8c27e63802..de1b05fbf0a 100644
--- a/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h
+++ b/Periodic_3_mesh_3/include/CGAL/refine_periodic_3_mesh_3.h
@@ -21,7 +21,7 @@
 #include <CGAL/Periodic_3_mesh_3/config.h>
 
 #include <CGAL/Mesh_3/C3T3_helpers.h>
-#include <CGAL/TMDS_3/Dump_c3t3.h>
+#include <CGAL/SMDS_3/Dump_c3t3.h>
 #include <CGAL/Mesh_3/Triangulation_helpers.h>
 #include <CGAL/refine_mesh_3.h>
 #include <CGAL/Time_stamper.h>
diff --git a/Periodic_3_mesh_3/package_info/Periodic_3_mesh_3/dependencies b/Periodic_3_mesh_3/package_info/Periodic_3_mesh_3/dependencies
index 02185d82c78..daab68c8c70 100644
--- a/Periodic_3_mesh_3/package_info/Periodic_3_mesh_3/dependencies
+++ b/Periodic_3_mesh_3/package_info/Periodic_3_mesh_3/dependencies
@@ -32,7 +32,7 @@ STL_Extension
 Solver_interface
 Spatial_sorting
 Stream_support
-TMDS_3
+SMDS_3
 TDS_3
 Triangulation_3
 Union_find
diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp
index c976fcdd3e1..48a82575b53 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp
@@ -10,7 +10,7 @@
 //                 Jane Tournois
 //
 
-#include <CGAL/TMDS_3/io_signature.h>
+#include <CGAL/SMDS_3/io_signature.h>
 #include <QtCore/qglobal.h>
 
 #include "Scene_surface_mesh_item.h"
@@ -37,7 +37,7 @@
 #include <CGAL/boost/graph/Euler_operations.h>
 #include <CGAL/property_map.h>
 #include <CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h>
-#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
+#include <CGAL/SMDS_3/tet_soup_to_c3t3.h>
 #include <CGAL/IO/output_to_vtu.h>
 #include <CGAL/boost/graph/io.h>
 
@@ -425,7 +425,7 @@ public:
         }
       }
 
-      CGAL::TMDS_3::build_triangulation_with_subdomains_range(
+      CGAL::SMDS_3::build_triangulation_with_subdomains_range(
         c3t3_item->c3t3().triangulation(),
         points, finite_cells, subdomains, border_facets);
 
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp
index e60b52609e6..a0d02e08b97 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp
@@ -1,6 +1,6 @@
-#include <CGAL/TMDS_3/io_signature.h>
+#include <CGAL/SMDS_3/io_signature.h>
 #include "Scene_c3t3_item.h"
-#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
+#include <CGAL/SMDS_3/tet_soup_to_c3t3.h>
 #include <CGAL/Three/Polyhedron_demo_io_plugin_interface.h>
 #include <CGAL/Three/Three.h>
 #include <CGAL/IO/File_avizo.h>
@@ -129,7 +129,7 @@ Polyhedron_demo_c3t3_binary_io_plugin::load(
       item->setName(fileinfo.baseName());
       item->set_valid(false);
 
-      if(CGAL::TMDS_3::build_triangulation_from_file(in, item->c3t3().triangulation(), true))
+      if(CGAL::SMDS_3::build_triangulation_from_file(in, item->c3t3().triangulation(), true))
       {
         item->c3t3().rescan_after_load_of_triangulation(); //fix counters for facets and cells
         for( C3t3::Cell_handle cit : item->c3t3().triangulation().finite_cell_handles())
diff --git a/TMDS_3/doc/SMDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h b/SMDS_3/doc/SMDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h
similarity index 100%
rename from TMDS_3/doc/SMDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h
rename to SMDS_3/doc/SMDS_3/Concepts/MeshComplexWithFeatures_3InTriangulation_3.h
diff --git a/TMDS_3/doc/SMDS_3/Concepts/MeshComplex_3InTriangulation_3.h b/SMDS_3/doc/SMDS_3/Concepts/MeshComplex_3InTriangulation_3.h
similarity index 100%
rename from TMDS_3/doc/SMDS_3/Concepts/MeshComplex_3InTriangulation_3.h
rename to SMDS_3/doc/SMDS_3/Concepts/MeshComplex_3InTriangulation_3.h
diff --git a/TMDS_3/doc/SMDS_3/Doxyfile.in b/SMDS_3/doc/SMDS_3/Doxyfile.in
similarity index 100%
rename from TMDS_3/doc/SMDS_3/Doxyfile.in
rename to SMDS_3/doc/SMDS_3/Doxyfile.in
diff --git a/TMDS_3/doc/SMDS_3/PackageDescription.txt b/SMDS_3/doc/SMDS_3/PackageDescription.txt
similarity index 100%
rename from TMDS_3/doc/SMDS_3/PackageDescription.txt
rename to SMDS_3/doc/SMDS_3/PackageDescription.txt
diff --git a/TMDS_3/doc/SMDS_3/TMDS_3.txt b/SMDS_3/doc/SMDS_3/TMDS_3.txt
similarity index 100%
rename from TMDS_3/doc/SMDS_3/TMDS_3.txt
rename to SMDS_3/doc/SMDS_3/TMDS_3.txt
diff --git a/TMDS_3/doc/SMDS_3/dependencies b/SMDS_3/doc/SMDS_3/dependencies
similarity index 100%
rename from TMDS_3/doc/SMDS_3/dependencies
rename to SMDS_3/doc/SMDS_3/dependencies
diff --git a/TMDS_3/doc/SMDS_3/examples.txt b/SMDS_3/doc/SMDS_3/examples.txt
similarity index 100%
rename from TMDS_3/doc/SMDS_3/examples.txt
rename to SMDS_3/doc/SMDS_3/examples.txt
diff --git a/SMDS_3/doc/SMDS_3/fig/c3t3_cells.jpg b/SMDS_3/doc/SMDS_3/fig/c3t3_cells.jpg
new file mode 100644
index 00000000000..62a8b2201cc
Binary files /dev/null and b/SMDS_3/doc/SMDS_3/fig/c3t3_cells.jpg differ
diff --git a/SMDS_3/doc/SMDS_3/fig/knot_full.jpg b/SMDS_3/doc/SMDS_3/fig/knot_full.jpg
new file mode 100644
index 00000000000..f46488dfbe1
Binary files /dev/null and b/SMDS_3/doc/SMDS_3/fig/knot_full.jpg differ
diff --git a/SMDS_3/doc/SMDS_3/fig/knot_small.png b/SMDS_3/doc/SMDS_3/fig/knot_small.png
new file mode 100644
index 00000000000..1a1174466a6
Binary files /dev/null and b/SMDS_3/doc/SMDS_3/fig/knot_small.png differ
diff --git a/TMDS_3/include/CGAL/Compact_mesh_cell_base_3.h b/SMDS_3/include/CGAL/Compact_mesh_cell_base_3.h
similarity index 100%
rename from TMDS_3/include/CGAL/Compact_mesh_cell_base_3.h
rename to SMDS_3/include/CGAL/Compact_mesh_cell_base_3.h
diff --git a/TMDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h b/SMDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h
similarity index 100%
rename from TMDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h
rename to SMDS_3/include/CGAL/IO/Complex_3_in_triangulation_3_to_vtk.h
diff --git a/TMDS_3/include/CGAL/IO/File_avizo.h b/SMDS_3/include/CGAL/IO/File_avizo.h
similarity index 100%
rename from TMDS_3/include/CGAL/IO/File_avizo.h
rename to SMDS_3/include/CGAL/IO/File_avizo.h
diff --git a/TMDS_3/include/CGAL/IO/File_binary_mesh_3.h b/SMDS_3/include/CGAL/IO/File_binary_mesh_3.h
similarity index 100%
rename from TMDS_3/include/CGAL/IO/File_binary_mesh_3.h
rename to SMDS_3/include/CGAL/IO/File_binary_mesh_3.h
diff --git a/TMDS_3/include/CGAL/IO/File_maya.h b/SMDS_3/include/CGAL/IO/File_maya.h
similarity index 100%
rename from TMDS_3/include/CGAL/IO/File_maya.h
rename to SMDS_3/include/CGAL/IO/File_maya.h
diff --git a/TMDS_3/include/CGAL/IO/File_medit.h b/SMDS_3/include/CGAL/IO/File_medit.h
similarity index 100%
rename from TMDS_3/include/CGAL/IO/File_medit.h
rename to SMDS_3/include/CGAL/IO/File_medit.h
diff --git a/TMDS_3/include/CGAL/IO/File_tetgen.h b/SMDS_3/include/CGAL/IO/File_tetgen.h
similarity index 100%
rename from TMDS_3/include/CGAL/IO/File_tetgen.h
rename to SMDS_3/include/CGAL/IO/File_tetgen.h
diff --git a/TMDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h b/SMDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h
similarity index 100%
rename from TMDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h
rename to SMDS_3/include/CGAL/IO/facets_in_complex_3_to_triangle_mesh.h
diff --git a/TMDS_3/include/CGAL/IO/output_to_vtu.h b/SMDS_3/include/CGAL/IO/output_to_vtu.h
similarity index 100%
rename from TMDS_3/include/CGAL/IO/output_to_vtu.h
rename to SMDS_3/include/CGAL/IO/output_to_vtu.h
diff --git a/TMDS_3/include/CGAL/Mesh_cell_base_3.h b/SMDS_3/include/CGAL/Mesh_cell_base_3.h
similarity index 100%
rename from TMDS_3/include/CGAL/Mesh_cell_base_3.h
rename to SMDS_3/include/CGAL/Mesh_cell_base_3.h
diff --git a/TMDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h b/SMDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
similarity index 100%
rename from TMDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
rename to SMDS_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
diff --git a/TMDS_3/include/CGAL/Mesh_vertex_base_3.h b/SMDS_3/include/CGAL/Mesh_vertex_base_3.h
similarity index 100%
rename from TMDS_3/include/CGAL/Mesh_vertex_base_3.h
rename to SMDS_3/include/CGAL/Mesh_vertex_base_3.h
diff --git a/TMDS_3/include/CGAL/SMDS_3/Dump_c3t3.h b/SMDS_3/include/CGAL/SMDS_3/Dump_c3t3.h
similarity index 100%
rename from TMDS_3/include/CGAL/SMDS_3/Dump_c3t3.h
rename to SMDS_3/include/CGAL/SMDS_3/Dump_c3t3.h
diff --git a/TMDS_3/include/CGAL/SMDS_3/Has_features.h b/SMDS_3/include/CGAL/SMDS_3/Has_features.h
similarity index 100%
rename from TMDS_3/include/CGAL/SMDS_3/Has_features.h
rename to SMDS_3/include/CGAL/SMDS_3/Has_features.h
diff --git a/TMDS_3/include/CGAL/SMDS_3/Mesh_surface_cell_base_3.h b/SMDS_3/include/CGAL/SMDS_3/Mesh_surface_cell_base_3.h
similarity index 100%
rename from TMDS_3/include/CGAL/SMDS_3/Mesh_surface_cell_base_3.h
rename to SMDS_3/include/CGAL/SMDS_3/Mesh_surface_cell_base_3.h
diff --git a/TMDS_3/include/CGAL/SMDS_3/config.h b/SMDS_3/include/CGAL/SMDS_3/config.h
similarity index 100%
rename from TMDS_3/include/CGAL/SMDS_3/config.h
rename to SMDS_3/include/CGAL/SMDS_3/config.h
diff --git a/TMDS_3/include/CGAL/SMDS_3/internal/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h b/SMDS_3/include/CGAL/SMDS_3/internal/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h
similarity index 100%
rename from TMDS_3/include/CGAL/SMDS_3/internal/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h
rename to SMDS_3/include/CGAL/SMDS_3/internal/Boundary_of_subdomain_of_complex_3_in_triangulation_3_to_off.h
diff --git a/TMDS_3/include/CGAL/SMDS_3/internal/Handle_IO_for_pair_of_int.h b/SMDS_3/include/CGAL/SMDS_3/internal/Handle_IO_for_pair_of_int.h
similarity index 100%
rename from TMDS_3/include/CGAL/SMDS_3/internal/Handle_IO_for_pair_of_int.h
rename to SMDS_3/include/CGAL/SMDS_3/internal/Handle_IO_for_pair_of_int.h
diff --git a/TMDS_3/include/CGAL/SMDS_3/internal/TMDS_3_helper.h b/SMDS_3/include/CGAL/SMDS_3/internal/TMDS_3_helper.h
similarity index 100%
rename from TMDS_3/include/CGAL/SMDS_3/internal/TMDS_3_helper.h
rename to SMDS_3/include/CGAL/SMDS_3/internal/TMDS_3_helper.h
diff --git a/TMDS_3/include/CGAL/SMDS_3/internal/indices_management.h b/SMDS_3/include/CGAL/SMDS_3/internal/indices_management.h
similarity index 100%
rename from TMDS_3/include/CGAL/SMDS_3/internal/indices_management.h
rename to SMDS_3/include/CGAL/SMDS_3/internal/indices_management.h
diff --git a/TMDS_3/include/CGAL/SMDS_3/io_signature.h b/SMDS_3/include/CGAL/SMDS_3/io_signature.h
similarity index 100%
rename from TMDS_3/include/CGAL/SMDS_3/io_signature.h
rename to SMDS_3/include/CGAL/SMDS_3/io_signature.h
diff --git a/TMDS_3/include/CGAL/SMDS_3/tet_soup_to_c3t3.h b/SMDS_3/include/CGAL/SMDS_3/tet_soup_to_c3t3.h
similarity index 100%
rename from TMDS_3/include/CGAL/SMDS_3/tet_soup_to_c3t3.h
rename to SMDS_3/include/CGAL/SMDS_3/tet_soup_to_c3t3.h
diff --git a/TMDS_3/include/CGAL/SMDS_3/utilities.h b/SMDS_3/include/CGAL/SMDS_3/utilities.h
similarity index 100%
rename from TMDS_3/include/CGAL/SMDS_3/utilities.h
rename to SMDS_3/include/CGAL/SMDS_3/utilities.h
diff --git a/TMDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h b/SMDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h
similarity index 100%
rename from TMDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h
rename to SMDS_3/include/CGAL/facets_in_complex_3_to_triangle_mesh.h
diff --git a/TMDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h b/SMDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h
similarity index 100%
rename from TMDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h
rename to SMDS_3/include/CGAL/tetrahedron_soup_to_triangulation_3.h
diff --git a/STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h b/STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h
index 26a269be2dd..25144940231 100644
--- a/STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h
+++ b/STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h
@@ -209,7 +209,7 @@ CGAL_add_named_parameter(cell_selector_t, cell_selector, cell_is_selected_map)
 CGAL_add_named_parameter(facet_is_constrained_t, facet_is_constrained, facet_is_constrained_map)
 CGAL_add_named_parameter(smooth_constrained_edges_t, smooth_constrained_edges, smooth_constrained_edges)
 
-// TMDS_3 parameters
+// SMDS_3 parameters
 CGAL_add_named_parameter(surface_facets_t, surface_facets, surface_facets)
 CGAL_add_named_parameter(subdomain_indices_t, subdomain_indices, subdomain_indices)
 CGAL_add_named_parameter(all_vertices_t, all_vertices, all_vertices)
diff --git a/Stream_support/doc/Stream_support/File_formats/Supported_file_formats.txt b/Stream_support/doc/Stream_support/File_formats/Supported_file_formats.txt
index 657ecbed5b9..f6e79f50527 100644
--- a/Stream_support/doc/Stream_support/File_formats/Supported_file_formats.txt
+++ b/Stream_support/doc/Stream_support/File_formats/Supported_file_formats.txt
@@ -475,7 +475,7 @@ A precise specification of those formats is available at
 
 The following \cgal data structures can be exported into the `.VTU` file format:
 
-- `CGAL::Mesh_complex_3_in_triangulation_3`, using \link PkgTMDS3IOFunctions `CGAL::IO::output_to_vtu()` \endlink
+- `CGAL::Mesh_complex_3_in_triangulation_3`, using \link PkgSMDS3IOFunctions `CGAL::IO::output_to_vtu()` \endlink
 - `CGAL::Constrained_Delaunay_triangulation_2`, using the function \link PkgMesh2IO `CGAL::IO::write_VTU()` \endlink
 
 
diff --git a/Stream_support/doc/Stream_support/dependencies b/Stream_support/doc/Stream_support/dependencies
index 48b9bf81c24..db5367a453b 100644
--- a/Stream_support/doc/Stream_support/dependencies
+++ b/Stream_support/doc/Stream_support/dependencies
@@ -14,6 +14,6 @@ Point_set_processing_3
 STL_Extension
 Surface_mesh
 Surface_mesher
-TMDS_3
+SMDS_3
 Triangulation
 Triangulation_2
diff --git a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/dependencies b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/dependencies
index 58818bcc2bb..7da5a91e523 100644
--- a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/dependencies
+++ b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/dependencies
@@ -8,4 +8,4 @@ Triangulation_3
 BGL
 Mesh_3
 TDS_3
-TMDS_3
+SMDS_3
diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h
index 36e8849458c..8e29061e860 100644
--- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h
+++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/internal/collapse_short_edges.h
@@ -28,7 +28,7 @@
 #include <utility>
 #include <unordered_set>
 
-#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
+#include <CGAL/SMDS_3/tet_soup_to_c3t3.h>
 #include <CGAL/utility.h>
 #include <CGAL/Tetrahedral_remeshing/internal/tetrahedral_remeshing_helpers.h>
 
@@ -109,7 +109,7 @@ public:
     // finished
     std::vector<Vertex_handle> new_vertices;
     std::map<Facet, typename C3t3::Surface_patch_index> border_facets;
-    if (CGAL::TMDS_3::build_triangulation_impl(
+    if (CGAL::SMDS_3::build_triangulation_impl(
             triangulation, points, finite_cells, subdomains, border_facets,
             new_vertices /*, verbose*/))
     {
diff --git a/Tetrahedral_remeshing/package_info/Tetrahedral_remeshing/dependencies b/Tetrahedral_remeshing/package_info/Tetrahedral_remeshing/dependencies
index 6094e020099..32821873795 100644
--- a/Tetrahedral_remeshing/package_info/Tetrahedral_remeshing/dependencies
+++ b/Tetrahedral_remeshing/package_info/Tetrahedral_remeshing/dependencies
@@ -23,7 +23,7 @@ Random_numbers
 STL_Extension
 Spatial_sorting
 Stream_support
-TMDS_3
+SMDS_3
 TDS_3
 Tetrahedral_remeshing
 Triangulation_3
diff --git a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing_from_mesh_file.cpp b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing_from_mesh_file.cpp
index f84cea2026e..30c83e1c533 100644
--- a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing_from_mesh_file.cpp
+++ b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/test_tetrahedral_remeshing_from_mesh_file.cpp
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <fstream>
 
-#include <CGAL/TMDS_3/tet_soup_to_c3t3.h>
+#include <CGAL/SMDS_3/tet_soup_to_c3t3.h>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
 
@@ -23,7 +23,7 @@ int main(int argc, char* argv[])
   Remeshing_triangulation tr;
 
   std::ifstream in("data/sphere.mesh");
-  if (CGAL::TMDS_3::build_triangulation_from_file(in, tr))
+  if (CGAL::SMDS_3::build_triangulation_from_file(in, tr))
     std::cout << "build triangulation ok" << std::endl;
 
   CGAL::tetrahedral_isotropic_remeshing(tr, target_edge_length);