diff --git a/source/RobotAPI/components/CMakeLists.txt b/source/RobotAPI/components/CMakeLists.txt
index 43e38a886433e9ec8cc35bf23e02cb7a19a17c1c..e6d7b93d5fd2260efd3958e2f1bfa9c8834b647f 100644
--- a/source/RobotAPI/components/CMakeLists.txt
+++ b/source/RobotAPI/components/CMakeLists.txt
@@ -33,4 +33,4 @@ add_subdirectory(StatechartExecutorExample)
 add_subdirectory(TopicTimingTest)
 add_subdirectory(ViewSelection)
 
-add_subdirectory(InteractiveMemoryEditor)
+add_subdirectory(ObjectMemoryEditor)
diff --git a/source/RobotAPI/components/InteractiveMemoryEditor/CMakeLists.txt b/source/RobotAPI/components/ObjectMemoryEditor/CMakeLists.txt
similarity index 77%
rename from source/RobotAPI/components/InteractiveMemoryEditor/CMakeLists.txt
rename to source/RobotAPI/components/ObjectMemoryEditor/CMakeLists.txt
index 1d1b354df4653179fe420dfc20cae43f44d3bcf9..3c9023550e1d93a2d4bd1b8a0a61b8a5fdc7bd5d 100644
--- a/source/RobotAPI/components/InteractiveMemoryEditor/CMakeLists.txt
+++ b/source/RobotAPI/components/ObjectMemoryEditor/CMakeLists.txt
@@ -1,4 +1,4 @@
-armarx_component_set_name("InteractiveMemoryEditor")
+armarx_component_set_name("ObjectMemoryEditor")
 
 
 set(COMPONENT_LIBS
@@ -11,12 +11,12 @@ set(COMPONENT_LIBS
 )
 
 set(SOURCES
-    InteractiveMemoryEditor.cpp
+        ObjectMemoryEditor.cpp
     InteractionObserver.cpp
     Editor.cpp
 )
 set(HEADERS
-    InteractiveMemoryEditor.h
+    ObjectMemoryEditor.h
     InteractionObserver.h
     Editor.h
 )
diff --git a/source/RobotAPI/components/InteractiveMemoryEditor/Editor.cpp b/source/RobotAPI/components/ObjectMemoryEditor/Editor.cpp
similarity index 99%
rename from source/RobotAPI/components/InteractiveMemoryEditor/Editor.cpp
rename to source/RobotAPI/components/ObjectMemoryEditor/Editor.cpp
index 8b085c75d92d20ce45ca7ffd9f83e2305271ee3c..74bdd96793868911322b960af2973a0576809e93 100644
--- a/source/RobotAPI/components/InteractiveMemoryEditor/Editor.cpp
+++ b/source/RobotAPI/components/ObjectMemoryEditor/Editor.cpp
@@ -1,6 +1,5 @@
 #include "Editor.h"
 
-#include <RobotAPI/components/InteractiveMemoryEditor/InteractionObserver.h>
 #include <RobotAPI/libraries/ArmarXObjects/ProvidedObjectPose.h>
 #include <RobotAPI/libraries/ArmarXObjects/ice_conversions.h>
 
diff --git a/source/RobotAPI/components/InteractiveMemoryEditor/Editor.h b/source/RobotAPI/components/ObjectMemoryEditor/Editor.h
similarity index 98%
rename from source/RobotAPI/components/InteractiveMemoryEditor/Editor.h
rename to source/RobotAPI/components/ObjectMemoryEditor/Editor.h
index 4f5a1f1b92de8f9ec9b55acf4bf5e2d10548f6b7..f1a6ebc2a168de7938e552b44f1d2144a915dd35 100644
--- a/source/RobotAPI/components/InteractiveMemoryEditor/Editor.h
+++ b/source/RobotAPI/components/ObjectMemoryEditor/Editor.h
@@ -6,8 +6,7 @@
 #include <RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseClientPlugin.h>
 #include <RobotAPI/libraries/ArmarXObjects/plugins/ObjectPoseProviderPlugin.h>
 #include <RobotAPI/libraries/ArmarXObjects/ObjectFinder.h>
-
-#include "InteractionObserver.h"
+#include <RobotAPI/components/ObjectMemoryEditor/InteractionObserver.h>
 
 namespace armarx
 {
diff --git a/source/RobotAPI/components/InteractiveMemoryEditor/InteractionObserver.cpp b/source/RobotAPI/components/ObjectMemoryEditor/InteractionObserver.cpp
similarity index 100%
rename from source/RobotAPI/components/InteractiveMemoryEditor/InteractionObserver.cpp
rename to source/RobotAPI/components/ObjectMemoryEditor/InteractionObserver.cpp
diff --git a/source/RobotAPI/components/InteractiveMemoryEditor/InteractionObserver.h b/source/RobotAPI/components/ObjectMemoryEditor/InteractionObserver.h
similarity index 100%
rename from source/RobotAPI/components/InteractiveMemoryEditor/InteractionObserver.h
rename to source/RobotAPI/components/ObjectMemoryEditor/InteractionObserver.h
diff --git a/source/RobotAPI/components/InteractiveMemoryEditor/InteractiveMemoryEditor.cpp b/source/RobotAPI/components/ObjectMemoryEditor/ObjectMemoryEditor.cpp
similarity index 82%
rename from source/RobotAPI/components/InteractiveMemoryEditor/InteractiveMemoryEditor.cpp
rename to source/RobotAPI/components/ObjectMemoryEditor/ObjectMemoryEditor.cpp
index c6b602aec20ddc64a383ff9d3efb6244296d7622..e723f5e467d7d6588084ee5366753d64ca112a03 100644
--- a/source/RobotAPI/components/InteractiveMemoryEditor/InteractiveMemoryEditor.cpp
+++ b/source/RobotAPI/components/ObjectMemoryEditor/ObjectMemoryEditor.cpp
@@ -1,4 +1,4 @@
-#include "InteractiveMemoryEditor.h"
+#include "ObjectMemoryEditor.h"
 
 #include <ArmarXCore/core/time/Metronome.h>
 
@@ -9,7 +9,7 @@
 
 namespace armarx
 {
-    armarx::PropertyDefinitionsPtr InteractiveMemoryEditor::createPropertyDefinitions()
+    armarx::PropertyDefinitionsPtr ObjectMemoryEditor::createPropertyDefinitions()
     {
         armarx::PropertyDefinitionsPtr defs = new ComponentPropertyDefinitions(getConfigIdentifier());
 
@@ -22,12 +22,12 @@ namespace armarx
         return defs;
     }
 
-    std::string InteractiveMemoryEditor::getDefaultName() const
+    std::string ObjectMemoryEditor::getDefaultName() const
     {
         return "InteractiveMemoryEditor";
     }
 
-    void InteractiveMemoryEditor::onInitComponent()
+    void ObjectMemoryEditor::onInitComponent()
     {
         {
             providerInfo.objectType = objpose::ObjectType::KnownObject;
@@ -44,7 +44,7 @@ namespace armarx
         }
     }
 
-    void InteractiveMemoryEditor::onConnectComponent()
+    void ObjectMemoryEditor::onConnectComponent()
     {
         setDebugObserverBatchModeEnabled(true);
 
@@ -55,16 +55,16 @@ namespace armarx
         objectVizTask->start();
     }
 
-    void InteractiveMemoryEditor::onDisconnectComponent()
+    void ObjectMemoryEditor::onDisconnectComponent()
     {
     }
 
-    void InteractiveMemoryEditor::onExitComponent()
+    void ObjectMemoryEditor::onExitComponent()
     {
     }
 
 
-    void InteractiveMemoryEditor::run()
+    void ObjectMemoryEditor::run()
     {
         objpose::ObjectPoseClient client = getClient();
 
@@ -95,12 +95,12 @@ namespace armarx
         }
     }
 
-    objpose::ProviderInfo InteractiveMemoryEditor::getProviderInfo(const Ice::Current & /*unused*/)
+    objpose::ProviderInfo ObjectMemoryEditor::getProviderInfo(const Ice::Current & /*unused*/)
     {
         return providerInfo;
     }
 
-    objpose::provider::RequestObjectsOutput InteractiveMemoryEditor::requestObjects(
+    objpose::provider::RequestObjectsOutput ObjectMemoryEditor::requestObjects(
             const objpose::provider::RequestObjectsInput &input, const Ice::Current & /*unused*/)
     {
         objpose::provider::RequestObjectsOutput output;
diff --git a/source/RobotAPI/components/InteractiveMemoryEditor/InteractiveMemoryEditor.h b/source/RobotAPI/components/ObjectMemoryEditor/ObjectMemoryEditor.h
similarity index 97%
rename from source/RobotAPI/components/InteractiveMemoryEditor/InteractiveMemoryEditor.h
rename to source/RobotAPI/components/ObjectMemoryEditor/ObjectMemoryEditor.h
index 2a9890d75b3fc386c1500fc5397344bd08951fe7..1cc90b97906890dced6bf29bd25a3c26fa164f3f 100644
--- a/source/RobotAPI/components/InteractiveMemoryEditor/InteractiveMemoryEditor.h
+++ b/source/RobotAPI/components/ObjectMemoryEditor/ObjectMemoryEditor.h
@@ -13,7 +13,7 @@
 
 namespace armarx
 {
-    class InteractiveMemoryEditor :
+    class ObjectMemoryEditor :
             virtual public armarx::Component,
             virtual public armarx::DebugObserverComponentPluginUser,
             virtual public armarx::ArVizComponentPluginUser,