diff --git a/Code/BasicFilters/otbMeanShiftImageFilter.h b/Code/BasicFilters/otbMeanShiftImageFilter.h
index 734bff70a3f4417360efe5d3d33daf9b5fa4bcff..65f778a736b43753b97ea083c2f463b28621dc32 100644
--- a/Code/BasicFilters/otbMeanShiftImageFilter.h
+++ b/Code/BasicFilters/otbMeanShiftImageFilter.h
@@ -33,6 +33,8 @@ namespace MeanShift
 /** \class ScalarBufferConverter
  *  \brief Small utilities class used for buffer conversion with EDISON standard.
  *   This class handles buffer conversion when pixel type is scalar.
+ *  \deprecated
+ *
  **/
 class ScalarBufferConverter
 {
@@ -90,8 +92,9 @@ public:
  * D. Comaniciu, P. Meer, "Mean Shift Analysis and Applications," iccv, p. 1197, Seventh International Conference
  * on Computer Vision (ICCV'99) - Volume 2, 1999
  *
- * \sa MeanShiftImageFilter
- * \sa MeanShiftVectorImageFilter
+ * \deprecated use MeanShiftSegmentationFilter instead
+ *
+ * \sa MeanShiftSmootingImageFilter, MeanShiftSegmentationFilter
  *
  * \ingroup ImageEnhancement
  */
diff --git a/Code/BasicFilters/otbMeanShiftVectorImageFilter.h b/Code/BasicFilters/otbMeanShiftVectorImageFilter.h
index ccdc81a77ca071a874efaa065197012fa015d8f0..1f61e789b1fd338852f04f19fceeba3fe6907901 100644
--- a/Code/BasicFilters/otbMeanShiftVectorImageFilter.h
+++ b/Code/BasicFilters/otbMeanShiftVectorImageFilter.h
@@ -28,6 +28,7 @@ namespace MeanShift
 /** \class ScalarBufferConverter
  *  \brief Small utilities class used for buffer conversion with EDISON standard.
  *   This class handles buffer conversion when pixel type is scalar.
+ * \deprecated
  **/
 class VectorBufferConverter
 {
@@ -69,10 +70,11 @@ public:
  * otb::VectorImage or itk::VectorImage. For the full documentation, please refer to the
  * base class otb::MeanShiftImageFilter.
  *
- * \sa MeanShiftImageFilter
+ * \deprecated use MeanShiftSegmentationFilter instead
+ *
+ * \sa MeanShiftSmootingImageFilter, MeanShiftSegmentationFilter
+ *
  * \ingroup ImageEnhancement
- * \ingroup Streamed
- * \ingroup Threaded
  */
 template <class TInputImage, class TOutputImage, class TLabeledOutput = otb::Image<unsigned short, 2> >
 class MeanShiftVectorImageFilter