diff --git a/vtkm/filter/CMakeLists.txt b/vtkm/filter/CMakeLists.txt
index 3f09fe818..8ca0ca421 100644
--- a/vtkm/filter/CMakeLists.txt
+++ b/vtkm/filter/CMakeLists.txt
@@ -45,14 +45,19 @@ set(deprecated_headers
   MIRFilter.h
   NDEntropy.h
   NDHistogram.h
+  ParticleAdvection.h
   ParticleDensityCloudInCell.h
   ParticleDensityNearestGridPoint.h
+  Pathline.h
+  PathParticle.h
   PointAverage.h
   PointElevation.h
   PointTransform.h
   Probe.h
   Slice.h
   SplitSharpEdges.h
+  Streamline.h
+  StreamSurface.h
   SurfaceNormals.h
   Tetrahedralize.h
   Threshold.h
diff --git a/vtkm/filter/ParticleAdvection.h b/vtkm/filter/ParticleAdvection.h
new file mode 100644
index 000000000..b395c0f91
--- /dev/null
+++ b/vtkm/filter/ParticleAdvection.h
@@ -0,0 +1,34 @@
+//============================================================================
+//  Copyright (c) Kitware, Inc.
+//  All rights reserved.
+//  See LICENSE.txt for details.
+//
+//  This software is distributed WITHOUT ANY WARRANTY; without even
+//  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the above copyright notice for more information.
+//============================================================================
+#ifndef vtk_m_filter_ParticleAdvection_h
+#define vtk_m_filter_ParticleAdvection_h
+
+#include <vtkm/Deprecated.h>
+#include <vtkm/filter/flow/ParticleAdvection.h>
+
+namespace vtkm
+{
+namespace filter
+{
+
+VTKM_DEPRECATED(
+  1.8,
+  "Use vtkm/filter/flow/ParticleAdvection.h instead of vtkm/filter/ParticleAdvection.h")
+inline void ParticleAdvection_deprecated() {}
+
+inline void ParticleAdvection_deprecated_warning()
+{
+  ParticleAdvection_deprecated();
+}
+
+}
+}
+
+#endif //vtk_m_filter_ParticleAdvection_h
diff --git a/vtkm/filter/PathParticle.h b/vtkm/filter/PathParticle.h
new file mode 100644
index 000000000..064948881
--- /dev/null
+++ b/vtkm/filter/PathParticle.h
@@ -0,0 +1,32 @@
+//============================================================================
+//  Copyright (c) Kitware, Inc.
+//  All rights reserved.
+//  See LICENSE.txt for details.
+//
+//  This software is distributed WITHOUT ANY WARRANTY; without even
+//  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the above copyright notice for more information.
+//============================================================================
+#ifndef vtk_m_filter_PathParticle_h
+#define vtk_m_filter_PathParticle_h
+
+#include <vtkm/Deprecated.h>
+#include <vtkm/filter/flow/PathParticle.h>
+
+namespace vtkm
+{
+namespace filter
+{
+
+VTKM_DEPRECATED(1.8, "Use vtkm/filter/flow/PathParticle.h instead of vtkm/filter/PathParticle.h")
+inline void PathParticle_deprecated() {}
+
+inline void PathParticle_deprecated_warning()
+{
+  PathParticle_deprecated();
+}
+
+}
+}
+
+#endif //vtk_m_filter_PathParticle_h
diff --git a/vtkm/filter/Pathline.h b/vtkm/filter/Pathline.h
new file mode 100644
index 000000000..03c5df89b
--- /dev/null
+++ b/vtkm/filter/Pathline.h
@@ -0,0 +1,32 @@
+//============================================================================
+//  Copyright (c) Kitware, Inc.
+//  All rights reserved.
+//  See LICENSE.txt for details.
+//
+//  This software is distributed WITHOUT ANY WARRANTY; without even
+//  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the above copyright notice for more information.
+//============================================================================
+#ifndef vtk_m_filter_Pathline_h
+#define vtk_m_filter_Pathline_h
+
+#include <vtkm/Deprecated.h>
+#include <vtkm/filter/flow/Pathline.h>
+
+namespace vtkm
+{
+namespace filter
+{
+
+VTKM_DEPRECATED(1.8, "Use vtkm/filter/flow/Pathline.h instead of vtkm/filter/Pathline.h")
+inline void Pathline_deprecated() {}
+
+inline void Pathline_deprecated_warning()
+{
+  Pathline_deprecated();
+}
+
+}
+}
+
+#endif //vtk_m_filter_Pathline_h
diff --git a/vtkm/filter/StreamSurface.h b/vtkm/filter/StreamSurface.h
new file mode 100644
index 000000000..362c38e91
--- /dev/null
+++ b/vtkm/filter/StreamSurface.h
@@ -0,0 +1,32 @@
+//============================================================================
+//  Copyright (c) Kitware, Inc.
+//  All rights reserved.
+//  See LICENSE.txt for details.
+//
+//  This software is distributed WITHOUT ANY WARRANTY; without even
+//  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the above copyright notice for more information.
+//============================================================================
+#ifndef vtk_m_filter_StreamSurface_h
+#define vtk_m_filter_StreamSurface_h
+
+#include <vtkm/Deprecated.h>
+#include <vtkm/filter/flow/StreamSurface.h>
+
+namespace vtkm
+{
+namespace filter
+{
+
+VTKM_DEPRECATED(1.8, "Use vtkm/filter/flow/StreamSurface.h instead of vtkm/filter/StreamSurface.h")
+inline void StreamSurface_deprecated() {}
+
+inline void StreamSurface_deprecated_warning()
+{
+  StreamSurface_deprecated();
+}
+
+}
+}
+
+#endif //vtk_m_filter_StreamSurface_h
diff --git a/vtkm/filter/Streamline.h b/vtkm/filter/Streamline.h
new file mode 100644
index 000000000..39356dac3
--- /dev/null
+++ b/vtkm/filter/Streamline.h
@@ -0,0 +1,32 @@
+//============================================================================
+//  Copyright (c) Kitware, Inc.
+//  All rights reserved.
+//  See LICENSE.txt for details.
+//
+//  This software is distributed WITHOUT ANY WARRANTY; without even
+//  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+//  PURPOSE.  See the above copyright notice for more information.
+//============================================================================
+#ifndef vtk_m_filter_Streamline_h
+#define vtk_m_filter_Streamline_h
+
+#include <vtkm/Deprecated.h>
+#include <vtkm/filter/flow/Streamline.h>
+
+namespace vtkm
+{
+namespace filter
+{
+
+VTKM_DEPRECATED(1.8, "Use vtkm/filter/flow/Streamline.h instead of vtkm/filter/Streamline.h")
+inline void Streamline_deprecated() {}
+
+inline void Streamline_deprecated_warning()
+{
+  Streamline_deprecated();
+}
+
+}
+}
+
+#endif //vtk_m_filter_Streamline_h
diff --git a/vtkm/filter/flow/NewFilterParticleAdvection.h b/vtkm/filter/flow/NewFilterParticleAdvection.h
index 73f80e7c6..7df1070ca 100644
--- a/vtkm/filter/flow/NewFilterParticleAdvection.h
+++ b/vtkm/filter/flow/NewFilterParticleAdvection.h
@@ -11,6 +11,7 @@
 #ifndef vtk_m_filter_flow_NewFilterParticleAdvection_h
 #define vtk_m_filter_flow_NewFilterParticleAdvection_h
 
+#include <vtkm/Particle.h>
 #include <vtkm/filter/NewFilterField.h>
 #include <vtkm/filter/flow/FlowTypes.h>
 #include <vtkm/filter/flow/vtkm_filter_flow_export.h>
diff --git a/vtkm/filter/flow/ParticleAdvection.h b/vtkm/filter/flow/ParticleAdvection.h
index 12f5aaf3d..e973da730 100644
--- a/vtkm/filter/flow/ParticleAdvection.h
+++ b/vtkm/filter/flow/ParticleAdvection.h
@@ -36,6 +36,11 @@ private:
 };
 
 }
