diff --git a/docs/changelog/rename-per-thread-runtime-tracker-method.md b/docs/changelog/rename-per-thread-runtime-tracker-method.md
new file mode 100644
index 000000000..c13f35b9f
--- /dev/null
+++ b/docs/changelog/rename-per-thread-runtime-tracker-method.md
@@ -0,0 +1,9 @@
+# Renamed RuntimeDeviceTrackers to use the term Global
+
+The `GetGlobalRuntimeDeviceTracker` never actually returned a process wide
+runtime device tracker but always a unique one for each control side thread.
+This was the design as it would allow for different threads to have different
+runtime device settings.
+
+By removing the term Global from the name it becomes more clear what scope this
+class has.
diff --git a/examples/multi_backend/MultiDeviceGradient.hxx b/examples/multi_backend/MultiDeviceGradient.hxx
index cd1572ed8..eeb7abc9b 100644
--- a/examples/multi_backend/MultiDeviceGradient.hxx
+++ b/examples/multi_backend/MultiDeviceGradient.hxx
@@ -48,7 +48,7 @@ void process_block_tbb(RuntimeTaskQueue& queue)
   //task operate only on TBB. The "global" thread tracker
   //is actually thread-local, so we can use that.
   //
-  vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
+  vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
 
   while (queue.hasTasks())
   {
@@ -76,7 +76,7 @@ void process_block_cuda(RuntimeTaskQueue& queue, int gpuId)
   //task operate only on cuda.  The "global" thread tracker
   //is actually thread-local, so we can use that.
   //
-  vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
+  vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   (void)gpuId;
 
   while (queue.hasTasks())
@@ -107,7 +107,7 @@ VTKM_CONT MultiDeviceGradient::MultiDeviceGradient()
   , Workers()
 {
   //Step 1. Determine the number of workers we want
-  vtkm::cont::RuntimeDeviceTracker tracker;
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   const bool runOnTbb = tracker.CanRunOn(vtkm::cont::DeviceAdapterTagTBB{});
   const bool runOnCuda = tracker.CanRunOn(vtkm::cont::DeviceAdapterTagCuda{});
 
diff --git a/vtkm/cont/ArrayCopy.h b/vtkm/cont/ArrayCopy.h
index 03741a255..89b2fd3de 100644
--- a/vtkm/cont/ArrayCopy.h
+++ b/vtkm/cont/ArrayCopy.h
@@ -84,7 +84,7 @@ template <typename InValueType, typename InStorage, typename OutValueType, typen
 VTKM_CONT void ArrayCopy(
   const vtkm::cont::ArrayHandle<InValueType, InStorage>& source,
   vtkm::cont::ArrayHandle<OutValueType, OutStorage>& destination,
-  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker())
+  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker())
 {
   detail::ArrayCopyFunctor functor;
 
diff --git a/vtkm/cont/ArrayHandleTransform.h b/vtkm/cont/ArrayHandleTransform.h
index 03de01409..6ea83c79d 100644
--- a/vtkm/cont/ArrayHandleTransform.h
+++ b/vtkm/cont/ArrayHandleTransform.h
@@ -324,8 +324,8 @@ public:
   PortalConstType GetPortalConst() const
   {
     VTKM_ASSERT(this->Valid);
-    vtkm::cont::ScopedGlobalRuntimeDeviceTracker trackerScope;
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagSerial());
+    vtkm::cont::ScopedRuntimeDeviceTracker trackerScope;
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagSerial());
     return PortalConstType(this->Array.GetPortalConstControl(), this->Functor.PrepareForControl());
   }
 
@@ -416,8 +416,8 @@ public:
   PortalType GetPortal()
   {
     VTKM_ASSERT(this->Valid);
-    vtkm::cont::ScopedGlobalRuntimeDeviceTracker trackerScope;
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagSerial());
+    vtkm::cont::ScopedRuntimeDeviceTracker trackerScope;
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagSerial());
     return PortalType(this->Array.GetPortalControl(),
                       this->Functor.PrepareForControl(),
                       this->InverseFunctor.PrepareForControl());
@@ -427,8 +427,8 @@ public:
   PortalConstType GetPortalConst() const
   {
     VTKM_ASSERT(this->Valid);
-    vtkm::cont::ScopedGlobalRuntimeDeviceTracker trackerScope;
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagSerial());
+    vtkm::cont::ScopedRuntimeDeviceTracker trackerScope;
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagSerial());
     return PortalConstType(this->Array.GetPortalConstControl(),
                            this->Functor.PrepareForControl(),
                            this->InverseFunctor.PrepareForControl());
diff --git a/vtkm/cont/ArrayRangeCompute.h b/vtkm/cont/ArrayRangeCompute.h
index 6dd8fbf08..724da036d 100644
--- a/vtkm/cont/ArrayRangeCompute.h
+++ b/vtkm/cont/ArrayRangeCompute.h
@@ -50,7 +50,7 @@ namespace cont
 template <typename ArrayHandleType>
 VTKM_CONT vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
   const ArrayHandleType& input,
-  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker());
+  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker());
 
 // Precompiled versions of ArrayRangeCompute
 #define VTKM_ARRAY_RANGE_COMPUTE_EXPORT_T(T, Storage)                                              \
@@ -58,13 +58,13 @@ VTKM_CONT vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
   VTKM_CONT                                                                                        \
   vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(                                          \
     const vtkm::cont::ArrayHandle<T, Storage>& input,                                              \
-    vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker())
+    vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker())
 #define VTKM_ARRAY_RANGE_COMPUTE_EXPORT_VEC(T, N, Storage)                                         \
   VTKM_CONT_EXPORT                                                                                 \
   VTKM_CONT                                                                                        \
   vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(                                          \
     const vtkm::cont::ArrayHandle<vtkm::Vec<T, N>, Storage>& input,                                \
-    vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker())
+    vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker())
 
 VTKM_ARRAY_RANGE_COMPUTE_EXPORT_T(char, vtkm::cont::StorageTagBasic);
 VTKM_ARRAY_RANGE_COMPUTE_EXPORT_T(vtkm::Int8, vtkm::cont::StorageTagBasic);
@@ -97,22 +97,17 @@ VTKM_ARRAY_RANGE_COMPUTE_EXPORT_VEC(vtkm::Float64, 4, vtkm::cont::StorageTagBasi
 #undef VTKM_ARRAY_RANGE_COMPUTE_EXPORT_T
 #undef VTKM_ARRAY_RANGE_COMPUTE_EXPORT_VEC
 
-// VTKM_CONT
-// vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
-//   const vtkm::cont::ArrayHandleVirtualCoordinates& input,
-//   vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker());
-
 VTKM_CONT
 vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
   const vtkm::cont::ArrayHandleVirtual<vtkm::Vec<vtkm::FloatDefault, 3>>& input,
-  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker());
+  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker());
 
 VTKM_CONT_EXPORT
 VTKM_CONT
 vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
   const vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::FloatDefault, 3>,
                                 vtkm::cont::ArrayHandleUniformPointCoordinates::StorageTag>& array,
-  vtkm::cont::RuntimeDeviceTracker = vtkm::cont::GetGlobalRuntimeDeviceTracker());
+  vtkm::cont::RuntimeDeviceTracker = vtkm::cont::GetRuntimeDeviceTracker());
 
 // Implementation of composite vectors
 VTKM_CONT_EXPORT
@@ -123,7 +118,7 @@ vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
                                   vtkm::cont::ArrayHandle<vtkm::Float32>,
                                   vtkm::cont::ArrayHandle<vtkm::Float32>,
                                   vtkm::cont::ArrayHandle<vtkm::Float32>>::StorageTag>& input,
-  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker());
+  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker());
 
 VTKM_CONT_EXPORT
 VTKM_CONT
@@ -133,7 +128,7 @@ vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
                                   vtkm::cont::ArrayHandle<vtkm::Float64>,
                                   vtkm::cont::ArrayHandle<vtkm::Float64>,
                                   vtkm::cont::ArrayHandle<vtkm::Float64>>::StorageTag>& input,
-  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker());
+  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker());
 
 // Implementation of cartesian products
 template <typename T, typename ArrayType1, typename ArrayType2, typename ArrayType3>
