diff --git a/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.cpp b/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.cpp
index 4188998cc88740a8b88c07c64e15263e7a64251c..4bda0c41cac33e5f6a709407b64a871c0ba92935 100644
--- a/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.cpp
+++ b/source/RobotAPI/libraries/armem_skills/server/segment/ComposedSkillLibrarySegment.cpp
@@ -43,7 +43,7 @@ namespace armarx::skills::segment
     ComposedSkillLibraryCoreSegment::addSkill(const skills::manager::arondto::FluxioSkill& skill)
     {
         // add skills
-        armem::MemoryID provId = id().withProviderSegmentName(skill.skillProviderId.id);
+        armem::MemoryID provId = id().withProviderSegmentName(skill.skillProviderId.hint);
 
         armem::Commit commit;
         armem::EntityUpdate& entityUpdate = commit.add();
@@ -52,7 +52,7 @@ namespace armarx::skills::segment
         entityUpdate.sentTime = armem::Time::Now();
         entityUpdate.arrivedTime = armem::Time::Now();
         entityUpdate.instancesData = {skill.toAron()};
-        entityUpdate.entityID = provId.withEntityName(skill.id);
+        entityUpdate.entityID = provId.withEntityName(skill.name);
 
         // Commit data to memory and notify
         iceMemory.commit(commit);