diff --git a/source/RobotAPI/libraries/armem/client/util/MemoryListener.cpp b/source/RobotAPI/libraries/armem/client/util/MemoryListener.cpp
index 318d1294eea4f7d5fd0926c4b9d0475b831e60b6..996129960142e8e159e1da4f52552674b9c45a61 100644
--- a/source/RobotAPI/libraries/armem/client/util/MemoryListener.cpp
+++ b/source/RobotAPI/libraries/armem/client/util/MemoryListener.cpp
@@ -64,7 +64,7 @@ namespace armarx::armem::client::util
     }
 
 
-    void MemoryListener::subscribe(const MemoryID& subscriptionID, callback_updated_only callback)
+    void MemoryListener::subscribe(const MemoryID& subscriptionID, CallbackUpdatedOnly callback)
     {
         subscribe(subscriptionID, [callback](const MemoryID&, const std::vector<MemoryID>& updatedSnapshotIDs)
         {
diff --git a/source/RobotAPI/libraries/armem/client/util/MemoryListener.h b/source/RobotAPI/libraries/armem/client/util/MemoryListener.h
index e412bfefccf2b7e5a0a80a54bc86c6bd84a962c7..7591f1f5db41decdb5c49d14ea00b8380072f08b 100644
--- a/source/RobotAPI/libraries/armem/client/util/MemoryListener.h
+++ b/source/RobotAPI/libraries/armem/client/util/MemoryListener.h
@@ -21,13 +21,13 @@ namespace armarx::armem::client::util
     class MemoryListener
     {
 
-        using callback = std::function<void(const MemoryID& subscriptionID, const std::vector<MemoryID>& updatedSnapshotIDs)>;
-        using callback_updated_only = std::function<void(const std::vector<MemoryID>& updatedSnapshotIDs)>;
+        using Callback = std::function<void(const MemoryID& subscriptionID, const std::vector<MemoryID>& updatedSnapshotIDs)>;
+        using CallbackUpdatedOnly = std::function<void(const std::vector<MemoryID>& updatedSnapshotIDs)>;
 
         template <class CalleeT>
-        using member_callback = void(CalleeT::*)(const MemoryID& subscriptionID, const std::vector<MemoryID>& updatedSnapshotIDs);
+        using MemberCallback = void(CalleeT::*)(const MemoryID& subscriptionID, const std::vector<MemoryID>& updatedSnapshotIDs);
         template <class CalleeT>
-        using member_callback_updated_only = void(CalleeT::*)(const std::vector<MemoryID>& updatedSnapshotIDs);
+        using MemberCallbackUpdatedOnly = void(CalleeT::*)(const std::vector<MemoryID>& updatedSnapshotIDs);
 
 
     public:
@@ -35,8 +35,8 @@ namespace armarx::armem::client::util
         MemoryListener();
 
 
-        void subscribe(const MemoryID& subscriptionID, callback callback);
-        void subscribe(const MemoryID& subscriptionID, callback_updated_only callback);
+        void subscribe(const MemoryID& subscriptionID, Callback Callback);
+        void subscribe(const MemoryID& subscriptionID, CallbackUpdatedOnly Callback);
 
         /**
          * Subscribe with a class member function:
@@ -45,7 +45,7 @@ namespace armarx::armem::client::util
          * @endcode
          */
         template <class CalleeT>
-        void subscribe(const MemoryID& subscriptionID, CalleeT* callee, member_callback<CalleeT> callback)
+        void subscribe(const MemoryID& subscriptionID, CalleeT* callee, MemberCallback<CalleeT> callback)
         {
             auto cb = [callee, callback](const MemoryID & subscriptionID, const std::vector<MemoryID>& updatedSnapshotIDs)
             {
@@ -54,7 +54,7 @@ namespace armarx::armem::client::util
             subscribe(subscriptionID, cb);
         }
         template <class CalleeT>
-        void subscribe(const MemoryID& subscriptionID, CalleeT* callee, member_callback_updated_only<CalleeT> callback)
+        void subscribe(const MemoryID& subscriptionID, CalleeT* callee, MemberCallbackUpdatedOnly<CalleeT> callback)
         {
             auto cb = [callee, callback](const MemoryID&, const std::vector<MemoryID>& updatedSnapshotIDs)
             {
@@ -70,7 +70,7 @@ namespace armarx::armem::client::util
 
     protected:
 
-        std::unordered_map<MemoryID, std::vector<callback>> callbacks;
+        std::unordered_map<MemoryID, std::vector<Callback>> callbacks;
 
     };