+struct VTKM_DEPRECATED(1.8, "Use vtkm::filter::flow::ParticleAdvection.") ParticleAdvection
+  : vtkm::filter::flow::ParticleAdvection
+{
+  using vtkm::filter::flow::ParticleAdvection::ParticleAdvection;
+};
 }
 } // namespace vtkm::filter::flow
 
diff --git a/vtkm/filter/flow/PathParticle.h b/vtkm/filter/flow/PathParticle.h
index 8f2c99c37..b606cdb4f 100644
--- a/vtkm/filter/flow/PathParticle.h
+++ b/vtkm/filter/flow/PathParticle.h
@@ -8,8 +8,8 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
-#ifndef vtk_m_filter_PathParticle_h
-#define vtk_m_filter_PathParticle_h
+#ifndef vtk_m_filter_flow_PathParticle_h
+#define vtk_m_filter_flow_PathParticle_h
 
 #include <vtkm/filter/flow/FlowTypes.h>
 #include <vtkm/filter/flow/NewFilterParticleAdvectionUnsteadyState.h>
@@ -35,7 +35,12 @@ private:
 };
 
 }
+struct VTKM_DEPRECATED(1.8, "Use vtkm::filter::flow::PathParticle.") PathParticle
+  : vtkm::filter::flow::PathParticle
+{
+  using vtkm::filter::flow::PathParticle::PathParticle;
+};
 }
 } // namespace vtkm::filter::flow
 