@@ -141,7 +136,7 @@ VTKM_CONT inline vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
   const vtkm::cont::ArrayHandle<
     T,
     vtkm::cont::internal::StorageTagCartesianProduct<ArrayType1, ArrayType2, ArrayType3>>& input,
-  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker())
+  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker())
 {
   vtkm::cont::ArrayHandle<vtkm::Range> result;
   result.Allocate(3);
diff --git a/vtkm/cont/ArrayRangeCompute.hxx b/vtkm/cont/ArrayRangeCompute.hxx
index 9a9890755..11f64ca3d 100644
--- a/vtkm/cont/ArrayRangeCompute.hxx
+++ b/vtkm/cont/ArrayRangeCompute.hxx
@@ -55,7 +55,7 @@ struct ArrayRangeComputeFunctor
 template <typename T, typename S>
 inline vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeComputeImpl(
   const vtkm::cont::ArrayHandle<T, S>& input,
-  vtkm::cont::RuntimeDeviceTracker& tracker)
+  vtkm::cont::RuntimeDeviceTracker tracker)
 {
   using VecTraits = vtkm::VecTraits<T>;
   using CT = typename VecTraits::ComponentType;
@@ -104,16 +104,6 @@ inline vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeComputeImpl(
 } // namespace detail
 
 
-// VTKM_CONT
-// inline vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
-//   const vtkm::cont::ArrayHandleVirtualCoordinates& input,
-//   vtkm::cont::RuntimeDeviceTracker tracker)
-// {
-//   auto array =
-//     static_cast<const vtkm::cont::ArrayHandleVirtual<vtkm::Vec<vtkm::FloatDefault, 3>>&>(input);
-//   return ArrayRangeCompute(array, tracker);
-// }
-
 VTKM_CONT
 inline vtkm::cont::ArrayHandle<vtkm::Range> ArrayRangeCompute(
   const vtkm::cont::ArrayHandleVirtual<vtkm::Vec<vtkm::FloatDefault, 3>>& input,
diff --git a/vtkm/cont/Initialize.cxx b/vtkm/cont/Initialize.cxx
index dd025b350..0cb66521c 100644
--- a/vtkm/cont/Initialize.cxx
+++ b/vtkm/cont/Initialize.cxx
@@ -90,7 +90,7 @@ struct VtkmArg : public opt::Arg
       return false;
     }
 
-    auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+    auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
     bool result = false;
     try
     {
@@ -108,13 +108,12 @@ struct VtkmArg : public opt::Arg
     std::ostringstream names;
     names << "\"Any\" ";
 
-    auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
     for (vtkm::Int8 i = 0; i < VTKM_MAX_DEVICE_ADAPTER_ID; ++i)
     {
       auto id = vtkm::cont::make_DeviceAdapterId(i);
       if (VtkmArg::DeviceIsAvailable(id))
       {
-        names << "\"" << tracker.GetDeviceName(id) << "\" ";
+        names << "\"" << id.GetName() << "\" ";
       }
     }
     return names.str();
@@ -181,7 +180,7 @@ InitializeResult Initialize(int& argc, char* argv[], InitializeOptions opts)
     if (options[DEVICE])
     {
       auto id = vtkm::cont::make_DeviceAdapterId(options[DEVICE].arg);
-      auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+      auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
       tracker.ForceDevice(id);
       config.Device = id;
     }
diff --git a/vtkm/cont/RuntimeDeviceTracker.cxx b/vtkm/cont/RuntimeDeviceTracker.cxx
index 9680b1edb..2da07450b 100644
--- a/vtkm/cont/RuntimeDeviceTracker.cxx
+++ b/vtkm/cont/RuntimeDeviceTracker.cxx
@@ -168,7 +168,7 @@ struct VTKM_NEVER_EXPORT RuntimeDeviceTrackerResetFunctor
   vtkm::cont::RuntimeDeviceTracker Tracker;
 
   VTKM_CONT
-  RuntimeDeviceTrackerResetFunctor(const vtkm::cont::RuntimeDeviceTracker& tracker)
+  RuntimeDeviceTrackerResetFunctor(const vtkm::cont::RuntimeDeviceTracker tracker)
     : Tracker(tracker)
   {
   }
@@ -197,7 +197,7 @@ vtkm::cont::RuntimeDeviceTracker RuntimeDeviceTracker::DeepCopy() const
 }
 
 VTKM_CONT
-void RuntimeDeviceTracker::DeepCopy(const vtkm::cont::RuntimeDeviceTracker& src)
+void RuntimeDeviceTracker::DeepCopy(const vtkm::cont::RuntimeDeviceTracker src)
 {
   std::copy_n(
     src.Internals->RuntimeValid, VTKM_MAX_DEVICE_ADAPTER_ID, this->Internals->RuntimeValid);
@@ -314,7 +314,7 @@ DeviceAdapterId RuntimeDeviceTracker::GetDeviceAdapterId(DeviceAdapterNameType n
 }
 
 VTKM_CONT
-vtkm::cont::RuntimeDeviceTracker GetGlobalRuntimeDeviceTracker()
+vtkm::cont::RuntimeDeviceTracker GetRuntimeDeviceTracker()
 {
 #if defined(VTKM_CLANG) && (__apple_build_version__ < 8000000)
   static std::mutex mtx;
diff --git a/vtkm/cont/RuntimeDeviceTracker.h b/vtkm/cont/RuntimeDeviceTracker.h
index c53bc0b23..2d0de3516 100644
--- a/vtkm/cont/RuntimeDeviceTracker.h
+++ b/vtkm/cont/RuntimeDeviceTracker.h
@@ -167,7 +167,7 @@ public:
   ///
   VTKM_CONT_EXPORT
   VTKM_CONT
-  void DeepCopy(const vtkm::cont::RuntimeDeviceTracker& src);
+  void DeepCopy(const vtkm::cont::RuntimeDeviceTracker src);
 
   /// \brief Disable the given device
   ///
@@ -251,29 +251,29 @@ private:
 /// Xcode's clang only supports thread_local from version 8
 VTKM_CONT_EXPORT
 VTKM_CONT
-vtkm::cont::RuntimeDeviceTracker GetGlobalRuntimeDeviceTracker();
+vtkm::cont::RuntimeDeviceTracker GetRuntimeDeviceTracker();
 
-struct ScopedGlobalRuntimeDeviceTracker
+struct ScopedRuntimeDeviceTracker
 {
   vtkm::cont::RuntimeDeviceTracker SavedTracker;
 
-  VTKM_CONT ScopedGlobalRuntimeDeviceTracker()
-    : SavedTracker(vtkm::cont::GetGlobalRuntimeDeviceTracker().DeepCopy())
+  VTKM_CONT ScopedRuntimeDeviceTracker()
+    : SavedTracker(vtkm::cont::GetRuntimeDeviceTracker().DeepCopy())
   {
   }
 
-  VTKM_CONT ScopedGlobalRuntimeDeviceTracker(vtkm::cont::RuntimeDeviceTracker tracker)
-    : SavedTracker(vtkm::cont::GetGlobalRuntimeDeviceTracker().DeepCopy())
+  VTKM_CONT ScopedRuntimeDeviceTracker(vtkm::cont::RuntimeDeviceTracker tracker)
+    : SavedTracker(vtkm::cont::GetRuntimeDeviceTracker().DeepCopy())
   {
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().DeepCopy(tracker);
+    vtkm::cont::GetRuntimeDeviceTracker().DeepCopy(tracker);
   }
 
-  VTKM_CONT ~ScopedGlobalRuntimeDeviceTracker()
+  VTKM_CONT ~ScopedRuntimeDeviceTracker()
   {
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().DeepCopy(this->SavedTracker);
+    vtkm::cont::GetRuntimeDeviceTracker().DeepCopy(this->SavedTracker);
   }
 
-  ScopedGlobalRuntimeDeviceTracker(const ScopedGlobalRuntimeDeviceTracker&) = delete;
+  ScopedRuntimeDeviceTracker(const ScopedRuntimeDeviceTracker&) = delete;
 };
 }
 } // namespace vtkm::cont
diff --git a/vtkm/cont/Timer.cxx b/vtkm/cont/Timer.cxx
index b0500e97d..90bf013ce 100644
--- a/vtkm/cont/Timer.cxx
+++ b/vtkm/cont/Timer.cxx
@@ -225,7 +225,7 @@ Timer::Timer(vtkm::cont::DeviceAdapterId device)
   : Device(device)
   , Internal(nullptr)
 {
-  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker();
   if (device != DeviceAdapterTagAny() && !tracker.CanRunOn(device))
   {
     VTKM_LOG_S(vtkm::cont::LogLevel::Error,
@@ -254,7 +254,7 @@ void Timer::Reset()
 
 void Timer::Reset(vtkm::cont::DeviceAdapterId device)
 {
-  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker();
   if (device != DeviceAdapterTagAny() && !tracker.CanRunOn(device))
   {
     VTKM_LOG_S(vtkm::cont::LogLevel::Error,
@@ -327,7 +327,7 @@ vtkm::Float64 Timer::GetElapsedTime(vtkm::cont::DeviceAdapterId device) const
   }
 
   // If we have specified a specific device, make sure we can run on it.
-  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  vtkm::cont::RuntimeDeviceTracker tracker = vtkm::cont::GetRuntimeDeviceTracker();
   if ((deviceToTime != vtkm::cont::DeviceAdapterTagAny()) && !tracker.CanRunOn(deviceToTime))
   {
     VTKM_LOG_S(vtkm::cont::LogLevel::Error,
diff --git a/vtkm/cont/TryExecute.cxx b/vtkm/cont/TryExecute.cxx
index 8278410d2..c627c91fb 100644
--- a/vtkm/cont/TryExecute.cxx
+++ b/vtkm/cont/TryExecute.cxx
@@ -32,7 +32,7 @@ namespace detail
 {
 
 void HandleTryExecuteException(vtkm::cont::DeviceAdapterId deviceId,
-                               vtkm::cont::RuntimeDeviceTracker& tracker,
+                               vtkm::cont::RuntimeDeviceTracker tracker,
                                const std::string& functorName)
 {
   try
diff --git a/vtkm/cont/TryExecute.h b/vtkm/cont/TryExecute.h
index db1603008..8c41ecaf9 100644
--- a/vtkm/cont/TryExecute.h
+++ b/vtkm/cont/TryExecute.h
@@ -34,7 +34,7 @@ namespace detail
 {
 
 VTKM_CONT_EXPORT void HandleTryExecuteException(vtkm::cont::DeviceAdapterId,
-                                                vtkm::cont::RuntimeDeviceTracker&,
+                                                vtkm::cont::RuntimeDeviceTracker,
                                                 const std::string& functorName);
 
 template <typename DeviceTag, typename Functor, typename... Args>
@@ -42,7 +42,7 @@ inline bool TryExecuteIfValid(std::true_type,
                               DeviceTag tag,
                               Functor&& f,
                               vtkm::cont::DeviceAdapterId devId,
-                              vtkm::cont::RuntimeDeviceTracker& tracker,
+                              vtkm::cont::RuntimeDeviceTracker tracker,
                               Args&&... args)
 {
   if ((tag == devId || devId == DeviceAdapterTagAny()) && tracker.CanRunOn(tag))
@@ -66,7 +66,7 @@ inline bool TryExecuteIfValid(std::false_type,
                               DeviceTag,
                               Functor&&,
                               vtkm::cont::DeviceAdapterId,
-                              vtkm::cont::RuntimeDeviceTracker&,
+                              vtkm::cont::RuntimeDeviceTracker,
                               Args&&...)
 {
   return false;
@@ -78,7 +78,7 @@ struct TryExecuteWrapper
   inline void operator()(DeviceTag tag,
                          Functor&& f,
                          vtkm::cont::DeviceAdapterId devId,
-                         vtkm::cont::RuntimeDeviceTracker& tracker,
+                         vtkm::cont::RuntimeDeviceTracker tracker,
                          bool& ran,
                          Args&&... args) const
   {
@@ -99,7 +99,7 @@ inline bool TryExecuteImpl(vtkm::cont::DeviceAdapterId devId,
                            Functor&& functor,
                            std::true_type,
                            std::true_type,
-                           vtkm::cont::RuntimeDeviceTracker& tracker,
+                           vtkm::cont::RuntimeDeviceTracker tracker,
                            DeviceList list,
                            Args&&... args)
 {
@@ -123,7 +123,7 @@ inline bool TryExecuteImpl(vtkm::cont::DeviceAdapterId devId,
                            Args&&... args)
 {
   bool success = false;
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   TryExecuteWrapper task;
   vtkm::ListForEach(task,
                     VTKM_DEFAULT_DEVICE_ADAPTER_LIST_TAG(),
@@ -160,7 +160,7 @@ inline bool TryExecuteImpl(vtkm::cont::DeviceAdapterId devId,
                            Arg1&& arg1,
                            Args&&... args)
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   return TryExecuteImpl(devId,
                         std::forward<Functor>(functor),
                         t,
@@ -213,7 +213,7 @@ inline bool TryExecuteImpl(vtkm::cont::DeviceAdapterId devId,
 /// vtkm::cont::TryExecuteOnDevice(devId, TryCallExample(), int{42});
 ///
 /// // Executing on a specific deviceID with a runtime tracker
-/// auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+/// auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
 /// vtkm::cont::TryExecute(devId, TryCallExample(), tracker, int{42});
 ///
 /// \endcode
@@ -224,7 +224,7 @@ inline bool TryExecuteImpl(vtkm::cont::DeviceAdapterId devId,
 /// If no device list is specified, then \c VTKM_DEFAULT_DEVICE_ADAPTER_LIST_TAG
 /// is used.
 ///
-/// If no \c RuntimeDeviceTracker specified, then \c GetGlobalRuntimeDeviceTracker()
+/// If no \c RuntimeDeviceTracker specified, then \c GetRuntimeDeviceTracker()
 /// is used.
 template <typename Functor>
 VTKM_CONT bool TryExecuteOnDevice(vtkm::cont::DeviceAdapterId devId, Functor&& functor)
@@ -320,7 +320,7 @@ VTKM_CONT bool TryExecuteOnDevice(vtkm::cont::DeviceAdapterId devId,
 /// vtkm::cont::TryExecute(TryCallExample(), int{42});
 ///
 /// // Executing with a runtime tracker
-/// auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+/// auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
 /// vtkm::cont::TryExecute(TryCallExample(), tracker, int{42});
 ///
 /// // Executing with a device list
@@ -338,7 +338,7 @@ VTKM_CONT bool TryExecuteOnDevice(vtkm::cont::DeviceAdapterId devId,
 /// If no device list is specified, then \c VTKM_DEFAULT_DEVICE_ADAPTER_LIST_TAG
 /// is used.
 ///
-/// If no \c RuntimeDeviceTracker specified, then \c GetGlobalRuntimeDeviceTracker()
+/// If no \c RuntimeDeviceTracker specified, then \c GetRuntimeDeviceTracker()
 /// is used.
 template <typename Functor, typename... Args>
 VTKM_CONT bool TryExecute(Functor&& functor, Args&&... args)
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu
index 83cfa53e5..38f9e3937 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu
@@ -28,7 +28,7 @@
 
 int UnitTestCudaArrayHandle(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run(argc,
                                                                                          argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleFancy.cu b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleFancy.cu
index bb8de0a76..6ceba9d17 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleFancy.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleFancy.cu
@@ -30,7 +30,7 @@
 
 int UnitTestCudaArrayHandleFancy(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int result = vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagCuda>::Run(
     argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleVirtualCoordinates.cu b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleVirtualCoordinates.cu
index 4fd1baebd..6aefde44e 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleVirtualCoordinates.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandleVirtualCoordinates.cu
@@ -28,7 +28,7 @@
 
 int UnitTestCudaArrayHandleVirtualCoordinates(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
     vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorRectilinearGrid.cu b/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorRectilinearGrid.cu
index e6dc8c6e7..1d8d7ed01 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorRectilinearGrid.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorRectilinearGrid.cu
@@ -27,7 +27,7 @@
 
 int UnitTestCudaCellLocatorRectilinearGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagCuda>(), argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorTwoLevelUniformGrid.cu b/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorTwoLevelUniformGrid.cu
index 9171fcda0..fc52b2027 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorTwoLevelUniformGrid.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorTwoLevelUniformGrid.cu
@@ -27,7 +27,7 @@
 
 int UnitTestCudaCellLocatorTwoLevelUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagCuda>, argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorUniformGrid.cu b/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorUniformGrid.cu
index 68731ac30..5e024918b 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorUniformGrid.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaCellLocatorUniformGrid.cu
@@ -27,7 +27,7 @@
 
 int UnitTestCudaCellLocatorUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagCuda>(), argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaColorTable.cu b/vtkm/cont/cuda/testing/UnitTestCudaColorTable.cu
index d9b7bbdee..a76fc79af 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaColorTable.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaColorTable.cu
@@ -29,7 +29,7 @@
 
 int UnitTestCudaColorTable(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
 }
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaComputeRange.cu b/vtkm/cont/cuda/testing/UnitTestCudaComputeRange.cu
index 6ba13e61b..29a7c77c6 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaComputeRange.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaComputeRange.cu
@@ -30,7 +30,7 @@
 
 int UnitTestCudaComputeRange(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int result =
     vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaDataSetExplicit.cu b/vtkm/cont/cuda/testing/UnitTestCudaDataSetExplicit.cu
index a07b81f10..951abc064 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaDataSetExplicit.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaDataSetExplicit.cu
@@ -29,7 +29,7 @@
 
 int UnitTestCudaDataSetExplicit(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int result =
     vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaDataSetSingleType.cu b/vtkm/cont/cuda/testing/UnitTestCudaDataSetSingleType.cu
index cf0067291..ed82476f9 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaDataSetSingleType.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaDataSetSingleType.cu
@@ -30,7 +30,7 @@
 
 int UnitTestCudaDataSetSingleType(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int result = vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagCuda>::Run(
     argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaDeviceAdapter.cu b/vtkm/cont/cuda/testing/UnitTestCudaDeviceAdapter.cu
index d59d250bc..dca658438 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaDeviceAdapter.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaDeviceAdapter.cu
@@ -30,7 +30,7 @@
 
 int UnitTestCudaDeviceAdapter(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int result =
     vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagCuda>::Run(argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaGeometry.cu b/vtkm/cont/cuda/testing/UnitTestCudaGeometry.cu
index 75fce86b6..ebe183bab 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaGeometry.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaGeometry.cu
@@ -31,7 +31,7 @@
 
 int UnitTestCudaGeometry(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::Testing::Run(
     UnitTestGeometryNamespace::RunGeometryTests<vtkm::cont::DeviceAdapterTagCuda>, argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaImplicitFunction.cu b/vtkm/cont/cuda/testing/UnitTestCudaImplicitFunction.cu
index 1cfa4b10f..11e88a2b0 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaImplicitFunction.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaImplicitFunction.cu
@@ -38,7 +38,7 @@ void TestImplicitFunctions()
 
 int UnitTestCudaImplicitFunction(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::Testing::Run(TestImplicitFunctions, argc, argv);
 }
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaMath.cu b/vtkm/cont/cuda/testing/UnitTestCudaMath.cu
index e0fbaf5cd..9d0263486 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaMath.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaMath.cu
@@ -182,7 +182,7 @@ void RunEdgeCases()
 
 int UnitTestCudaMath(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int tests_valid = vtkm::cont::testing::Testing::Run(
     UnitTestMathNamespace::RunMathTests<vtkm::cont::DeviceAdapterTagCuda>, argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaPointLocatorUniformGrid.cu b/vtkm/cont/cuda/testing/UnitTestCudaPointLocatorUniformGrid.cu
index fe8c89206..180286417 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaPointLocatorUniformGrid.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaPointLocatorUniformGrid.cu
@@ -27,7 +27,7 @@
 
 int UnitTestCudaPointLocatorUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   return vtkm::cont::testing::Testing::Run(
     TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagCuda>(), argc, argv);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaShareUserProvidedManagedMemory.cu b/vtkm/cont/cuda/testing/UnitTestCudaShareUserProvidedManagedMemory.cu
index 2abe81067..f55efbdd6 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaShareUserProvidedManagedMemory.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaShareUserProvidedManagedMemory.cu
@@ -282,7 +282,7 @@ void Launch()
 
 int UnitTestCudaShareUserProvidedManagedMemory(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   int ret = vtkm::cont::testing::Testing::Run(Launch, argc, argv);
   return vtkm::cont::cuda::internal::Testing::CheckCudaBeforeExit(ret);
diff --git a/vtkm/cont/cuda/testing/UnitTestCudaVirtualObjectHandle.cu b/vtkm/cont/cuda/testing/UnitTestCudaVirtualObjectHandle.cu
index 00acb44d1..2ecd30900 100644
--- a/vtkm/cont/cuda/testing/UnitTestCudaVirtualObjectHandle.cu
+++ b/vtkm/cont/cuda/testing/UnitTestCudaVirtualObjectHandle.cu
@@ -30,7 +30,7 @@ namespace
 
 void TestVirtualObjectHandle()
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
 
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagCuda{});
   using DeviceAdapterList = vtkm::ListTagBase<vtkm::cont::DeviceAdapterTagCuda>;
diff --git a/vtkm/cont/internal/DeviceAdapterListHelpers.h b/vtkm/cont/internal/DeviceAdapterListHelpers.h
index 40fa061e0..d63f18bc4 100644
--- a/vtkm/cont/internal/DeviceAdapterListHelpers.h
+++ b/vtkm/cont/internal/DeviceAdapterListHelpers.h
@@ -45,7 +45,7 @@ struct ExecuteIfValidDeviceTag
   typename EnableIfValid<DeviceAdapter>::type operator()(
     DeviceAdapter device,
     Functor&& f,
-    const vtkm::cont::RuntimeDeviceTracker& tracker,
+    const vtkm::cont::RuntimeDeviceTracker tracker,
     Args&&... args) const
   {
     if (tracker.CanRunOn(device))
@@ -66,7 +66,7 @@ struct ExecuteIfValidDeviceTag
 template <typename DeviceList, typename Functor, typename... Args>
 VTKM_CONT void ForEachValidDevice(DeviceList devices, Functor&& functor, Args&&... args)
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   vtkm::ListForEach(
     ExecuteIfValidDeviceTag{}, devices, functor, tracker, std::forward<Args>(args)...);
 }
diff --git a/vtkm/cont/internal/DeviceAdapterTag.cxx b/vtkm/cont/internal/DeviceAdapterTag.cxx
index 1231e18df..65ee98afd 100644
--- a/vtkm/cont/internal/DeviceAdapterTag.cxx
+++ b/vtkm/cont/internal/DeviceAdapterTag.cxx
@@ -29,12 +29,12 @@ namespace cont
 
 DeviceAdapterNameType DeviceAdapterId::GetName() const
 {
-  return vtkm::cont::GetGlobalRuntimeDeviceTracker().GetDeviceName(*this);
+  return vtkm::cont::GetRuntimeDeviceTracker().GetDeviceName(*this);
 }
 
 DeviceAdapterId make_DeviceAdapterId(const DeviceAdapterNameType& name)
 {
-  return vtkm::cont::GetGlobalRuntimeDeviceTracker().GetDeviceAdapterId(name);
+  return vtkm::cont::GetRuntimeDeviceTracker().GetDeviceAdapterId(name);
 }
 }
 } // end namespace vtkm::cont
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandle.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandle.cxx
index f10830df7..30ce4a94b 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandle.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandle.cxx
@@ -25,7 +25,7 @@
 
 int UnitTestOpenMPArrayHandle(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
                                                                                            argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandleFancy.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandleFancy.cxx
index 3fda27961..fab96c394 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandleFancy.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandleFancy.cxx
@@ -25,7 +25,7 @@
 
 int UnitTestOpenMPArrayHandleFancy(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagOpenMP>::Run(
     argc, argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandleVirtualCoordinates.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandleVirtualCoordinates.cxx
index eb76b484e..a38c4e394 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandleVirtualCoordinates.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPArrayHandleVirtualCoordinates.cxx
@@ -25,7 +25,7 @@
 
 int UnitTestOpenMPArrayHandleVirtualCoordinates(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
     vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc, argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorRectilinearGrid.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorRectilinearGrid.cxx
index dd496b243..bbf03f92a 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorRectilinearGrid.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorRectilinearGrid.cxx
@@ -27,7 +27,7 @@
 
 int UnitTestOpenMPCellLocatorRectilinearGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorTwoLevelUniformGrid.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorTwoLevelUniformGrid.cxx
index 23a8d5d72..2817f3431 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorTwoLevelUniformGrid.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorTwoLevelUniformGrid.cxx
@@ -25,7 +25,7 @@
 
 int UnitTestOpenMPCellLocatorTwoLevelUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagOpenMP>, argc, argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorUniformGrid.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorUniformGrid.cxx
index 2300e9c2c..8beabed00 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorUniformGrid.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPCellLocatorUniformGrid.cxx
@@ -27,7 +27,7 @@
 
 int UnitTestOpenMPCellLocatorUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPColorTable.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPColorTable.cxx
index 416322ad7..e893c036c 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPColorTable.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPColorTable.cxx
@@ -25,7 +25,7 @@
 
 int UnitTestOpenMPColorTable(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
                                                                                          argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPComputeRange.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPComputeRange.cxx
index 4bd102d13..32d9c8403 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPComputeRange.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPComputeRange.cxx
@@ -25,7 +25,7 @@
 
 int UnitTestOpenMPComputeRange(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
                                                                                            argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPDataSetExplicit.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPDataSetExplicit.cxx
index 2d9026d72..592d87a51 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPDataSetExplicit.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPDataSetExplicit.cxx
@@ -25,7 +25,7 @@
 
 int UnitTestOpenMPDataSetExplicit(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
                                                                                               argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPDataSetSingleType.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPDataSetSingleType.cxx
index 6f8c2bb44..165497c4f 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPDataSetSingleType.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPDataSetSingleType.cxx
@@ -25,7 +25,7 @@
 
 int UnitTestOpenMPDataSetSingleType(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagOpenMP>::Run(
     argc, argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPDeviceAdapter.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPDeviceAdapter.cxx
index 6d8f400ff..769dd9124 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPDeviceAdapter.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPDeviceAdapter.cxx
@@ -26,7 +26,7 @@
 
 int UnitTestOpenMPDeviceAdapter(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagOpenMP>::Run(argc,
                                                                                             argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPImplicitFunction.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPImplicitFunction.cxx
index d4c02920a..e36e49826 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPImplicitFunction.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPImplicitFunction.cxx
@@ -28,7 +28,7 @@ namespace
 
 void TestImplicitFunctions()
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
 
   vtkm::cont::testing::TestingImplicitFunction testing;
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPPointLocatorUniformGrid.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPPointLocatorUniformGrid.cxx
index ed8ba4b80..3d78ca9b5 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPPointLocatorUniformGrid.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPPointLocatorUniformGrid.cxx
@@ -25,7 +25,7 @@
 
 int UnitTestOpenMPPointLocatorUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   return vtkm::cont::testing::Testing::Run(
     TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagOpenMP>(), argc, argv);
diff --git a/vtkm/cont/openmp/testing/UnitTestOpenMPVirtualObjectHandle.cxx b/vtkm/cont/openmp/testing/UnitTestOpenMPVirtualObjectHandle.cxx
index 57e150afa..7f0868e7d 100644
--- a/vtkm/cont/openmp/testing/UnitTestOpenMPVirtualObjectHandle.cxx
+++ b/vtkm/cont/openmp/testing/UnitTestOpenMPVirtualObjectHandle.cxx
@@ -33,7 +33,7 @@ void TestVirtualObjectHandle()
   using DeviceAdapterList2 =
     vtkm::ListTagBase<vtkm::cont::DeviceAdapterTagSerial, vtkm::cont::DeviceAdapterTagOpenMP>;
 
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
 
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagOpenMP{});
   vtkm::cont::testing::TestingVirtualObjectHandle<DeviceAdapterList>::Run();
diff --git a/vtkm/cont/serial/testing/UnitTestSerialArrayHandle.cxx b/vtkm/cont/serial/testing/UnitTestSerialArrayHandle.cxx
index de8c87539..330445022 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialArrayHandle.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialArrayHandle.cxx
@@ -28,7 +28,7 @@
 
 int UnitTestSerialArrayHandle(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagSerial>::Run(argc,
                                                                                            argv);
diff --git a/vtkm/cont/serial/testing/UnitTestSerialArrayHandleFancy.cxx b/vtkm/cont/serial/testing/UnitTestSerialArrayHandleFancy.cxx
index c0ffe3bca..cf78229d5 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialArrayHandleFancy.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialArrayHandleFancy.cxx
@@ -31,7 +31,7 @@
 
 int UnitTestSerialArrayHandleFancy(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagSerial>::Run(
     argc, argv);
diff --git a/vtkm/cont/serial/testing/UnitTestSerialArrayHandleVirtualCoordinates.cxx b/vtkm/cont/serial/testing/UnitTestSerialArrayHandleVirtualCoordinates.cxx
index 47893dc12..865e02f6c 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialArrayHandleVirtualCoordinates.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialArrayHandleVirtualCoordinates.cxx
@@ -29,7 +29,7 @@
 
 int UnitTestSerialArrayHandleVirtualCoordinates(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
     vtkm::cont::DeviceAdapterTagSerial>::Run(argc, argv);
diff --git a/vtkm/cont/serial/testing/UnitTestSerialCellLocatorRectilinearGrid.cxx b/vtkm/cont/serial/testing/UnitTestSerialCellLocatorRectilinearGrid.cxx
index 4bf61fafd..08bff097d 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialCellLocatorRectilinearGrid.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialCellLocatorRectilinearGrid.cxx
@@ -27,7 +27,7 @@
 
 int UnitTestSerialCellLocatorRectilinearGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
diff --git a/vtkm/cont/serial/testing/UnitTestSerialCellLocatorTwoLevelUniformGrid.cxx b/vtkm/cont/serial/testing/UnitTestSerialCellLocatorTwoLevelUniformGrid.cxx
index 0823acec8..f3568f00e 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialCellLocatorTwoLevelUniformGrid.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialCellLocatorTwoLevelUniformGrid.cxx
@@ -28,7 +28,7 @@
 
 int UnitTestSerialCellLocatorTwoLevelUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagSerial>, argc, argv);
diff --git a/vtkm/cont/serial/testing/UnitTestSerialCellLocatorUniformGrid.cxx b/vtkm/cont/serial/testing/UnitTestSerialCellLocatorUniformGrid.cxx
index 902f16799..9a25e20d1 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialCellLocatorUniformGrid.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialCellLocatorUniformGrid.cxx
@@ -27,7 +27,7 @@
 
 int UnitTestSerialCellLocatorUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
diff --git a/vtkm/cont/serial/testing/UnitTestSerialDataSetExplicit.cxx b/vtkm/cont/serial/testing/UnitTestSerialDataSetExplicit.cxx
index 37d37e8d7..7f6ca5d63 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialDataSetExplicit.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialDataSetExplicit.cxx
@@ -28,7 +28,7 @@
 
 int UnitTestSerialDataSetExplicit(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagSerial>::Run(argc,
                                                                                               argv);
diff --git a/vtkm/cont/serial/testing/UnitTestSerialDataSetSingleType.cxx b/vtkm/cont/serial/testing/UnitTestSerialDataSetSingleType.cxx
index a9b8c924e..18b223065 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialDataSetSingleType.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialDataSetSingleType.cxx
@@ -28,7 +28,7 @@
 
 int UnitTestSerialDataSetSingleType(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagSerial>::Run(
     argc, argv);
diff --git a/vtkm/cont/serial/testing/UnitTestSerialDeviceAdapter.cxx b/vtkm/cont/serial/testing/UnitTestSerialDeviceAdapter.cxx
index 51aa5499a..4496699cd 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialDeviceAdapter.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialDeviceAdapter.cxx
@@ -29,7 +29,7 @@
 
 int UnitTestSerialDeviceAdapter(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagSerial>::Run(argc,
                                                                                             argv);
diff --git a/vtkm/cont/serial/testing/UnitTestSerialGeometry.cxx b/vtkm/cont/serial/testing/UnitTestSerialGeometry.cxx
index 757d7b056..182c35381 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialGeometry.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialGeometry.cxx
@@ -31,7 +31,7 @@
 
 int UnitTestSerialGeometry(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(
     UnitTestGeometryNamespace::RunGeometryTests<vtkm::cont::DeviceAdapterTagSerial>, argc, argv);
diff --git a/vtkm/cont/serial/testing/UnitTestSerialImplicitFunction.cxx b/vtkm/cont/serial/testing/UnitTestSerialImplicitFunction.cxx
index 1a0c150d2..9b1ddfd59 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialImplicitFunction.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialImplicitFunction.cxx
@@ -38,7 +38,7 @@ void TestImplicitFunctions()
 
 int UnitTestSerialImplicitFunction(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(TestImplicitFunctions, argc, argv);
 }
diff --git a/vtkm/cont/serial/testing/UnitTestSerialPointLocatorUniformGrid.cxx b/vtkm/cont/serial/testing/UnitTestSerialPointLocatorUniformGrid.cxx
index 20f6d7e04..56f903e7c 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialPointLocatorUniformGrid.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialPointLocatorUniformGrid.cxx
@@ -27,7 +27,7 @@
 
 int UnitTestSerialPointLocatorUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(
     TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagSerial>(), argc, argv);
diff --git a/vtkm/cont/serial/testing/UnitTestSerialVirtualObjectHandle.cxx b/vtkm/cont/serial/testing/UnitTestSerialVirtualObjectHandle.cxx
index 295fe5a2e..46816108e 100644
--- a/vtkm/cont/serial/testing/UnitTestSerialVirtualObjectHandle.cxx
+++ b/vtkm/cont/serial/testing/UnitTestSerialVirtualObjectHandle.cxx
@@ -39,7 +39,7 @@ void TestVirtualObjectHandle()
 
 int UnitTestSerialVirtualObjectHandle(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagSerial{});
   return vtkm::cont::testing::Testing::Run(TestVirtualObjectHandle, argc, argv);
 }
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBArrayHandle.cxx b/vtkm/cont/tbb/testing/UnitTestTBBArrayHandle.cxx
index 3546869c6..948f0d37d 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBArrayHandle.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBArrayHandle.cxx
@@ -28,7 +28,7 @@
 
 int UnitTestTBBArrayHandle(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingArrayHandles<vtkm::cont::DeviceAdapterTagTBB>::Run(argc, argv);
 }
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBArrayHandleFancy.cxx b/vtkm/cont/tbb/testing/UnitTestTBBArrayHandleFancy.cxx
index 81af3934f..718e9f92a 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBArrayHandleFancy.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBArrayHandleFancy.cxx
@@ -28,7 +28,7 @@
 
 int UnitTestTBBArrayHandleFancy(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingFancyArrayHandles<vtkm::cont::DeviceAdapterTagTBB>::Run(argc,
                                                                                              argv);
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBArrayHandleVirtualCoordinates.cxx b/vtkm/cont/tbb/testing/UnitTestTBBArrayHandleVirtualCoordinates.cxx
index e16e1b70a..30c0c8e4e 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBArrayHandleVirtualCoordinates.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBArrayHandleVirtualCoordinates.cxx
@@ -28,7 +28,7 @@
 
 int UnitTestTBBArrayHandleVirtualCoordinates(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingArrayHandleVirtualCoordinates<
     vtkm::cont::DeviceAdapterTagTBB>::Run(argc, argv);
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorRectilinearGrid.cxx b/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorRectilinearGrid.cxx
index cb14ab5ab..cc4a11ee9 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorRectilinearGrid.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorRectilinearGrid.cxx
@@ -27,7 +27,7 @@
 
 int UnitTestTBBCellLocatorRectilinearGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorRectilinearGrid<vtkm::cont::DeviceAdapterTagTBB>(), argc, argv);
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorTwoLevelUniformGrid.cxx b/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorTwoLevelUniformGrid.cxx
index 2fb286694..cca641eb3 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorTwoLevelUniformGrid.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorTwoLevelUniformGrid.cxx
@@ -27,7 +27,7 @@
 
 int UnitTestTBBCellLocatorTwoLevelUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorTwoLevelUniformGrid<vtkm::cont::DeviceAdapterTagTBB>, argc, argv);
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorUniformGrid.cxx b/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorUniformGrid.cxx
index 1c38ae5ba..8db2068b8 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorUniformGrid.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBCellLocatorUniformGrid.cxx
@@ -27,7 +27,7 @@
 
 int UnitTestTBBCellLocatorUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::Testing::Run(
     TestingCellLocatorUniformGrid<vtkm::cont::DeviceAdapterTagTBB>(), argc, argv);
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBColorTable.cxx b/vtkm/cont/tbb/testing/UnitTestTBBColorTable.cxx
index 7c4484596..aeab9d943 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBColorTable.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBColorTable.cxx
@@ -29,7 +29,7 @@
 
 int UnitTestTBBColorTable(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingColorTable<vtkm::cont::DeviceAdapterTagTBB>::Run(argc, argv);
 }
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBComputeRange.cxx b/vtkm/cont/tbb/testing/UnitTestTBBComputeRange.cxx
index 22f1c30f8..59524fc62 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBComputeRange.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBComputeRange.cxx
@@ -29,7 +29,7 @@
 
 int UnitTestTBBComputeRange(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingComputeRange<vtkm::cont::DeviceAdapterTagTBB>::Run(argc, argv);
 }
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBDataSetExplicit.cxx b/vtkm/cont/tbb/testing/UnitTestTBBDataSetExplicit.cxx
index 90eed210a..7646543bf 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBDataSetExplicit.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBDataSetExplicit.cxx
@@ -29,7 +29,7 @@
 
 int UnitTestTBBDataSetExplicit(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingDataSetExplicit<vtkm::cont::DeviceAdapterTagTBB>::Run(argc,
                                                                                            argv);
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBDataSetSingleType.cxx b/vtkm/cont/tbb/testing/UnitTestTBBDataSetSingleType.cxx
index f0db12035..561fadd5a 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBDataSetSingleType.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBDataSetSingleType.cxx
@@ -29,7 +29,7 @@
 
 int UnitTestTBBDataSetSingleType(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingDataSetSingleType<vtkm::cont::DeviceAdapterTagTBB>::Run(argc,
                                                                                              argv);
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBDeviceAdapter.cxx b/vtkm/cont/tbb/testing/UnitTestTBBDeviceAdapter.cxx
index c99532a46..3ce674935 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBDeviceAdapter.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBDeviceAdapter.cxx
@@ -29,7 +29,7 @@
 
 int UnitTestTBBDeviceAdapter(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::TestingDeviceAdapter<vtkm::cont::DeviceAdapterTagTBB>::Run(argc,
                                                                                          argv);
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBImplicitFunction.cxx b/vtkm/cont/tbb/testing/UnitTestTBBImplicitFunction.cxx
index 3fa27b95e..ddf8789f1 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBImplicitFunction.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBImplicitFunction.cxx
@@ -38,7 +38,7 @@ void TestImplicitFunctions()
 
 int UnitTestTBBImplicitFunction(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::Testing::Run(TestImplicitFunctions, argc, argv);
 }
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBPointLocatorUniformGrid.cxx b/vtkm/cont/tbb/testing/UnitTestTBBPointLocatorUniformGrid.cxx
index 2f5c46667..ee7dd9acb 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBPointLocatorUniformGrid.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBPointLocatorUniformGrid.cxx
@@ -27,7 +27,7 @@
 
 int UnitTestTBBPointLocatorUniformGrid(int argc, char* argv[])
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   return vtkm::cont::testing::Testing::Run(
     TestingPointLocatorUniformGrid<vtkm::cont::DeviceAdapterTagTBB>(), argc, argv);
diff --git a/vtkm/cont/tbb/testing/UnitTestTBBVirtualObjectHandle.cxx b/vtkm/cont/tbb/testing/UnitTestTBBVirtualObjectHandle.cxx
index 2ca53ede6..93d8dc95a 100644
--- a/vtkm/cont/tbb/testing/UnitTestTBBVirtualObjectHandle.cxx
+++ b/vtkm/cont/tbb/testing/UnitTestTBBVirtualObjectHandle.cxx
@@ -31,7 +31,7 @@ namespace
 
 void TestVirtualObjectHandle()
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
 
   tracker.ForceDevice(vtkm::cont::DeviceAdapterTagTBB{});
   using DeviceAdapterList = vtkm::ListTagBase<vtkm::cont::DeviceAdapterTagTBB>;
diff --git a/vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h b/vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h
index 61c70afa2..8d8d79697 100644
--- a/vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h
+++ b/vtkm/cont/testing/TestingArrayHandleVirtualCoordinates.h
@@ -143,7 +143,7 @@ private:
 public:
   static int Run(int argc, char* argv[])
   {
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapter());
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(DeviceAdapter());
     return vtkm::cont::testing::Testing::Run(TestAll, argc, argv);
   }
 };
diff --git a/vtkm/cont/testing/TestingArrayHandles.h b/vtkm/cont/testing/TestingArrayHandles.h
index 0e7487cee..f0e0c2609 100644
--- a/vtkm/cont/testing/TestingArrayHandles.h
+++ b/vtkm/cont/testing/TestingArrayHandles.h
@@ -458,7 +458,7 @@ private:
 public:
   static VTKM_CONT int Run(int argc, char* argv[])
   {
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
     return vtkm::cont::testing::Testing::Run(TryArrayHandleType(), argc, argv);
   }
 };
diff --git a/vtkm/cont/testing/TestingCellLocatorRectilinearGrid.h b/vtkm/cont/testing/TestingCellLocatorRectilinearGrid.h
index e5dd47481..304620b9c 100644
--- a/vtkm/cont/testing/TestingCellLocatorRectilinearGrid.h
+++ b/vtkm/cont/testing/TestingCellLocatorRectilinearGrid.h
@@ -195,7 +195,7 @@ public:
 
   void operator()() const
   {
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapter());
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(DeviceAdapter());
     this->TestTest();
   }
 };
diff --git a/vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h b/vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h
index ded32e4fa..9e9096d12 100644
--- a/vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h
+++ b/vtkm/cont/testing/TestingCellLocatorTwoLevelUniformGrid.h
@@ -227,7 +227,7 @@ void TestCellLocator(const vtkm::Vec<vtkm::Id, DIMENSIONS>& dim, vtkm::Id number
 template <typename DeviceAdapter>
 void TestingCellLocatorTwoLevelUniformGrid()
 {
-  vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapter());
+  vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(DeviceAdapter());
 
   vtkm::UInt32 seed = static_cast<vtkm::UInt32>(std::time(nullptr));
   std::cout << "Seed: " << seed << std::endl;
diff --git a/vtkm/cont/testing/TestingCellLocatorUniformGrid.h b/vtkm/cont/testing/TestingCellLocatorUniformGrid.h
index 2d9f82bce..9b1e3f5d7 100644
--- a/vtkm/cont/testing/TestingCellLocatorUniformGrid.h
+++ b/vtkm/cont/testing/TestingCellLocatorUniformGrid.h
@@ -169,7 +169,7 @@ public:
 
   void operator()() const
   {
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapter());
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(DeviceAdapter());
     this->TestTest();
   }
 };
diff --git a/vtkm/cont/testing/TestingColorTable.h b/vtkm/cont/testing/TestingColorTable.h
index b25a3a0a2..e20dd57e4 100644
--- a/vtkm/cont/testing/TestingColorTable.h
+++ b/vtkm/cont/testing/TestingColorTable.h
@@ -593,7 +593,7 @@ public:
   {
     //We need to verify the color table runs on this specific device
     //so we need to force our single device
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
     return vtkm::cont::testing::Testing::Run(TestAll(), argc, argv);
   }
 };
diff --git a/vtkm/cont/testing/TestingComputeRange.h b/vtkm/cont/testing/TestingComputeRange.h
index 2eca2f57a..d49b59f4e 100644
--- a/vtkm/cont/testing/TestingComputeRange.h
+++ b/vtkm/cont/testing/TestingComputeRange.h
@@ -159,7 +159,7 @@ private:
 public:
   static VTKM_CONT int Run(int argc, char* argv[])
   {
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
     return vtkm::cont::testing::Testing::Run(TestAll(), argc, argv);
   }
 };
diff --git a/vtkm/cont/testing/TestingDeviceAdapter.h b/vtkm/cont/testing/TestingDeviceAdapter.h
index 92dd2da97..558081ec6 100644
--- a/vtkm/cont/testing/TestingDeviceAdapter.h
+++ b/vtkm/cont/testing/TestingDeviceAdapter.h
@@ -585,7 +585,7 @@ private:
   VTKM_CONT
   static void TestTimer()
   {
-    auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+    auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
     if (tracker.CanRunOn(DeviceAdapterTag()))
     {
       std::cout << "-------------------------------------------" << std::endl;
diff --git a/vtkm/cont/testing/TestingFancyArrayHandles.h b/vtkm/cont/testing/TestingFancyArrayHandles.h
index f3e0bd3b9..80519efff 100644
--- a/vtkm/cont/testing/TestingFancyArrayHandles.h
+++ b/vtkm/cont/testing/TestingFancyArrayHandles.h
@@ -173,8 +173,8 @@ struct TransformExecObject : public vtkm::cont::ExecutionAndControlObjectBase
   {
     // Need to make sure the serial device is supported, since that is what is used on the
     // control side.
-    vtkm::cont::ScopedGlobalRuntimeDeviceTracker scopedTracker;
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ResetDevice(vtkm::cont::DeviceAdapterTagSerial());
+    vtkm::cont::ScopedRuntimeDeviceTracker scopedTracker;
+    vtkm::cont::GetRuntimeDeviceTracker().ResetDevice(vtkm::cont::DeviceAdapterTagSerial());
     this->VirtualFunctor.Reset(new VirtualTransformFunctor<ValueType, FunctorType>(functor));
   }
 
@@ -1377,7 +1377,7 @@ public:
   ///
   static VTKM_CONT int Run(int argc, char* argv[])
   {
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(DeviceAdapterTag());
     return vtkm::cont::testing::Testing::Run(TestAll(), argc, argv);
   }
 };
diff --git a/vtkm/cont/testing/TestingPointLocatorUniformGrid.h b/vtkm/cont/testing/TestingPointLocatorUniformGrid.h
index f9a184ec2..89e735402 100644
--- a/vtkm/cont/testing/TestingPointLocatorUniformGrid.h
+++ b/vtkm/cont/testing/TestingPointLocatorUniformGrid.h
@@ -178,7 +178,7 @@ public:
 
   void operator()() const
   {
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(DeviceAdapter());
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(DeviceAdapter());
     this->TestTest();
   }
 };
diff --git a/vtkm/cont/testing/UnitTestCellLocator.cxx b/vtkm/cont/testing/UnitTestCellLocator.cxx
index 0beba3617..9517a69d9 100644
--- a/vtkm/cont/testing/UnitTestCellLocator.cxx
+++ b/vtkm/cont/testing/UnitTestCellLocator.cxx
@@ -61,6 +61,6 @@ void TestCellLocator()
 
 int UnitTestCellLocator(int argc, char* argv[])
 {
-  vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(VTKM_DEFAULT_DEVICE_ADAPTER_TAG());
+  vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(VTKM_DEFAULT_DEVICE_ADAPTER_TAG());
   return vtkm::cont::testing::Testing::Run(TestCellLocator, argc, argv);
 }
diff --git a/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx b/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx
index 83d9ba5f0..0d53d6be5 100644
--- a/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx
+++ b/vtkm/cont/testing/UnitTestDeviceAdapterAlgorithmGeneral.cxx
@@ -139,7 +139,7 @@ int UnitTestDeviceAdapterAlgorithmGeneral(int argc, char* argv[])
 {
   //need to enable DeviceAdapterTagTestAlgorithmGeneral as it
   //is not part of the default set of devices
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ResetDevice(vtkm::cont::DeviceAdapterTagTestAlgorithmGeneral{});
 
   return vtkm::cont::testing::TestingDeviceAdapter<
diff --git a/vtkm/cont/testing/UnitTestRuntimeDeviceNames.cxx b/vtkm/cont/testing/UnitTestRuntimeDeviceNames.cxx
index 9bdf46aa8..f5afdc41e 100644
--- a/vtkm/cont/testing/UnitTestRuntimeDeviceNames.cxx
+++ b/vtkm/cont/testing/UnitTestRuntimeDeviceNames.cxx
@@ -18,6 +18,7 @@
 //  this software.
 //============================================================================
 
+#include <vtkm/cont/RuntimeDeviceInformation.h>
 #include <vtkm/cont/RuntimeDeviceTracker.h>
 
 #include <vtkm/cont/cuda/DeviceAdapterCuda.h>
@@ -46,7 +47,7 @@ struct VTKM_ALWAYS_EXPORT DeviceAdapterTagInvalidDeviceId : vtkm::cont::DeviceAd
 template <typename Tag>
 void TestName(const std::string& name, Tag tag, vtkm::cont::DeviceAdapterId id)
 {
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
 
 #if 0
   std::cerr << "Expected: " << name << "\n"
@@ -59,9 +60,9 @@ void TestName(const std::string& name, Tag tag, vtkm::cont::DeviceAdapterId id)
   VTKM_TEST_ASSERT(tag.GetName() == name, "Tag::GetName() failed.");
   VTKM_TEST_ASSERT(vtkm::cont::make_DeviceAdapterId(id.GetValue()) == id,
                    "make_DeviceAdapterId(int8) failed");
-  VTKM_TEST_ASSERT(tracker.GetDeviceName(id) == name, "RTDeviceTracker::GetDeviceName(Id) failed.");
-  VTKM_TEST_ASSERT(tracker.GetDeviceName(tag) == name,
-                   "RTDeviceTracker::GetDeviceName(Tag) failed.");
+
+  VTKM_TEST_ASSERT(tracker.GetDeviceName(id) == name, "RTDeviceTracker::GetName(Id) failed.");
+  VTKM_TEST_ASSERT(tracker.GetDeviceName(tag) == name, "RTDeviceTracker::GetName(Tag) failed.");
 
   //check going from name to device id
   auto lowerCaseFunc = [](char c) {
diff --git a/vtkm/cont/testing/UnitTestTimer.cxx b/vtkm/cont/testing/UnitTestTimer.cxx
index 4e0fa9819..b62e6c9d6 100644
--- a/vtkm/cont/testing/UnitTestTimer.cxx
+++ b/vtkm/cont/testing/UnitTestTimer.cxx
@@ -85,7 +85,7 @@ bool CanTimeOnDevice(const vtkm::cont::Timer& timer, vtkm::cont::DeviceAdapterId
            (timer.GetDevice() == device))
   {
     // Device is specified and it is a match for the timer's device.
-    return vtkm::cont::GetGlobalRuntimeDeviceTracker().CanRunOn(device);
+    return vtkm::cont::GetRuntimeDeviceTracker().CanRunOn(device);
   }
   else
   {
@@ -166,7 +166,7 @@ struct TimerCheckFunctor
   void operator()(vtkm::cont::DeviceAdapterId device) const
   {
     if ((device != vtkm::cont::DeviceAdapterTagAny()) &&
-        !vtkm::cont::GetGlobalRuntimeDeviceTracker().CanRunOn(device))
+        !vtkm::cont::GetRuntimeDeviceTracker().CanRunOn(device))
     {
       // A timer will not work if set on a device that is not supported. Just skip this test.
       return;
diff --git a/vtkm/cont/testing/UnitTestTryExecute.cxx b/vtkm/cont/testing/UnitTestTryExecute.cxx
index 1cb0bfe8e..9b3181858 100644
--- a/vtkm/cont/testing/UnitTestTryExecute.cxx
+++ b/vtkm/cont/testing/UnitTestTryExecute.cxx
@@ -132,7 +132,7 @@ void TryExecuteWithDevice(DeviceList, bool expectSuccess)
 template <typename DeviceList>
 void TryExecuteAllExplicit(DeviceList, bool expectSuccess)
 {
-  vtkm::cont::RuntimeDeviceTracker tracker;
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   vtkm::cont::ArrayHandle<vtkm::FloatDefault> inArray;
   vtkm::cont::ArrayHandle<vtkm::FloatDefault> outArray;
 
@@ -170,7 +170,7 @@ void TryExecuteAllEdgeCases()
 {
   using ValidDevice = vtkm::cont::DeviceAdapterTagSerial;
   using SingleValidList = vtkm::ListTagBase<ValidDevice>;
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
 
   std::cout << "TryExecute no Runtime, no Device, no parameters." << std::endl;
   vtkm::cont::TryExecute(EdgeCaseFunctor());
@@ -217,7 +217,7 @@ void RunErrorTest(bool shouldFail, bool shouldThrow, bool shouldDisable)
   bool threw = false;
   bool disabled = false;
 
-  auto tracker = vtkm::cont::GetGlobalRuntimeDeviceTracker();
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
   tracker.ForceDevice(Device{});
 
   try
diff --git a/vtkm/rendering/Canvas.cxx b/vtkm/rendering/Canvas.cxx
index 772ed8708..3da1f5a48 100644
--- a/vtkm/rendering/Canvas.cxx
+++ b/vtkm/rendering/Canvas.cxx
@@ -430,8 +430,8 @@ void Canvas::AddColorBar(const vtkm::Bounds& bounds,
   vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::UInt8, 4>> colorMap;
 
   {
-    vtkm::cont::ScopedGlobalRuntimeDeviceTracker tracker;
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagSerial());
+    vtkm::cont::ScopedRuntimeDeviceTracker tracker;
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagSerial());
     colorTable.Sample(static_cast<vtkm::Int32>(numSamples), colorMap);
   }
 
diff --git a/vtkm/rendering/Mapper.cxx b/vtkm/rendering/Mapper.cxx
index ef8824f84..a053816d1 100644
--- a/vtkm/rendering/Mapper.cxx
+++ b/vtkm/rendering/Mapper.cxx
@@ -39,8 +39,8 @@ void Mapper::SetActiveColorTable(const vtkm::cont::ColorTable& colorTable)
   vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::UInt8, 4>> temp;
 
   {
-    vtkm::cont::ScopedGlobalRuntimeDeviceTracker tracker;
-    vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagSerial());
+    vtkm::cont::ScopedRuntimeDeviceTracker tracker;
+    vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(vtkm::cont::DeviceAdapterTagSerial());
     colorTable.Sample(1024, temp);
   }
 
diff --git a/vtkm/testing/UnitTestExceptions.cxx b/vtkm/testing/UnitTestExceptions.cxx
index 3ddfa9586..24f5579a6 100644
--- a/vtkm/testing/UnitTestExceptions.cxx
+++ b/vtkm/testing/UnitTestExceptions.cxx
@@ -32,7 +32,7 @@
 int UnitTestExceptions(int argc, char* argv[])
 {
   vtkm::cont::Initialize(argc, argv);
-  vtkm::cont::RuntimeDeviceTracker tracker;
+  auto tracker = vtkm::cont::GetRuntimeDeviceTracker();
 
   try
   {
diff --git a/vtkm/worklet/testing/UnitTestExternalFaces.cxx b/vtkm/worklet/testing/UnitTestExternalFaces.cxx
index f3003962a..40733d18e 100644
--- a/vtkm/worklet/testing/UnitTestExternalFaces.cxx
+++ b/vtkm/worklet/testing/UnitTestExternalFaces.cxx
@@ -202,7 +202,7 @@ void TestExternalFaces3()
 void TestExternalFaces()
 {
   // Ignore the device passed in.
-  vtkm::cont::GetGlobalRuntimeDeviceTracker().ForceDevice(MyDeviceAdapter());
+  vtkm::cont::GetRuntimeDeviceTracker().ForceDevice(MyDeviceAdapter());
   TestExternalFaces1();
   TestExternalFaces2();
   TestExternalFaces3();