diff --git a/vtkm/cont/CMakeLists.txt b/vtkm/cont/CMakeLists.txt
index b0588d1e1..1b115f1ff 100644
--- a/vtkm/cont/CMakeLists.txt
+++ b/vtkm/cont/CMakeLists.txt
@@ -37,6 +37,7 @@ set(headers
   CellSetExplicit.h
   CellSetListTag.h
   CellSetStructured.h
+  ConnectivityExplicit.h
   CoordinateSystem.h
   DataSet.h
   DeviceAdapter.h
@@ -45,7 +46,6 @@ set(headers
   DynamicArrayHandle.h
   DynamicCellSet.h
   DynamicPointCoordinates.h
-  ExplicitConnectivity.h
   Error.h
   ErrorControl.h
   ErrorControlAssert.h
diff --git a/vtkm/cont/CellSetExplicit.h b/vtkm/cont/CellSetExplicit.h
index acebd34ab..6e9003f94 100644
--- a/vtkm/cont/CellSetExplicit.h
+++ b/vtkm/cont/CellSetExplicit.h
@@ -22,7 +22,7 @@
 
 #include <vtkm/TopologyElementTag.h>
 #include <vtkm/cont/CellSet.h>
-#include <vtkm/cont/ExplicitConnectivity.h>
+#include <vtkm/cont/ConnectivityExplicit.h>
 
 namespace vtkm {
 namespace cont {
@@ -33,7 +33,7 @@ template<typename ShapeStorageTag         = VTKM_DEFAULT_STORAGE_TAG,
 class CellSetExplicit : public CellSet
 {
 public:
-  typedef ExplicitConnectivity<ShapeStorageTag,
+  typedef ConnectivityExplicit<ShapeStorageTag,
                                IndexStorageTag,
                                ConnectivityStorageTag
                                > ExplicitConnectivityType;
diff --git a/vtkm/cont/ExplicitConnectivity.h b/vtkm/cont/ConnectivityExplicit.h
similarity index 91%
rename from vtkm/cont/ExplicitConnectivity.h
rename to vtkm/cont/ConnectivityExplicit.h
index a4f1e02a7..7242e0773 100644
--- a/vtkm/cont/ExplicitConnectivity.h
+++ b/vtkm/cont/ConnectivityExplicit.h
@@ -17,11 +17,11 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_cont_ExplicitConnectivity_h
-#define vtk_m_cont_ExplicitConnectivity_h
+#ifndef vtk_m_cont_ConnectivityExplicit_h
+#define vtk_m_cont_ConnectivityExplicit_h
 
 #include <vtkm/CellType.h>
-#include <vtkm/exec/ExplicitConnectivity.h>
+#include <vtkm/exec/ConnectivityExplicit.h>
 #include <vtkm/cont/ArrayHandle.h>
 #include <vtkm/cont/Field.h>
 #include <vtkm/cont/DynamicArrayHandle.h>
@@ -31,14 +31,14 @@ namespace vtkm {
 namespace cont {
 
 template<typename ShapeStorageTag         = VTKM_DEFAULT_STORAGE_TAG,
-         typename IndiceStorageTag        = VTKM_DEFAULT_STORAGE_TAG,
+         typename NumIndicesStorageTag    = VTKM_DEFAULT_STORAGE_TAG,
          typename ConnectivityStorageTag  = VTKM_DEFAULT_STORAGE_TAG >
-class ExplicitConnectivity
+class ConnectivityExplicit
 {
 public:
 
   VTKM_CONT_EXPORT
-  ExplicitConnectivity()
+  ConnectivityExplicit()
   {
     this->NumShapes = 0;
     this->ConnectivityLength = 0;
@@ -151,7 +151,7 @@ public:
   /// Assigns the array handles to the explicit connectivity. This is
   /// the way you can fill the memory from another system without copying
   void Fill(const vtkm::cont::ArrayHandle<vtkm::Id, ShapeStorageTag> &cellTypes,
-            const vtkm::cont::ArrayHandle<vtkm::Id, IndiceStorageTag> &numIndices,
+            const vtkm::cont::ArrayHandle<vtkm::Id, NumIndicesStorageTag> &numIndices,
             const vtkm::cont::ArrayHandle<vtkm::Id, ConnectivityStorageTag> &connectivity)
   {
     this->Shapes = cellTypes;
@@ -175,7 +175,7 @@ public:
   struct ExecutionTypes
   {
     typedef typename vtkm::cont::ArrayHandle<vtkm::Id, ShapeStorageTag> ShapeHandle;
-    typedef typename vtkm::cont::ArrayHandle<vtkm::Id, IndiceStorageTag> IndiceHandle;
+    typedef typename vtkm::cont::ArrayHandle<vtkm::Id, NumIndicesStorageTag> IndiceHandle;
     typedef typename vtkm::cont::ArrayHandle<vtkm::Id, ConnectivityStorageTag> ConnectivityHandle;
     typedef vtkm::cont::ArrayHandle<vtkm::Id> MapCellToConnectivityHandle;
 
@@ -184,7 +184,7 @@ public:
     typedef typename ConnectivityHandle::template ExecutionTypes<DeviceAdapterTag>::PortalConst ConnectivityPortalType;
     typedef typename MapCellToConnectivityHandle::template ExecutionTypes<DeviceAdapterTag>::PortalConst MapConnectivityPortalType;
 
-    typedef vtkm::exec::ExplicitConnectivity<ShapePortalType,
+    typedef vtkm::exec::ConnectivityExplicit<ShapePortalType,
                                              IndicePortalType,
                                              ConnectivityPortalType,
                                              MapConnectivityPortalType
@@ -205,7 +205,7 @@ public:
   VTKM_CONT_EXPORT
   virtual void PrintSummary(std::ostream &out) const
   {
-      out << "    ExplicitConnectivity: #shapes= " << this->NumShapes
+      out << "    ConnectivityExplicit: #shapes= " << this->NumShapes
           << " #connectivity= " << ConnectivityLength << std::endl;
       out <<"     Shapes: ";
       printSummary_ArrayHandle(Shapes, out);
@@ -223,15 +223,15 @@ public:
   GetShapesArray() const { return this->Shapes; }
 
   VTKM_CONT_EXPORT
-  vtkm::cont::ArrayHandle<vtkm::Id, ShapeStorageTag> &
+  vtkm::cont::ArrayHandle<vtkm::Id, NumIndicesStorageTag> &
   GetNumIndicesArray() const { return this->NumIndices; }
 
   VTKM_CONT_EXPORT
-  const vtkm::cont::ArrayHandle<vtkm::Id, ShapeStorageTag> &
+  const vtkm::cont::ArrayHandle<vtkm::Id, ConnectivityStorageTag> &
   GetConnectivityArray() const { return this->Connectivity; }
 
   VTKM_CONT_EXPORT
-  const vtkm::cont::ArrayHandle<vtkm::Id, ShapeStorageTag> &
+  const vtkm::cont::ArrayHandle<vtkm::Id> &
   GetCellToConnectivityIndexArray() const {
     return this->MapCellToConnectivityIndex;
   }
@@ -240,7 +240,7 @@ private:
   vtkm::Id ConnectivityLength;
   vtkm::Id NumShapes;
   vtkm::cont::ArrayHandle<vtkm::Id, ShapeStorageTag> Shapes;
-  vtkm::cont::ArrayHandle<vtkm::Id, IndiceStorageTag> NumIndices;
+  vtkm::cont::ArrayHandle<vtkm::Id, NumIndicesStorageTag> NumIndices;
   vtkm::cont::ArrayHandle<vtkm::Id, ConnectivityStorageTag> Connectivity;
   vtkm::cont::ArrayHandle<vtkm::Id> MapCellToConnectivityIndex;
 };
@@ -248,4 +248,4 @@ private:
 }
 } // namespace vtkm::cont
 
-#endif //vtk_m_cont_ExplicitConnectivity_h
+#endif //vtk_m_cont_ConnectivityExplicit_h
diff --git a/vtkm/cont/DataSet.h b/vtkm/cont/DataSet.h
index aa210c086..0cc742bee 100644
--- a/vtkm/cont/DataSet.h
+++ b/vtkm/cont/DataSet.h
@@ -22,14 +22,12 @@
 
 #include <vtkm/CellType.h>
 #include <vtkm/cont/ArrayHandle.h>
-#include <vtkm/cont/Field.h>
+#include <vtkm/cont/CoordinateSystem.h>
 #include <vtkm/cont/DynamicArrayHandle.h>
 #include <vtkm/cont/DynamicCellSet.h>
 #include <vtkm/cont/DeviceAdapterAlgorithm.h>
-#include <vtkm/cont/ExplicitConnectivity.h>
-#include <vtkm/RegularConnectivity.h>
-#include <vtkm/cont/CoordinateSystem.h>
 #include <vtkm/cont/ErrorControlBadValue.h>
+#include <vtkm/cont/Field.h>
 
 namespace vtkm {
 namespace cont {
diff --git a/vtkm/cont/testing/MakeTestDataSet.h b/vtkm/cont/testing/MakeTestDataSet.h
index 4ac47dcea..459a35fa9 100644
--- a/vtkm/cont/testing/MakeTestDataSet.h
+++ b/vtkm/cont/testing/MakeTestDataSet.h
@@ -151,7 +151,7 @@ MakeTestDataSet::Make3DExplicitDataSet0()
   conn.push_back(4);
 
   vtkm::cont::CellSetExplicit<> cs("cells", 2);
-  vtkm::cont::ExplicitConnectivity<> &ec = cs.NodesOfCellsConnectivity;
+  vtkm::cont::ConnectivityExplicit<> &ec = cs.NodesOfCellsConnectivity;
   ec.FillViaCopy(shapes, numindices, conn);
 
   ds.AddCellSet(cs);
@@ -183,7 +183,7 @@ MakeTestDataSet::Make3DExplicitDataSet1()
   ds.AddField(Field("cellvar", 1, vtkm::cont::Field::ASSOC_CELL_SET, "cells", cellvar, 2));
 
   vtkm::cont::CellSetExplicit<> cellSet("cells", 2);
-  vtkm::cont::ExplicitConnectivity<> &ec = cellSet.NodesOfCellsConnectivity;
+  vtkm::cont::ConnectivityExplicit<> &ec = cellSet.NodesOfCellsConnectivity;
 
   ec.PrepareToAddCells(2, 7);
   ec.AddCell(vtkm::VTKM_TRIANGLE, 3, make_Vec<vtkm::Id>(0,1,2));
@@ -225,7 +225,7 @@ MakeTestDataSet::Make3DExplicitDataSetCowNose(double *pBounds)
   ds.AddCoordinateSystem(vtkm::cont::CoordinateSystem("x","y","z"));
 
   vtkm::cont::CellSetExplicit<> cellSet("cells", 2);
-  vtkm::cont::ExplicitConnectivity<> &ec = cellSet.NodesOfCellsConnectivity;
+  vtkm::cont::ConnectivityExplicit<> &ec = cellSet.NodesOfCellsConnectivity;
 
   ec.PrepareToAddCells(nPointIds/3, nPointIds);
   for (i=0; i<nPointIds/3; i++)
diff --git a/vtkm/exec/CMakeLists.txt b/vtkm/exec/CMakeLists.txt
index 62372fc6f..a9f97a1ef 100644
--- a/vtkm/exec/CMakeLists.txt
+++ b/vtkm/exec/CMakeLists.txt
@@ -20,9 +20,9 @@
 
 set(headers
   Assert.h
+  ConnectivityExplicit.h
   ExecutionObjectBase.h
   ExecutionWholeArray.h
-  ExplicitConnectivity.h
   FunctorBase.h
   TopologyData.h
   )
diff --git a/vtkm/exec/ExplicitConnectivity.h b/vtkm/exec/ConnectivityExplicit.h
similarity index 85%
rename from vtkm/exec/ExplicitConnectivity.h
rename to vtkm/exec/ConnectivityExplicit.h
index d7ecac4d9..a5e453c94 100644
--- a/vtkm/exec/ExplicitConnectivity.h
+++ b/vtkm/exec/ConnectivityExplicit.h
@@ -17,8 +17,8 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_exec_ExplicitConnectivity_h
-#define vtk_m_exec_ExplicitConnectivity_h
+#ifndef vtk_m_exec_ConnectivityExplicit_h
+#define vtk_m_exec_ConnectivityExplicit_h
 
 #include <vtkm/Types.h>
 #include <vtkm/cont/DeviceAdapter.h>
@@ -28,17 +28,17 @@ namespace vtkm {
 namespace exec {
 
 template<typename ShapePortalType,
-         typename IndicePortalType,
+         typename NumIndicesPortalType,
          typename ConnectivityPortalType,
          typename MapConnectivityPortalType
          >
-class ExplicitConnectivity
+class ConnectivityExplicit
 {
 public:
-  ExplicitConnectivity() {}
+  ConnectivityExplicit() {}
 
-  ExplicitConnectivity(const ShapePortalType& shapePortal,
-                       const IndicePortalType& indicePortal,
+  ConnectivityExplicit(const ShapePortalType& shapePortal,
+                       const NumIndicesPortalType& indicePortal,
                        const ConnectivityPortalType& connPortal,
                        const MapConnectivityPortalType& mapConnPortal
                        )
@@ -80,7 +80,7 @@ public:
 
 private:
  ShapePortalType Shapes;
- IndicePortalType NumIndices;
+ NumIndicesPortalType NumIndices;
  ConnectivityPortalType Connectivity;
  MapConnectivityPortalType MapCellToConnectivityIndex;
 };
@@ -88,4 +88,4 @@ private:
 } // namespace exec
 } // namespace vtkm
 
-#endif //  vtk_m_exec_ExplicitConnectivity_h
+#endif //  vtk_m_exec_ConnectivityExplicit_h
diff --git a/vtkm/worklet/DispatcherMapTopology.h b/vtkm/worklet/DispatcherMapTopology.h
index bdd8cb8f7..8be91fd0a 100644
--- a/vtkm/worklet/DispatcherMapTopology.h
+++ b/vtkm/worklet/DispatcherMapTopology.h
@@ -22,8 +22,8 @@
 
 #include <vtkm/RegularConnectivity.h>
 
+#include <vtkm/cont/ConnectivityExplicit.h>
 #include <vtkm/cont/DeviceAdapter.h>
-#include <vtkm/cont/ExplicitConnectivity.h>
 #include <vtkm/worklet/WorkletMapTopology.h>
 #include <vtkm/worklet/internal/DispatcherBase.h>
 
@@ -104,7 +104,7 @@ public:
            typename V>
   VTKM_CONT_EXPORT
   void InvokeBasedOnDomainType(const Invocation &invocation,
-                               const vtkm::cont::ExplicitConnectivity<T,U,V>& domain) const
+                               const vtkm::cont::ConnectivityExplicit<T,U,V>& domain) const
   {
 
     // For a DispatcherMapTopology, when the inputDomain is some for of
diff --git a/vtkm/worklet/VertexClustering.h b/vtkm/worklet/VertexClustering.h
index 31e8a22a7..4b980d814 100644
--- a/vtkm/worklet/VertexClustering.h
+++ b/vtkm/worklet/VertexClustering.h
@@ -37,8 +37,8 @@
 #include <vtkm/cont/ArrayHandleConstant.h>
 #include <vtkm/cont/ArrayHandleCompositeVector.h>
 
+#include <vtkm/cont/ConnectivityExplicit.h>
 #include <vtkm/cont/Field.h>
-#include <vtkm/cont/ExplicitConnectivity.h>
 #include <vtkm/cont/DataSet.h>
 
 #include <vtkm/worklet/AverageByKey.h>
diff --git a/vtkm/worklet/testing/UnitTestPointElevation.cxx b/vtkm/worklet/testing/UnitTestPointElevation.cxx
index 0f6636ad6..5e600840b 100644
--- a/vtkm/worklet/testing/UnitTestPointElevation.cxx
+++ b/vtkm/worklet/testing/UnitTestPointElevation.cxx
@@ -21,7 +21,9 @@
 #include <vtkm/worklet/PointElevation.h>
 #include <vtkm/worklet/DispatcherMapField.h>
 
+#include <vtkm/cont/CellSetExplicit.h>
 #include <vtkm/cont/DataSet.h>
+
 #include <vtkm/cont/testing/Testing.h>
 
 #include <vector>
@@ -60,7 +62,7 @@ vtkm::cont::DataSet MakePointElevationTestDataSet()
   dataSet.AddCoordinateSystem(vtkm::cont::CoordinateSystem("x","y","z"));
 
   vtkm::cont::CellSetExplicit<> cellSet("cells", 3);
-  vtkm::cont::ExplicitConnectivity<> &connectivity = cellSet.NodesOfCellsConnectivity;
+  vtkm::cont::ConnectivityExplicit<> &connectivity = cellSet.NodesOfCellsConnectivity;
   connectivity.PrepareToAddCells(numCells, numCells * 4);
   for (vtkm::Id j = 0; j < dim - 1; ++j)
   {
diff --git a/vtkm/worklet/testing/UnitTestVertexClustering.cxx b/vtkm/worklet/testing/UnitTestVertexClustering.cxx
index d5fe17447..a4d387ab4 100644
--- a/vtkm/worklet/testing/UnitTestVertexClustering.cxx
+++ b/vtkm/worklet/testing/UnitTestVertexClustering.cxx
@@ -134,7 +134,7 @@ void TestVertexClustering()
   VTKM_TEST_ASSERT(outDataSet.GetNumberOfCellSets() == 1, "Number of output cellsets mismatch");
   vtkm::cont::CellSetExplicit<> &cellSet =
       outDataSet.GetCellSet(0).CastTo<vtkm::cont::CellSetExplicit<> >();
-  vtkm::cont::ExplicitConnectivity<> &conn = cellSet.GetNodeToCellConnectivity();
+  vtkm::cont::ConnectivityExplicit<> &conn = cellSet.GetNodeToCellConnectivity();
   VTKM_TEST_ASSERT(conn.GetConnectivityArray().GetNumberOfValues() == output_pointIds, "Number of connectivity array elements mismatch");
   for (vtkm::Id i=0; i<conn.GetConnectivityArray().GetNumberOfValues(); i++)
     {