-#endif // vtk_m_filter_PathParticle_h
+#endif // vtk_m_filter_flow_PathParticle_h
diff --git a/vtkm/filter/flow/Pathline.h b/vtkm/filter/flow/Pathline.h
index e92cc5dc0..485b5d591 100644
--- a/vtkm/filter/flow/Pathline.h
+++ b/vtkm/filter/flow/Pathline.h
@@ -8,8 +8,8 @@
 //  PURPOSE.  See the above copyright notice for more information.
 //============================================================================
 
-#ifndef vtk_m_filter_Pathline_h
-#define vtk_m_filter_Pathline_h
+#ifndef vtk_m_filter_flow_Pathline_h
+#define vtk_m_filter_flow_Pathline_h
 
 #include <vtkm/filter/flow/FlowTypes.h>
 #include <vtkm/filter/flow/NewFilterParticleAdvectionUnsteadyState.h>
@@ -35,7 +35,12 @@ private:
 };
 
 }
+struct VTKM_DEPRECATED(1.8, "Use vtkm::filter::flow::Pathline.") Pathline
+  : vtkm::filter::flow::Pathline
+{
+  using vtkm::filter::flow::Pathline::Pathline;
+};
 }
 } // namespace vtkm::filter::flow
 
-#endif // vtk_m_filter_Pathline_h
+#endif // vtk_m_filter_flow_Pathline_h
diff --git a/vtkm/filter/flow/StreamSurface.h b/vtkm/filter/flow/StreamSurface.h
index b1c56a37b..c06a3f769 100644
--- a/vtkm/filter/flow/StreamSurface.h
+++ b/vtkm/filter/flow/StreamSurface.h
@@ -58,6 +58,11 @@ private:
 };
 
 }
+struct VTKM_DEPRECATED(1.8, "Use vtkm::filter::flow::StreamSurface.") StreamSurface
+  : vtkm::filter::flow::StreamSurface
+{
+  using vtkm::filter::flow::StreamSurface::StreamSurface;
+};
 }
 } // namespace vtkm::filter::flow
 
diff --git a/vtkm/filter/flow/Streamline.h b/vtkm/filter/flow/Streamline.h
index d4633f0e0..34a58d693 100644
--- a/vtkm/filter/flow/Streamline.h
+++ b/vtkm/filter/flow/Streamline.h
@@ -35,6 +35,11 @@ private:
 };
 
 }
+struct VTKM_DEPRECATED(1.8, "Use vtkm::filter::flow::Streamline.") Streamline
+  : vtkm::filter::flow::Streamline
+{
+  using vtkm::filter::flow::Streamline::Streamline;
+};
 }
 } // namespace vtkm::filter::flow