diff --git a/SDL/Constants.h b/SDL/Constants.h
index c957b252..60829b1b 100644
--- a/SDL/Constants.h
+++ b/SDL/Constants.h
@@ -87,7 +87,7 @@ namespace SDL {
 
   // Second allocation wrapper function when queue is not given. Reduces code boilerplate.
   template <typename T, typename TAcc, typename TSize>
-  ALPAKA_FN_HOST ALPAKA_FN_INLINE Buf<TAcc, T> allocBufWrapper(TAcc const& devAccIn, TSize nElements) {
+  ALPAKA_FN_HOST ALPAKA_FN_INLINE Buf<alpaka::Dev<TAcc>, T> allocBufWrapper(TAcc const& devAccIn, TSize nElements) {
     return alpaka::allocBuf<T, Idx>(devAccIn, Vec1d(static_cast<Idx>(nElements)));
   }
 
diff --git a/SDL/EndcapGeometry.h b/SDL/EndcapGeometry.h
index 62b75d72..3727ed0d 100644
--- a/SDL/EndcapGeometry.h
+++ b/SDL/EndcapGeometry.h
@@ -24,8 +24,8 @@ namespace SDL {
     std::map<unsigned int, float> centroid_zs_;    // centroid z
 
   public:
-    Buf<Acc, unsigned int> geoMapDetId_buf;
-    Buf<Acc, float> geoMapPhi_buf;
+    Buf<SDL::Dev, unsigned int> geoMapDetId_buf;
+    Buf<SDL::Dev, float> geoMapPhi_buf;
 
     unsigned int nEndCapMap;
 
diff --git a/SDL/Event.cc b/SDL/Event.cc
index 2cee42af..18dee6d5 100644
--- a/SDL/Event.cc
+++ b/SDL/Event.cc
@@ -197,13 +197,13 @@ void SDL::Event::addHitToEvent(std::vector<float> x,
   // Initialize space on device/host for next event.
   if (hitsInGPU == nullptr) {
     hitsInGPU = new SDL::hits();
-    hitsBuffers = new SDL::hitsBuffer<Acc>(nModules, nHits, devAcc, queue);
+    hitsBuffers = new SDL::hitsBuffer<Dev>(nModules, nHits, devAcc, queue);
     hitsInGPU->setData(*hitsBuffers);
   }
 
   if (rangesInGPU == nullptr) {
     rangesInGPU = new SDL::objectRanges();
-    rangesBuffers = new SDL::objectRangesBuffer<Acc>(nModules, nLowerModules, devAcc, queue);
+    rangesBuffers = new SDL::objectRangesBuffer<Dev>(nModules, nLowerModules, devAcc, queue);
     rangesInGPU->setData(*rangesBuffers);
   }
 
@@ -317,7 +317,7 @@ void SDL::Event::addPixelSegmentToEvent(std::vector<unsigned int> hitIndices0,
     nTotalMDs += N_MAX_PIXEL_MD_PER_MODULES;
 
     mdsInGPU = new SDL::miniDoublets();
-    miniDoubletsBuffers = new SDL::miniDoubletsBuffer<Acc>(nTotalMDs, nLowerModules, devAcc, queue);
+    miniDoubletsBuffers = new SDL::miniDoubletsBuffer<Dev>(nTotalMDs, nLowerModules, devAcc, queue);
     mdsInGPU->setData(*miniDoubletsBuffers);
 
     alpaka::memcpy(queue, miniDoubletsBuffers->nMemoryLocations_buf, nTotalMDs_view);
@@ -348,7 +348,7 @@ void SDL::Event::addPixelSegmentToEvent(std::vector<unsigned int> hitIndices0,
 
     segmentsInGPU = new SDL::segments();
     segmentsBuffers =
-        new SDL::segmentsBuffer<Acc>(nTotalSegments, nLowerModules, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devAcc, queue);
+        new SDL::segmentsBuffer<Dev>(nTotalSegments, nLowerModules, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devAcc, queue);
     segmentsInGPU->setData(*segmentsBuffers);
 
     alpaka::memcpy(queue, segmentsBuffers->nMemoryLocations_buf, nTotalSegments_view);
@@ -460,7 +460,7 @@ void SDL::Event::createMiniDoublets() {
 
   if (mdsInGPU == nullptr) {
     mdsInGPU = new SDL::miniDoublets();
-    miniDoubletsBuffers = new SDL::miniDoubletsBuffer<Acc>(nTotalMDs, nLowerModules, devAcc, queue);
+    miniDoubletsBuffers = new SDL::miniDoubletsBuffer<Dev>(nTotalMDs, nLowerModules, devAcc, queue);
     mdsInGPU->setData(*miniDoubletsBuffers);
   }
 
@@ -505,7 +505,7 @@ void SDL::Event::createSegmentsWithModuleMap() {
   if (segmentsInGPU == nullptr) {
     segmentsInGPU = new SDL::segments();
     segmentsBuffers =
-        new SDL::segmentsBuffer<Acc>(nTotalSegments, nLowerModules, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devAcc, queue);
+        new SDL::segmentsBuffer<Dev>(nTotalSegments, nLowerModules, N_MAX_PIXEL_SEGMENTS_PER_MODULE, devAcc, queue);
     segmentsInGPU->setData(*segmentsBuffers);
   }
 
@@ -566,7 +566,7 @@ void SDL::Event::createTriplets() {
 
     tripletsInGPU = new SDL::triplets();
     tripletsBuffers =
-        new SDL::tripletsBuffer<Acc>(*alpaka::getPtrNative(maxTriplets_buf), nLowerModules, devAcc, queue);
+        new SDL::tripletsBuffer<Dev>(*alpaka::getPtrNative(maxTriplets_buf), nLowerModules, devAcc, queue);
     tripletsInGPU->setData(*tripletsBuffers);
 
     alpaka::memcpy(queue, tripletsBuffers->nMemoryLocations_buf, maxTriplets_buf, 1);
@@ -652,7 +652,7 @@ void SDL::Event::createTriplets() {
 void SDL::Event::createTrackCandidates() {
   if (trackCandidatesInGPU == nullptr) {
     trackCandidatesInGPU = new SDL::trackCandidates();
-    trackCandidatesBuffers = new SDL::trackCandidatesBuffer<Acc>(
+    trackCandidatesBuffers = new SDL::trackCandidatesBuffer<Dev>(
         N_MAX_NONPIXEL_TRACK_CANDIDATES + N_MAX_PIXEL_TRACK_CANDIDATES, devAcc, queue);
     trackCandidatesInGPU->setData(*trackCandidatesBuffers);
   }
@@ -816,7 +816,7 @@ void SDL::Event::createTrackCandidates() {
 void SDL::Event::createPixelTriplets() {
   if (pixelTripletsInGPU == nullptr) {
     pixelTripletsInGPU = new SDL::pixelTriplets();
-    pixelTripletsBuffers = new SDL::pixelTripletsBuffer<Acc>(N_MAX_PIXEL_TRIPLETS, devAcc, queue);
+    pixelTripletsBuffers = new SDL::pixelTripletsBuffer<Dev>(N_MAX_PIXEL_TRIPLETS, devAcc, queue);
     pixelTripletsInGPU->setData(*pixelTripletsBuffers);
   }
 
@@ -963,7 +963,7 @@ void SDL::Event::createQuintuplets() {
 
   if (quintupletsInGPU == nullptr) {
     quintupletsInGPU = new SDL::quintuplets();
-    quintupletsBuffers = new SDL::quintupletsBuffer<Acc>(nTotalQuintuplets, nLowerModules, devAcc, queue);
+    quintupletsBuffers = new SDL::quintupletsBuffer<Dev>(nTotalQuintuplets, nLowerModules, devAcc, queue);
     quintupletsInGPU->setData(*quintupletsBuffers);
 
     alpaka::memcpy(queue, quintupletsBuffers->nMemoryLocations_buf, nTotalQuintuplets_buf, 1);
@@ -1043,12 +1043,12 @@ void SDL::Event::pixelLineSegmentCleaning() {
 void SDL::Event::createPixelQuintuplets() {
   if (pixelQuintupletsInGPU == nullptr) {
     pixelQuintupletsInGPU = new SDL::pixelQuintuplets();
-    pixelQuintupletsBuffers = new SDL::pixelQuintupletsBuffer<Acc>(N_MAX_PIXEL_QUINTUPLETS, devAcc, queue);
+    pixelQuintupletsBuffers = new SDL::pixelQuintupletsBuffer<Dev>(N_MAX_PIXEL_QUINTUPLETS, devAcc, queue);
     pixelQuintupletsInGPU->setData(*pixelQuintupletsBuffers);
   }
   if (trackCandidatesInGPU == nullptr) {
     trackCandidatesInGPU = new SDL::trackCandidates();
-    trackCandidatesBuffers = new SDL::trackCandidatesBuffer<Acc>(
+    trackCandidatesBuffers = new SDL::trackCandidatesBuffer<Dev>(
         N_MAX_NONPIXEL_TRACK_CANDIDATES + N_MAX_PIXEL_TRACK_CANDIDATES, devAcc, queue);
     trackCandidatesInGPU->setData(*trackCandidatesBuffers);
   }
diff --git a/SDL/Event.h b/SDL/Event.h
index 36977ba6..851fa29e 100644
--- a/SDL/Event.h
+++ b/SDL/Event.h
@@ -35,23 +35,23 @@ namespace SDL {
     //Device stuff
     unsigned int nTotalSegments;
     struct objectRanges* rangesInGPU;
-    struct objectRangesBuffer<Acc>* rangesBuffers;
+    struct objectRangesBuffer<Dev>* rangesBuffers;
     struct hits* hitsInGPU;
-    struct hitsBuffer<Acc>* hitsBuffers;
+    struct hitsBuffer<Dev>* hitsBuffers;
     struct miniDoublets* mdsInGPU;
-    struct miniDoubletsBuffer<Acc>* miniDoubletsBuffers;
+    struct miniDoubletsBuffer<Dev>* miniDoubletsBuffers;
     struct segments* segmentsInGPU;
-    struct segmentsBuffer<Acc>* segmentsBuffers;
+    struct segmentsBuffer<Dev>* segmentsBuffers;
     struct triplets* tripletsInGPU;
-    struct tripletsBuffer<Acc>* tripletsBuffers;
+    struct tripletsBuffer<Dev>* tripletsBuffers;
     struct quintuplets* quintupletsInGPU;
-    struct quintupletsBuffer<Acc>* quintupletsBuffers;
+    struct quintupletsBuffer<Dev>* quintupletsBuffers;
     struct trackCandidates* trackCandidatesInGPU;
-    struct trackCandidatesBuffer<Acc>* trackCandidatesBuffers;
+    struct trackCandidatesBuffer<Dev>* trackCandidatesBuffers;
     struct pixelTriplets* pixelTripletsInGPU;
-    struct pixelTripletsBuffer<Acc>* pixelTripletsBuffers;
+    struct pixelTripletsBuffer<Dev>* pixelTripletsBuffers;
     struct pixelQuintuplets* pixelQuintupletsInGPU;
-    struct pixelQuintupletsBuffer<Acc>* pixelQuintupletsBuffers;
+    struct pixelQuintupletsBuffer<Dev>* pixelQuintupletsBuffers;
 
     //CPU interface stuff
     objectRangesBuffer<alpaka::DevCpu>* rangesInCPU;
diff --git a/SDL/Hit.h b/SDL/Hit.h
index 7b8c83b9..799a5518 100644
--- a/SDL/Hit.h
+++ b/SDL/Hit.h
@@ -50,27 +50,27 @@ namespace SDL {
     }
   };
 
-  template <typename TAcc>
+  template <typename TDev>
   struct hitsBuffer : hits {
-    Buf<TAcc, unsigned int> nHits_buf;
-    Buf<TAcc, float> xs_buf;
-    Buf<TAcc, float> ys_buf;
-    Buf<TAcc, float> zs_buf;
-    Buf<TAcc, uint16_t> moduleIndices_buf;
-    Buf<TAcc, unsigned int> idxs_buf;
-    Buf<TAcc, unsigned int> detid_buf;
-    Buf<TAcc, float> rts_buf;
-    Buf<TAcc, float> phis_buf;
-    Buf<TAcc, float> etas_buf;
-    Buf<TAcc, float> highEdgeXs_buf;
-    Buf<TAcc, float> highEdgeYs_buf;
-    Buf<TAcc, float> lowEdgeXs_buf;
-    Buf<TAcc, float> lowEdgeYs_buf;
-    Buf<TAcc, int> hitRanges_buf;
-    Buf<TAcc, int> hitRangesLower_buf;
-    Buf<TAcc, int> hitRangesUpper_buf;
-    Buf<TAcc, int8_t> hitRangesnLower_buf;
-    Buf<TAcc, int8_t> hitRangesnUpper_buf;
+    Buf<TDev, unsigned int> nHits_buf;
+    Buf<TDev, float> xs_buf;
+    Buf<TDev, float> ys_buf;
+    Buf<TDev, float> zs_buf;
+    Buf<TDev, uint16_t> moduleIndices_buf;
+    Buf<TDev, unsigned int> idxs_buf;
+    Buf<TDev, unsigned int> detid_buf;
+    Buf<TDev, float> rts_buf;
+    Buf<TDev, float> phis_buf;
+    Buf<TDev, float> etas_buf;
+    Buf<TDev, float> highEdgeXs_buf;
+    Buf<TDev, float> highEdgeYs_buf;
+    Buf<TDev, float> lowEdgeXs_buf;
+    Buf<TDev, float> lowEdgeYs_buf;
+    Buf<TDev, int> hitRanges_buf;
+    Buf<TDev, int> hitRangesLower_buf;
+    Buf<TDev, int> hitRangesUpper_buf;
+    Buf<TDev, int8_t> hitRangesnLower_buf;
+    Buf<TDev, int8_t> hitRangesnUpper_buf;
 
     template <typename TQueue, typename TDevAcc>
     hitsBuffer(unsigned int nModules, unsigned int nMaxHits, TDevAcc const& devAccIn, TQueue& queue)
diff --git a/SDL/MiniDoublet.h b/SDL/MiniDoublet.h
index 21a41a0a..898e97fe 100644
--- a/SDL/MiniDoublet.h
+++ b/SDL/MiniDoublet.h
@@ -93,50 +93,50 @@ namespace SDL {
     }
   };
 
-  template <typename TAcc>
+  template <typename TDev>
   struct miniDoubletsBuffer : miniDoublets {
-    Buf<TAcc, unsigned int> nMemoryLocations_buf;
-
-    Buf<TAcc, unsigned int> anchorHitIndices_buf;
-    Buf<TAcc, unsigned int> outerHitIndices_buf;
-    Buf<TAcc, uint16_t> moduleIndices_buf;
-    Buf<TAcc, int> nMDs_buf;
-    Buf<TAcc, int> totOccupancyMDs_buf;
-    Buf<TAcc, float> dphichanges_buf;
-
-    Buf<TAcc, float> dzs_buf;
-    Buf<TAcc, float> dphis_buf;
-
-    Buf<TAcc, float> shiftedXs_buf;
-    Buf<TAcc, float> shiftedYs_buf;
-    Buf<TAcc, float> shiftedZs_buf;
-    Buf<TAcc, float> noShiftedDzs_buf;
-    Buf<TAcc, float> noShiftedDphis_buf;
-    Buf<TAcc, float> noShiftedDphiChanges_buf;
-
-    Buf<TAcc, float> anchorX_buf;
-    Buf<TAcc, float> anchorY_buf;
-    Buf<TAcc, float> anchorZ_buf;
-    Buf<TAcc, float> anchorRt_buf;
-    Buf<TAcc, float> anchorPhi_buf;
-    Buf<TAcc, float> anchorEta_buf;
-    Buf<TAcc, float> anchorHighEdgeX_buf;
-    Buf<TAcc, float> anchorHighEdgeY_buf;
-    Buf<TAcc, float> anchorLowEdgeX_buf;
-    Buf<TAcc, float> anchorLowEdgeY_buf;
-    Buf<TAcc, float> anchorLowEdgePhi_buf;
-    Buf<TAcc, float> anchorHighEdgePhi_buf;
-
-    Buf<TAcc, float> outerX_buf;
-    Buf<TAcc, float> outerY_buf;
-    Buf<TAcc, float> outerZ_buf;
-    Buf<TAcc, float> outerRt_buf;
-    Buf<TAcc, float> outerPhi_buf;
-    Buf<TAcc, float> outerEta_buf;
-    Buf<TAcc, float> outerHighEdgeX_buf;
-    Buf<TAcc, float> outerHighEdgeY_buf;
-    Buf<TAcc, float> outerLowEdgeX_buf;
-    Buf<TAcc, float> outerLowEdgeY_buf;
+    Buf<TDev, unsigned int> nMemoryLocations_buf;
+
+    Buf<TDev, unsigned int> anchorHitIndices_buf;
+    Buf<TDev, unsigned int> outerHitIndices_buf;
+    Buf<TDev, uint16_t> moduleIndices_buf;
+    Buf<TDev, int> nMDs_buf;
+    Buf<TDev, int> totOccupancyMDs_buf;
+    Buf<TDev, float> dphichanges_buf;
+
+    Buf<TDev, float> dzs_buf;
+    Buf<TDev, float> dphis_buf;
+
+    Buf<TDev, float> shiftedXs_buf;
+    Buf<TDev, float> shiftedYs_buf;
+    Buf<TDev, float> shiftedZs_buf;
+    Buf<TDev, float> noShiftedDzs_buf;
+    Buf<TDev, float> noShiftedDphis_buf;
+    Buf<TDev, float> noShiftedDphiChanges_buf;
+
+    Buf<TDev, float> anchorX_buf;
+    Buf<TDev, float> anchorY_buf;
+    Buf<TDev, float> anchorZ_buf;
+    Buf<TDev, float> anchorRt_buf;
+    Buf<TDev, float> anchorPhi_buf;
+    Buf<TDev, float> anchorEta_buf;
+    Buf<TDev, float> anchorHighEdgeX_buf;
+    Buf<TDev, float> anchorHighEdgeY_buf;
+    Buf<TDev, float> anchorLowEdgeX_buf;
+    Buf<TDev, float> anchorLowEdgeY_buf;
+    Buf<TDev, float> anchorLowEdgePhi_buf;
+    Buf<TDev, float> anchorHighEdgePhi_buf;
+
+    Buf<TDev, float> outerX_buf;
+    Buf<TDev, float> outerY_buf;
+    Buf<TDev, float> outerZ_buf;
+    Buf<TDev, float> outerRt_buf;
+    Buf<TDev, float> outerPhi_buf;
+    Buf<TDev, float> outerEta_buf;
+    Buf<TDev, float> outerHighEdgeX_buf;
+    Buf<TDev, float> outerHighEdgeY_buf;
+    Buf<TDev, float> outerLowEdgeX_buf;
+    Buf<TDev, float> outerLowEdgeY_buf;
 
     template <typename TQueue, typename TDevAcc>
     miniDoubletsBuffer(unsigned int nMemoryLoc, uint16_t nLowerModules, TDevAcc const& devAccIn, TQueue& queue)
diff --git a/SDL/Module.h b/SDL/Module.h
index ba498778..14106035 100644
--- a/SDL/Module.h
+++ b/SDL/Module.h
@@ -79,36 +79,36 @@ namespace SDL {
     }
   };
 
-  template <typename TAcc>
+  template <typename TDev>
   struct objectRangesBuffer : objectRanges {
-    Buf<TAcc, int> hitRanges_buf;
-    Buf<TAcc, int> hitRangesLower_buf;
-    Buf<TAcc, int> hitRangesUpper_buf;
-    Buf<TAcc, int8_t> hitRangesnLower_buf;
-    Buf<TAcc, int8_t> hitRangesnUpper_buf;
-    Buf<TAcc, int> mdRanges_buf;
-    Buf<TAcc, int> segmentRanges_buf;
-    Buf<TAcc, int> trackletRanges_buf;
-    Buf<TAcc, int> tripletRanges_buf;
-    Buf<TAcc, int> trackCandidateRanges_buf;
-    Buf<TAcc, int> quintupletRanges_buf;
-
-    Buf<TAcc, uint16_t> nEligibleT5Modules_buf;
-    Buf<TAcc, uint16_t> indicesOfEligibleT5Modules_buf;
-
-    Buf<TAcc, int> quintupletModuleIndices_buf;
-    Buf<TAcc, int> quintupletModuleOccupancy_buf;
-    Buf<TAcc, int> miniDoubletModuleIndices_buf;
-    Buf<TAcc, int> miniDoubletModuleOccupancy_buf;
-    Buf<TAcc, int> segmentModuleIndices_buf;
-    Buf<TAcc, int> segmentModuleOccupancy_buf;
-    Buf<TAcc, int> tripletModuleIndices_buf;
-    Buf<TAcc, int> tripletModuleOccupancy_buf;
-
-    Buf<TAcc, unsigned int> device_nTotalMDs_buf;
-    Buf<TAcc, unsigned int> device_nTotalSegs_buf;
-    Buf<TAcc, unsigned int> device_nTotalTrips_buf;
-    Buf<TAcc, unsigned int> device_nTotalQuints_buf;
+    Buf<TDev, int> hitRanges_buf;
+    Buf<TDev, int> hitRangesLower_buf;
+    Buf<TDev, int> hitRangesUpper_buf;
+    Buf<TDev, int8_t> hitRangesnLower_buf;
+    Buf<TDev, int8_t> hitRangesnUpper_buf;
+    Buf<TDev, int> mdRanges_buf;
+    Buf<TDev, int> segmentRanges_buf;
+    Buf<TDev, int> trackletRanges_buf;
+    Buf<TDev, int> tripletRanges_buf;
+    Buf<TDev, int> trackCandidateRanges_buf;
+    Buf<TDev, int> quintupletRanges_buf;
+
+    Buf<TDev, uint16_t> nEligibleT5Modules_buf;
+    Buf<TDev, uint16_t> indicesOfEligibleT5Modules_buf;
+
+    Buf<TDev, int> quintupletModuleIndices_buf;
+    Buf<TDev, int> quintupletModuleOccupancy_buf;
+    Buf<TDev, int> miniDoubletModuleIndices_buf;
+    Buf<TDev, int> miniDoubletModuleOccupancy_buf;
+    Buf<TDev, int> segmentModuleIndices_buf;
+    Buf<TDev, int> segmentModuleOccupancy_buf;
+    Buf<TDev, int> tripletModuleIndices_buf;
+    Buf<TDev, int> tripletModuleOccupancy_buf;
+
+    Buf<TDev, unsigned int> device_nTotalMDs_buf;
+    Buf<TDev, unsigned int> device_nTotalSegs_buf;
+    Buf<TDev, unsigned int> device_nTotalTrips_buf;
+    Buf<TDev, unsigned int> device_nTotalQuints_buf;
 
     template <typename TQueue, typename TDevAcc>
     objectRangesBuffer(unsigned int nMod, unsigned int nLowerMod, TDevAcc const& devAccIn, TQueue& queue)
diff --git a/SDL/ModuleMethods.h b/SDL/ModuleMethods.h
index f9c6eded..54a9fa54 100644
--- a/SDL/ModuleMethods.h
+++ b/SDL/ModuleMethods.h
@@ -54,8 +54,8 @@ namespace SDL {
     }
   };
 
-  template <typename TQueue, typename TAcc>
-  inline void fillPixelMap(struct modulesBuffer<TAcc>* modulesBuf, struct pixelMap& pixelMapping, TQueue queue) {
+  template <typename TQueue, typename TDev>
+  inline void fillPixelMap(struct modulesBuffer<TDev>* modulesBuf, struct pixelMap& pixelMapping, TQueue queue) {
     std::vector<unsigned int> connectedModuleDetIds;
     std::vector<unsigned int> connectedModuleDetIds_pos;
     std::vector<unsigned int> connectedModuleDetIds_neg;
@@ -128,8 +128,8 @@ namespace SDL {
     alpaka::wait(queue);
   };
 
-  template <typename TQueue, typename TAcc>
-  inline void fillConnectedModuleArrayExplicit(struct modulesBuffer<TAcc>* modulesBuf,
+  template <typename TQueue, typename TDev>
+  inline void fillConnectedModuleArrayExplicit(struct modulesBuffer<TDev>* modulesBuf,
                                                unsigned int nMod,
                                                TQueue queue) {
     auto moduleMap_buf = allocBufWrapper<uint16_t>(devHost, nMod * 40);
@@ -153,8 +153,8 @@ namespace SDL {
     alpaka::wait(queue);
   };
 
-  template <typename TQueue, typename TAcc>
-  inline void fillMapArraysExplicit(struct modulesBuffer<TAcc>* modulesBuf, unsigned int nMod, TQueue queue) {
+  template <typename TQueue, typename TDev>
+  inline void fillMapArraysExplicit(struct modulesBuffer<TDev>* modulesBuf, unsigned int nMod, TQueue queue) {
     auto mapIdx_buf = allocBufWrapper<uint16_t>(devHost, nMod);
     uint16_t* mapIdx = alpaka::getPtrNative(mapIdx_buf);
 
@@ -198,8 +198,8 @@ namespace SDL {
     eta = ((m_z > 0) - (m_z < 0)) * std::acosh(r / std::sqrt(m_x * m_x + m_y * m_y));
   };
 
-  template <typename TQueue, typename TAcc>
-  void loadModulesFromFile(struct modulesBuffer<TAcc>* modulesBuf,
+  template <typename TQueue, typename TDev>
+  void loadModulesFromFile(struct modulesBuffer<TDev>* modulesBuf,
                            uint16_t& nModules,
                            uint16_t& nLowerModules,
                            struct pixelMap& pixelMapping,
diff --git a/SDL/PixelTriplet.h b/SDL/PixelTriplet.h
index 43493b75..07fdbc37 100644
--- a/SDL/PixelTriplet.h
+++ b/SDL/PixelTriplet.h
@@ -67,31 +67,31 @@ namespace SDL {
     }
   };
 
-  template <typename TAcc>
+  template <typename TDev>
   struct pixelTripletsBuffer : pixelTriplets {
-    Buf<TAcc, unsigned int> pixelSegmentIndices_buf;
-    Buf<TAcc, unsigned int> tripletIndices_buf;
-    Buf<TAcc, int> nPixelTriplets_buf;
-    Buf<TAcc, int> totOccupancyPixelTriplets_buf;
-    Buf<TAcc, FPX> pixelRadius_buf;
-    Buf<TAcc, FPX> tripletRadius_buf;
-    Buf<TAcc, FPX> pt_buf;
-    Buf<TAcc, FPX> eta_buf;
-    Buf<TAcc, FPX> phi_buf;
-    Buf<TAcc, FPX> eta_pix_buf;
-    Buf<TAcc, FPX> phi_pix_buf;
-    Buf<TAcc, FPX> score_buf;
-    Buf<TAcc, bool> isDup_buf;
-    Buf<TAcc, bool> partOfPT5_buf;
-    Buf<TAcc, uint8_t> logicalLayers_buf;
-    Buf<TAcc, unsigned int> hitIndices_buf;
-    Buf<TAcc, uint16_t> lowerModuleIndices_buf;
-    Buf<TAcc, FPX> centerX_buf;
-    Buf<TAcc, FPX> centerY_buf;
-    Buf<TAcc, float> pixelRadiusError_buf;
-    Buf<TAcc, float> rPhiChiSquared_buf;
-    Buf<TAcc, float> rPhiChiSquaredInwards_buf;
-    Buf<TAcc, float> rzChiSquared_buf;
+    Buf<TDev, unsigned int> pixelSegmentIndices_buf;
+    Buf<TDev, unsigned int> tripletIndices_buf;
+    Buf<TDev, int> nPixelTriplets_buf;
+    Buf<TDev, int> totOccupancyPixelTriplets_buf;
+    Buf<TDev, FPX> pixelRadius_buf;
+    Buf<TDev, FPX> tripletRadius_buf;
+    Buf<TDev, FPX> pt_buf;
+    Buf<TDev, FPX> eta_buf;
+    Buf<TDev, FPX> phi_buf;
+    Buf<TDev, FPX> eta_pix_buf;
+    Buf<TDev, FPX> phi_pix_buf;
+    Buf<TDev, FPX> score_buf;
+    Buf<TDev, bool> isDup_buf;
+    Buf<TDev, bool> partOfPT5_buf;
+    Buf<TDev, uint8_t> logicalLayers_buf;
+    Buf<TDev, unsigned int> hitIndices_buf;
+    Buf<TDev, uint16_t> lowerModuleIndices_buf;
+    Buf<TDev, FPX> centerX_buf;
+    Buf<TDev, FPX> centerY_buf;
+    Buf<TDev, float> pixelRadiusError_buf;
+    Buf<TDev, float> rPhiChiSquared_buf;
+    Buf<TDev, float> rPhiChiSquaredInwards_buf;
+    Buf<TDev, float> rzChiSquared_buf;
 
     template <typename TQueue, typename TDevAcc>
     pixelTripletsBuffer(unsigned int maxPixelTriplets, TDevAcc const& devAccIn, TQueue& queue)
@@ -1944,26 +1944,26 @@ namespace SDL {
     }
   };
 
-  template <typename TAcc>
+  template <typename TDev>
   struct pixelQuintupletsBuffer : pixelQuintuplets {
-    Buf<TAcc, unsigned int> pixelIndices_buf;
-    Buf<TAcc, unsigned int> T5Indices_buf;
-    Buf<TAcc, int> nPixelQuintuplets_buf;
-    Buf<TAcc, int> totOccupancyPixelQuintuplets_buf;
-    Buf<TAcc, bool> isDup_buf;
-    Buf<TAcc, FPX> score_buf;
-    Buf<TAcc, FPX> eta_buf;
-    Buf<TAcc, FPX> phi_buf;
-    Buf<TAcc, uint8_t> logicalLayers_buf;
-    Buf<TAcc, unsigned int> hitIndices_buf;
-    Buf<TAcc, uint16_t> lowerModuleIndices_buf;
-    Buf<TAcc, FPX> pixelRadius_buf;
-    Buf<TAcc, FPX> quintupletRadius_buf;
-    Buf<TAcc, FPX> centerX_buf;
-    Buf<TAcc, FPX> centerY_buf;
-    Buf<TAcc, float> rzChiSquared_buf;
-    Buf<TAcc, float> rPhiChiSquared_buf;
-    Buf<TAcc, float> rPhiChiSquaredInwards_buf;
+    Buf<TDev, unsigned int> pixelIndices_buf;
+    Buf<TDev, unsigned int> T5Indices_buf;
+    Buf<TDev, int> nPixelQuintuplets_buf;
+    Buf<TDev, int> totOccupancyPixelQuintuplets_buf;
+    Buf<TDev, bool> isDup_buf;
+    Buf<TDev, FPX> score_buf;
+    Buf<TDev, FPX> eta_buf;
+    Buf<TDev, FPX> phi_buf;
+    Buf<TDev, uint8_t> logicalLayers_buf;
+    Buf<TDev, unsigned int> hitIndices_buf;
+    Buf<TDev, uint16_t> lowerModuleIndices_buf;
+    Buf<TDev, FPX> pixelRadius_buf;
+    Buf<TDev, FPX> quintupletRadius_buf;
+    Buf<TDev, FPX> centerX_buf;
+    Buf<TDev, FPX> centerY_buf;
+    Buf<TDev, float> rzChiSquared_buf;
+    Buf<TDev, float> rPhiChiSquared_buf;
+    Buf<TDev, float> rPhiChiSquaredInwards_buf;
 
     template <typename TQueue, typename TDevAcc>
     pixelQuintupletsBuffer(unsigned int maxPixelQuintuplets, TDevAcc const& devAccIn, TQueue& queue)
diff --git a/SDL/Quintuplet.h b/SDL/Quintuplet.h
index c86df968..d3f24f71 100644
--- a/SDL/Quintuplet.h
+++ b/SDL/Quintuplet.h
@@ -69,35 +69,35 @@ namespace SDL {
     }
   };
 
-  template <typename TAcc>
+  template <typename TDev>
   struct quintupletsBuffer : quintuplets {
-    Buf<TAcc, unsigned int> tripletIndices_buf;
-    Buf<TAcc, uint16_t> lowerModuleIndices_buf;
-    Buf<TAcc, int> nQuintuplets_buf;
-    Buf<TAcc, int> totOccupancyQuintuplets_buf;
-    Buf<TAcc, unsigned int> nMemoryLocations_buf;
-
-    Buf<TAcc, FPX> innerRadius_buf;
-    Buf<TAcc, FPX> bridgeRadius_buf;
-    Buf<TAcc, FPX> outerRadius_buf;
-    Buf<TAcc, FPX> pt_buf;
-    Buf<TAcc, FPX> eta_buf;
-    Buf<TAcc, FPX> phi_buf;
-    Buf<TAcc, FPX> score_rphisum_buf;
-    Buf<TAcc, uint8_t> layer_buf;
-    Buf<TAcc, bool> isDup_buf;
-    Buf<TAcc, bool> TightCutFlag_buf;
-    Buf<TAcc, bool> partOfPT5_buf;
-
-    Buf<TAcc, float> regressionRadius_buf;
-    Buf<TAcc, float> regressionG_buf;
-    Buf<TAcc, float> regressionF_buf;
-
-    Buf<TAcc, uint8_t> logicalLayers_buf;
-    Buf<TAcc, unsigned int> hitIndices_buf;
-    Buf<TAcc, float> rzChiSquared_buf;
-    Buf<TAcc, float> chiSquared_buf;
-    Buf<TAcc, float> nonAnchorChiSquared_buf;
+    Buf<TDev, unsigned int> tripletIndices_buf;
+    Buf<TDev, uint16_t> lowerModuleIndices_buf;
+    Buf<TDev, int> nQuintuplets_buf;
+    Buf<TDev, int> totOccupancyQuintuplets_buf;
+    Buf<TDev, unsigned int> nMemoryLocations_buf;
+
+    Buf<TDev, FPX> innerRadius_buf;
+    Buf<TDev, FPX> bridgeRadius_buf;
+    Buf<TDev, FPX> outerRadius_buf;
+    Buf<TDev, FPX> pt_buf;
+    Buf<TDev, FPX> eta_buf;
+    Buf<TDev, FPX> phi_buf;
+    Buf<TDev, FPX> score_rphisum_buf;
+    Buf<TDev, uint8_t> layer_buf;
+    Buf<TDev, bool> isDup_buf;
+    Buf<TDev, bool> TightCutFlag_buf;
+    Buf<TDev, bool> partOfPT5_buf;
+
+    Buf<TDev, float> regressionRadius_buf;
+    Buf<TDev, float> regressionG_buf;
+    Buf<TDev, float> regressionF_buf;
+
+    Buf<TDev, uint8_t> logicalLayers_buf;
+    Buf<TDev, unsigned int> hitIndices_buf;
+    Buf<TDev, float> rzChiSquared_buf;
+    Buf<TDev, float> chiSquared_buf;
+    Buf<TDev, float> nonAnchorChiSquared_buf;
 
     template <typename TQueue, typename TDevAcc>
     quintupletsBuffer(unsigned int nTotalQuintuplets, unsigned int nLowerModules, TDevAcc const& devAccIn, TQueue& queue)
diff --git a/SDL/Segment.h b/SDL/Segment.h
index 5bdcdb6d..c9143e1f 100644
--- a/SDL/Segment.h
+++ b/SDL/Segment.h
@@ -83,42 +83,42 @@ namespace SDL {
     }
   };
 
-  template <typename TAcc>
+  template <typename TDev>
   struct segmentsBuffer : segments {
-    Buf<TAcc, FPX> dPhis_buf;
-    Buf<TAcc, FPX> dPhiMins_buf;
-    Buf<TAcc, FPX> dPhiMaxs_buf;
-    Buf<TAcc, FPX> dPhiChanges_buf;
-    Buf<TAcc, FPX> dPhiChangeMins_buf;
-    Buf<TAcc, FPX> dPhiChangeMaxs_buf;
-    Buf<TAcc, uint16_t> innerLowerModuleIndices_buf;
-    Buf<TAcc, uint16_t> outerLowerModuleIndices_buf;
-    Buf<TAcc, unsigned int> seedIdx_buf;
-    Buf<TAcc, unsigned int> mdIndices_buf;
-    Buf<TAcc, unsigned int> nMemoryLocations_buf;
-    Buf<TAcc, unsigned int> innerMiniDoubletAnchorHitIndices_buf;
-    Buf<TAcc, unsigned int> outerMiniDoubletAnchorHitIndices_buf;
-    Buf<TAcc, int> charge_buf;
-    Buf<TAcc, int> superbin_buf;
-    Buf<TAcc, int> nSegments_buf;
-    Buf<TAcc, int> totOccupancySegments_buf;
-    Buf<TAcc, uint4> pLSHitsIdxs_buf;
-    Buf<TAcc, int8_t> pixelType_buf;
-    Buf<TAcc, char> isQuad_buf;
-    Buf<TAcc, char> isDup_buf;
-    Buf<TAcc, bool> partOfPT5_buf;
-    Buf<TAcc, float> ptIn_buf;
-    Buf<TAcc, float> ptErr_buf;
-    Buf<TAcc, float> px_buf;
-    Buf<TAcc, float> py_buf;
-    Buf<TAcc, float> pz_buf;
-    Buf<TAcc, float> etaErr_buf;
-    Buf<TAcc, float> eta_buf;
-    Buf<TAcc, float> phi_buf;
-    Buf<TAcc, float> score_buf;
-    Buf<TAcc, float> circleCenterX_buf;
-    Buf<TAcc, float> circleCenterY_buf;
-    Buf<TAcc, float> circleRadius_buf;
+    Buf<TDev, FPX> dPhis_buf;
+    Buf<TDev, FPX> dPhiMins_buf;
+    Buf<TDev, FPX> dPhiMaxs_buf;
+    Buf<TDev, FPX> dPhiChanges_buf;
+    Buf<TDev, FPX> dPhiChangeMins_buf;
+    Buf<TDev, FPX> dPhiChangeMaxs_buf;
+    Buf<TDev, uint16_t> innerLowerModuleIndices_buf;
+    Buf<TDev, uint16_t> outerLowerModuleIndices_buf;
+    Buf<TDev, unsigned int> seedIdx_buf;
+    Buf<TDev, unsigned int> mdIndices_buf;
+    Buf<TDev, unsigned int> nMemoryLocations_buf;
+    Buf<TDev, unsigned int> innerMiniDoubletAnchorHitIndices_buf;
+    Buf<TDev, unsigned int> outerMiniDoubletAnchorHitIndices_buf;
+    Buf<TDev, int> charge_buf;
+    Buf<TDev, int> superbin_buf;
+    Buf<TDev, int> nSegments_buf;
+    Buf<TDev, int> totOccupancySegments_buf;
+    Buf<TDev, uint4> pLSHitsIdxs_buf;
+    Buf<TDev, int8_t> pixelType_buf;
+    Buf<TDev, char> isQuad_buf;
+    Buf<TDev, char> isDup_buf;
+    Buf<TDev, bool> partOfPT5_buf;
+    Buf<TDev, float> ptIn_buf;
+    Buf<TDev, float> ptErr_buf;
+    Buf<TDev, float> px_buf;
+    Buf<TDev, float> py_buf;
+    Buf<TDev, float> pz_buf;
+    Buf<TDev, float> etaErr_buf;
+    Buf<TDev, float> eta_buf;
+    Buf<TDev, float> phi_buf;
+    Buf<TDev, float> score_buf;
+    Buf<TDev, float> circleCenterX_buf;
+    Buf<TDev, float> circleCenterY_buf;
+    Buf<TDev, float> circleRadius_buf;
 
     template <typename TQueue, typename TDevAcc>
     segmentsBuffer(unsigned int nMemoryLocationsIn,
diff --git a/SDL/TrackCandidate.h b/SDL/TrackCandidate.h
index 1a9dacc9..ced7c1fb 100644
--- a/SDL/TrackCandidate.h
+++ b/SDL/TrackCandidate.h
@@ -52,25 +52,25 @@ namespace SDL {
     }
   };
 
-  template <typename TAcc>
+  template <typename TDev>
   struct trackCandidatesBuffer : trackCandidates {
-    Buf<TAcc, short> trackCandidateType_buf;
-    Buf<TAcc, unsigned int> directObjectIndices_buf;
-    Buf<TAcc, unsigned int> objectIndices_buf;
-    Buf<TAcc, int> nTrackCandidates_buf;
-    Buf<TAcc, int> nTrackCandidatespT3_buf;
-    Buf<TAcc, int> nTrackCandidatespT5_buf;
-    Buf<TAcc, int> nTrackCandidatespLS_buf;
-    Buf<TAcc, int> nTrackCandidatesT5_buf;
-
-    Buf<TAcc, uint8_t> logicalLayers_buf;
-    Buf<TAcc, unsigned int> hitIndices_buf;
-    Buf<TAcc, int> pixelSeedIndex_buf;
-    Buf<TAcc, uint16_t> lowerModuleIndices_buf;
-
-    Buf<TAcc, FPX> centerX_buf;
-    Buf<TAcc, FPX> centerY_buf;
-    Buf<TAcc, FPX> radius_buf;
+    Buf<TDev, short> trackCandidateType_buf;
+    Buf<TDev, unsigned int> directObjectIndices_buf;
+    Buf<TDev, unsigned int> objectIndices_buf;
+    Buf<TDev, int> nTrackCandidates_buf;
+    Buf<TDev, int> nTrackCandidatespT3_buf;
+    Buf<TDev, int> nTrackCandidatespT5_buf;
+    Buf<TDev, int> nTrackCandidatespLS_buf;
+    Buf<TDev, int> nTrackCandidatesT5_buf;
+
+    Buf<TDev, uint8_t> logicalLayers_buf;
+    Buf<TDev, unsigned int> hitIndices_buf;
+    Buf<TDev, int> pixelSeedIndex_buf;
+    Buf<TDev, uint16_t> lowerModuleIndices_buf;
+
+    Buf<TDev, FPX> centerX_buf;
+    Buf<TDev, FPX> centerY_buf;
+    Buf<TDev, FPX> radius_buf;
 
     template <typename TQueue, typename TDevAcc>
     trackCandidatesBuffer(unsigned int maxTrackCandidates, TDevAcc const& devAccIn, TQueue& queue)
diff --git a/SDL/Triplet.h b/SDL/Triplet.h
index 847f2d82..c9e9909b 100644
--- a/SDL/Triplet.h
+++ b/SDL/Triplet.h
@@ -77,38 +77,38 @@ namespace SDL {
     }
   };
 
-  template <typename TAcc>
+  template <typename TDev>
   struct tripletsBuffer : triplets {
-    Buf<TAcc, unsigned int> segmentIndices_buf;
-    Buf<TAcc, uint16_t> lowerModuleIndices_buf;
-    Buf<TAcc, int> nTriplets_buf;
-    Buf<TAcc, int> totOccupancyTriplets_buf;
-    Buf<TAcc, unsigned int> nMemoryLocations_buf;
-    Buf<TAcc, uint8_t> logicalLayers_buf;
-    Buf<TAcc, unsigned int> hitIndices_buf;
-    Buf<TAcc, FPX> betaIn_buf;
-    Buf<TAcc, FPX> betaOut_buf;
-    Buf<TAcc, FPX> pt_beta_buf;
-    Buf<TAcc, bool> partOfPT5_buf;
-    Buf<TAcc, bool> partOfT5_buf;
-    Buf<TAcc, bool> partOfPT3_buf;
+    Buf<TDev, unsigned int> segmentIndices_buf;
+    Buf<TDev, uint16_t> lowerModuleIndices_buf;
+    Buf<TDev, int> nTriplets_buf;
+    Buf<TDev, int> totOccupancyTriplets_buf;
+    Buf<TDev, unsigned int> nMemoryLocations_buf;
+    Buf<TDev, uint8_t> logicalLayers_buf;
+    Buf<TDev, unsigned int> hitIndices_buf;
+    Buf<TDev, FPX> betaIn_buf;
+    Buf<TDev, FPX> betaOut_buf;
+    Buf<TDev, FPX> pt_beta_buf;
+    Buf<TDev, bool> partOfPT5_buf;
+    Buf<TDev, bool> partOfT5_buf;
+    Buf<TDev, bool> partOfPT3_buf;
 
 #ifdef CUT_VALUE_DEBUG
-    Buf<TAcc, float> zOut_buf;
-    Buf<TAcc, float> rtOut_buf;
-    Buf<TAcc, float> deltaPhiPos_buf;
-    Buf<TAcc, float> deltaPhi_buf;
-    Buf<TAcc, float> zLo_buf;
-    Buf<TAcc, float> zHi_buf;
-    Buf<TAcc, float> zLoPointed_buf;
-    Buf<TAcc, float> zHiPointed_buf;
-    Buf<TAcc, float> sdlCut_buf;
-    Buf<TAcc, float> betaInCut_buf;
-    Buf<TAcc, float> betaOutCut_buf;
-    Buf<TAcc, float> deltaBetaCut_buf;
-    Buf<TAcc, float> rtLo_buf;
-    Buf<TAcc, float> rtHi_buf;
-    Buf<TAcc, float> kZ_buf;
+    Buf<TDev, float> zOut_buf;
+    Buf<TDev, float> rtOut_buf;
+    Buf<TDev, float> deltaPhiPos_buf;
+    Buf<TDev, float> deltaPhi_buf;
+    Buf<TDev, float> zLo_buf;
+    Buf<TDev, float> zHi_buf;
+    Buf<TDev, float> zLoPointed_buf;
+    Buf<TDev, float> zHiPointed_buf;
+    Buf<TDev, float> sdlCut_buf;
+    Buf<TDev, float> betaInCut_buf;
+    Buf<TDev, float> betaOutCut_buf;
+    Buf<TDev, float> deltaBetaCut_buf;
+    Buf<TDev, float> rtLo_buf;
+    Buf<TDev, float> rtHi_buf;
+    Buf<TDev, float> kZ_buf;
 #endif
 
     template <typename TQueue, typename TDevAcc>