diff --git a/IO/XML/vtkXMLWriter.cxx b/IO/XML/vtkXMLWriter.cxx
index 555fb7a7a5773888194526b46889fd508bfb6694..3c22724e6a46f1cc21ef38128d93e824aac8c339 100644
--- a/IO/XML/vtkXMLWriter.cxx
+++ b/IO/XML/vtkXMLWriter.cxx
@@ -717,9 +717,9 @@ int vtkXMLWriter::WriteInternal()
 }
 
 //------------------------------------------------------------------------------
-vtkDataSet* vtkXMLWriter::GetInputAsDataSet()
+vtkDataSet* vtkXMLWriter::GetDataSetInput()
 {
-  return static_cast<vtkDataSet*>(this->GetInput());
+  return vtkDataSet::SafeDownCast(this->GetInput());
 }
 
 //------------------------------------------------------------------------------
diff --git a/IO/XML/vtkXMLWriter.h b/IO/XML/vtkXMLWriter.h
index 3bc5b63474c550b0664898765f3f66a81d80ff73..38c312fc9ea7e449cceab94c2f020676135e1d8d 100644
--- a/IO/XML/vtkXMLWriter.h
+++ b/IO/XML/vtkXMLWriter.h
@@ -18,6 +18,7 @@
 #ifndef vtkXMLWriter_h
 #define vtkXMLWriter_h
 
+#include "vtkDeprecation.h" // For VTK_DEPRECATED_IN_9_5_0
 #include "vtkIOXMLModule.h" // For export macro
 #include "vtkXMLWriterBase.h"
 
@@ -147,7 +148,9 @@ protected:
   virtual const char* GetDataSetName() = 0;
 
   // Utility methods for subclasses.
-  vtkDataSet* GetInputAsDataSet();
+  vtkDataSet* GetDataSetInput();
+  VTK_DEPRECATED_IN_9_5_0("Use GetDataSetInput() instead.")
+  vtkDataSet* GetInputAsDataSet() { return this->GetDataSetInput(); }
   virtual int StartFile();
   virtual void WriteFileAttributes();
   virtual int EndFile();
diff --git a/Rendering/Core/vtkMapper.h b/Rendering/Core/vtkMapper.h
index 715a27326a1f66486d29eb244d33285507c3ff1f..78185bf7d7a4172c5d04603c4d6f867ae476b1d7 100644
--- a/Rendering/Core/vtkMapper.h
+++ b/Rendering/Core/vtkMapper.h
@@ -36,6 +36,7 @@
 #define vtkMapper_h
 
 #include "vtkAbstractMapper3D.h"
+#include "vtkDeprecation.h"         // For VTK_DEPRECATED_IN_9_5_0
 #include "vtkRenderingCoreModule.h" // For export macro
 #include "vtkSmartPointer.h"        // needed for vtkSmartPointer.
 #include "vtkSystemIncludes.h"      // For VTK_COLOR_MODE_DEFAULT and _MAP_SCALARS
@@ -414,13 +415,17 @@ public:
    */
   vtkDataSet* GetInput();
 
+  ///@{
   /**
    * Get the input to this mapper as a vtkDataSet, instead of as a
    * more specialized data type that the subclass may return from
    * GetInput().  This method is provided for use in the wrapper languages,
    * C++ programmers should use GetInput() instead.
    */
-  vtkDataSet* GetInputAsDataSet() { return this->GetInput(); }
+  vtkDataSet* GetDataSetInput() { return this->GetInput(); }
+  VTK_DEPRECATED_IN_9_5_0("Use GetDataSetInput() instead.")
+  vtkDataSet* GetInputAsDataSet() { return this->GetDataSetInput(); }
+  ///@}
 
   ///@{
   /**