diff --git a/fsfw b/fsfw
index 2646707d..a1567de9 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 2646707d3fa1b568a6c99e8e0bd32585d729d162
+Subproject commit a1567de9e8d84a044b4a33ccdaffd15f0f4f54f1
diff --git a/mission/tmtc/CMakeLists.txt b/mission/tmtc/CMakeLists.txt
index cc84aabb..c4c93ab6 100644
--- a/mission/tmtc/CMakeLists.txt
+++ b/mission/tmtc/CMakeLists.txt
@@ -6,5 +6,5 @@ target_sources(
           TmFunnelBase.cpp
           CfdpTmFunnel.cpp
           Service15TmStorage.cpp
-          TmStore.cpp
+          PersistentTmStore.cpp
           PusTmFunnel.cpp)
diff --git a/mission/tmtc/TmStore.cpp b/mission/tmtc/PersistentTmStore.cpp
similarity index 99%
rename from mission/tmtc/TmStore.cpp
rename to mission/tmtc/PersistentTmStore.cpp
index 11fe0443..d1bf054e 100644
--- a/mission/tmtc/TmStore.cpp
+++ b/mission/tmtc/PersistentTmStore.cpp
@@ -1,4 +1,4 @@
-#include "TmStore.h"
+#include "PersistentTmStore.h"
 
 #include <mission/memory/SdCardMountedIF.h>
 
diff --git a/mission/tmtc/TmStore.h b/mission/tmtc/PersistentTmStore.h
similarity index 100%
rename from mission/tmtc/TmStore.h
rename to mission/tmtc/PersistentTmStore.h
diff --git a/mission/tmtc/PusTmFunnel.h b/mission/tmtc/PusTmFunnel.h
index 464db37c..e47f5e96 100644
--- a/mission/tmtc/PusTmFunnel.h
+++ b/mission/tmtc/PusTmFunnel.h
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include "TmStore.h"
+#include "PersistentTmStore.h"
 #include "fsfw/timemanager/TimeReaderIF.h"
 
 /**