diff --git a/vtkm/worklet/KernelSplatter.h b/vtkm/worklet/KernelSplatter.h
index 689d9f074..7d91d14bd 100644
--- a/vtkm/worklet/KernelSplatter.h
+++ b/vtkm/worklet/KernelSplatter.h
@@ -38,9 +38,9 @@
 #include <vtkm/worklet/DispatcherMapField.h>
 #include <vtkm/worklet/WorkletMapField.h>
 
-#include <vtkm/worklet/kernels/KernelBase.h>
-#include <vtkm/worklet/kernels/Gaussian.h>
-#include <vtkm/worklet/kernels/Spline3rdOrder.h>
+#include <vtkm/worklet/splatkernels/KernelBase.h>
+#include <vtkm/worklet/splatkernels/Gaussian.h>
+#include <vtkm/worklet/splatkernels/Spline3rdOrder.h>
 
 #define __VTKM_GAUSSIAN_SPLATTER_BENCHMARK
 
diff --git a/vtkm/worklet/kernels/Gaussian.h b/vtkm/worklet/splatkernels/Gaussian.h
similarity index 99%
rename from vtkm/worklet/kernels/Gaussian.h
rename to vtkm/worklet/splatkernels/Gaussian.h
index c86ec540a..3e3f118f7 100644
--- a/vtkm/worklet/kernels/Gaussian.h
+++ b/vtkm/worklet/splatkernels/Gaussian.h
@@ -29,7 +29,7 @@
 //
 
 namespace vtkm { namespace worklet {
-namespace kernels {
+namespace splatkernels {
 
 template <int Dimensions>
 struct Gaussian : public KernelBase< Gaussian<Dimensions> >
diff --git a/vtkm/worklet/kernels/KernelBase.h b/vtkm/worklet/splatkernels/KernelBase.h
similarity index 99%
rename from vtkm/worklet/kernels/KernelBase.h
rename to vtkm/worklet/splatkernels/KernelBase.h
index 67009770e..22e7b092b 100644
--- a/vtkm/worklet/kernels/KernelBase.h
+++ b/vtkm/worklet/splatkernels/KernelBase.h
@@ -24,7 +24,7 @@
 #include <vtkm/Types.h>
 
 namespace vtkm { namespace worklet {
-namespace kernels {
+namespace splatkernels {
 
 // Vector class used in the kernels
 typedef vtkm::Vec<vtkm::Float64, 3> vector_type;
diff --git a/vtkm/worklet/kernels/Spline3rdOrder.h b/vtkm/worklet/splatkernels/Spline3rdOrder.h
similarity index 99%
rename from vtkm/worklet/kernels/Spline3rdOrder.h
rename to vtkm/worklet/splatkernels/Spline3rdOrder.h
index 8f23024d5..8f00f3416 100644
--- a/vtkm/worklet/kernels/Spline3rdOrder.h
+++ b/vtkm/worklet/splatkernels/Spline3rdOrder.h
@@ -27,7 +27,7 @@
 //
 
 namespace vtkm { namespace worklet {
-namespace kernels {
+namespace splatkernels {
 
 template <int Dimensions>
 struct Spline3rdOrder : public KernelBase< Spline3rdOrder<Dimensions> >
diff --git a/vtkm/worklet/testing/UnitTestSplatKernels.cxx b/vtkm/worklet/testing/UnitTestSplatKernels.cxx
index 1faa46428..62b11ec91 100644
--- a/vtkm/worklet/testing/UnitTestSplatKernels.cxx
+++ b/vtkm/worklet/testing/UnitTestSplatKernels.cxx
@@ -21,8 +21,8 @@
 #include <vector>
 
 #include <vtkm/cont/testing/Testing.h>
-#include <vtkm/worklet/kernels/Gaussian.h>
-#include <vtkm/worklet/kernels/Spline3rdOrder.h>
+#include <vtkm/worklet/splatkernels/Gaussian.h>
+#include <vtkm/worklet/splatkernels/Spline3rdOrder.h>
 /*
 #include "KernelBox.h"
 #include "KernelCusp.h"
@@ -85,28 +85,28 @@ int TestSplatKernels() {
   std::cout << "Testing Gaussian 3D fixed h kernel integration \n";
   for (int i=0; i<100; ++i) {
     smoothinglength = 0.01 + i*(10.0/100.0);
-    s  = IntegralOfKernel(vtkm::worklet::kernels::Gaussian<3>(smoothinglength));
+    s  = IntegralOfKernel(vtkm::worklet::splatkernels::Gaussian<3>(smoothinglength));
     VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Gaussian 3D integration failure");
   }
 
   std::cout << "Testing Gaussian 3D variable h kernel integration \n";
   for (int i=0; i<100; ++i) {
     smoothinglength = 0.01 + i*(10.0/100.0);
-    s  = IntegralOfKernel(vtkm::worklet::kernels::Gaussian<3>(smoothinglength),smoothinglength);
+    s  = IntegralOfKernel(vtkm::worklet::splatkernels::Gaussian<3>(smoothinglength),smoothinglength);
     VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Gaussian 3D integration failure");
   }
 
-//  s  = IntegralOfKernel(vtkm::worklet::kernels::Gaussian<2>(smoothinglength));
+//  s  = IntegralOfKernel(vtkm::worklet::splatkernels::Gaussian<2>(smoothinglength));
 //  VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Gaussian 2D integration failure");
 
   std::cout << "Testing Spline3rdOrder 3D kernel integration \n";
   for (int i=0; i<100; ++i) {
     smoothinglength = 0.01 + i*(10.0/100.0);
-    s  = IntegralOfKernel(vtkm::worklet::kernels::Spline3rdOrder<3>(smoothinglength));
+    s  = IntegralOfKernel(vtkm::worklet::splatkernels::Spline3rdOrder<3>(smoothinglength));
     VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Spline3rdOrder 3D integration failure");
   }
 
-//  s  = IntegralOfKernel(vtkm::worklet::kernels::Spline3rdOrder<2>(smoothinglength));
+//  s  = IntegralOfKernel(vtkm::worklet::splatkernels::Spline3rdOrder<2>(smoothinglength));
 //  VTKM_TEST_ASSERT ( fabs(s - 1.0) < eps, "Spline3rdOrder 2D integration failure");
 
 /*