diff --git a/Tracking/Acts/ActsEvent/ActsEvent/TrackContainerHandle.h b/Tracking/Acts/ActsEvent/ActsEvent/TrackContainerHandle.h
index fe409c9480b9241b0a523f3cd34bbc8ed9e44573..2a0c19ea4a0e2ebf9a6c11b7d7046617c65d910d 100644
--- a/Tracking/Acts/ActsEvent/ActsEvent/TrackContainerHandle.h
+++ b/Tracking/Acts/ActsEvent/ActsEvent/TrackContainerHandle.h
@@ -73,8 +73,8 @@ MutableTrackContainerHandle<C>::MutableTrackContainerHandle(
 			  namePrefix + "TrackSummary"),
     m_surfacesKey(algorithm, propertyNamePrefix + "SurfacesKey",
 		  namePrefix + "Surfaces"),
-    m_trackBackendKey(algorithm, propertyNamePrefix + "TrackStorage",
-		      namePrefix + "TrackStorage") {}
+    m_trackBackendKey(algorithm, propertyNamePrefix + "TrackSummary",
+		      namePrefix + "TrackSummary") {}
   
 template <class C>
 StatusCode MutableTrackContainerHandle<C>::initialize() {
@@ -85,7 +85,7 @@ StatusCode MutableTrackContainerHandle<C>::initialize() {
   m_mtjKey = m_prefixName + "MultiTrajectory";
   m_xAODTrackSummaryKey = m_prefixName + "TrackSummary";
   m_surfacesKey = m_prefixName + "Surfaces";
-  m_trackBackendKey = m_prefixName + "TrackStorage";
+  m_trackBackendKey = m_prefixName + "TrackSummary";
 
   // And now we initialize the keys  
   ATH_CHECK(m_mtjKey.initialize());
@@ -111,17 +111,17 @@ MutableTrackContainerHandle<C>::moveToConst(ActsTrk::MutableTrackContainer&& tc,
         "ConstMultiTrajectory");
   }
 
-  auto xAODTrackStorageHandle = SG::makeHandle(m_xAODTrackSummaryKey, context);
+  auto xAODTrackSummaryHandle = SG::makeHandle(m_xAODTrackSummaryKey, context);
   auto interfaceTrackSummaryContainer =
       ActsTrk::makeInterfaceContainer<xAOD::TrackSummaryContainer>(
           tc.container().m_mutableTrackBackendAux.get());
-  if (xAODTrackStorageHandle
+  if (xAODTrackSummaryHandle
           .record(std::move(interfaceTrackSummaryContainer),
                   std::move(tc.container().m_mutableTrackBackendAux))
           .isFailure()) {
     throw std::runtime_error(
         "MutableTrackContainerHandle::moveToConst, can't record "
-        "xAODTrackStorage");
+        "xAODTrackSummary");
   }
 
   auto surfacesHandle = SG::makeHandle(m_surfacesKey, context);
@@ -133,18 +133,18 @@ MutableTrackContainerHandle<C>::moveToConst(ActsTrk::MutableTrackContainer&& tc,
         "MutableTrackContainerHandle::moveToConst, can't record "
         "xAODTrackSurfaces");
   }
-  auto constTrackStorage = std::make_unique<ActsTrk::TrackSummaryContainer>(
+  auto constTrackSummary = std::make_unique<ActsTrk::TrackSummaryContainer>(
       DataLink<xAOD::TrackSummaryContainer>(m_xAODTrackSummaryKey.key(),
                                             context));
-  constTrackStorage->restoreDecorations();
-  constTrackStorage->fillFrom(tc.container());
+  constTrackSummary->restoreDecorations();
+  constTrackSummary->fillFrom(tc.container());
 
-  auto constTrackStorageHandle = SG::makeHandle(m_trackBackendKey, context);
-  if (constTrackStorageHandle.record(std::move(constTrackStorage))
+  auto constTrackSummaryHandle = SG::makeHandle(m_trackBackendKey, context);
+  if (constTrackSummaryHandle.record(std::move(constTrackSummary))
           .isFailure()) {
     throw std::runtime_error(
         "MutableTrackContainerHandle::moveToConst, can't record "
-        "xAODTrackStorage");
+        "xAODTrackSummary");
   }
   auto constTrack = std::make_unique<ActsTrk::TrackContainer>(
       DataLink<ActsTrk::TrackSummaryContainer>(m_trackBackendKey.key(),
diff --git a/Tracking/Acts/ActsEvent/ActsEvent/TrackSummaryContainer.h b/Tracking/Acts/ActsEvent/ActsEvent/TrackSummaryContainer.h
index 91d8eb0a3014d9513ee3a4deb7b2acfcafef46ce..d3a170d616bfa3b4499c45490df046db728a72a8 100644
--- a/Tracking/Acts/ActsEvent/ActsEvent/TrackSummaryContainer.h
+++ b/Tracking/Acts/ActsEvent/ActsEvent/TrackSummaryContainer.h
@@ -14,10 +14,6 @@
 #include "xAODTracking/TrackSurfaceAuxContainer.h"
 #include "xAODTracking/TrackSurfaceContainer.h"
 #include "ActsEvent/SurfaceEncoding.h"
-// #include "xAODTracking/TrackSummaryContainer.h"
-// #include "xAODTracking/TrackStorageAuxContainer.h"
-
-
 
 namespace ActsTrk {
 class MutableTrackSummaryContainer;
diff --git a/Tracking/Acts/ActsEvent/Root/TrackSummaryContainer.cxx b/Tracking/Acts/ActsEvent/Root/TrackSummaryContainer.cxx
index b686fe0a5932d5a103828d6c2b3eae46b671adc1..ad975450d9a8f98e30e44e0a4e2ae9260d58d9d6 100644
--- a/Tracking/Acts/ActsEvent/Root/TrackSummaryContainer.cxx
+++ b/Tracking/Acts/ActsEvent/Root/TrackSummaryContainer.cxx
@@ -5,7 +5,7 @@
 #include "xAODTracking/TrackSummary.h"
 #include "ActsEvent/ParticleHypothesisEncoding.h"
 
-// this is list of xAOD container varaible names that are "hardcoded" in TrackStorage_v1
+// this is list of xAOD container varaible names that are "hardcoded" in TrackSummary_v1
 // their compatibility is maintain ed by the unit tests: AllStaticxAODVaraiblesAreKnown
 const std::set<std::string> ActsTrk::TrackSummaryContainer::staticVariables = {
     "params", "covParams", "nMeasurements", "nHoles",   "chi2f",