diff --git a/ecal/core/src/service/ecal_service_client_impl.cpp b/ecal/core/src/service/ecal_service_client_impl.cpp
index b33076f588..8b650de670 100644
--- a/ecal/core/src/service/ecal_service_client_impl.cpp
+++ b/ecal/core/src/service/ecal_service_client_impl.cpp
@@ -372,9 +372,9 @@ namespace eCAL
   {
     Registration::SServiceMethodId service_id;
 
-    service_id.service_id.entity_id = m_client_id;
-    service_id.service_id.entity_id = Process::GetProcessID();
-    service_id.service_id.host_name = Process::GetHostName();
+    service_id.service_id.entity_id  = m_client_id;
+    service_id.service_id.process_id = Process::GetProcessID();
+    service_id.service_id.host_name  = Process::GetHostName();
 
     service_id.service_name = m_service_name;
     service_id.method_name  = "";
diff --git a/ecal/core/src/service/ecal_service_server_impl.cpp b/ecal/core/src/service/ecal_service_server_impl.cpp
index c09714b238..a71696ead0 100644
--- a/ecal/core/src/service/ecal_service_server_impl.cpp
+++ b/ecal/core/src/service/ecal_service_server_impl.cpp
@@ -156,9 +156,9 @@ namespace eCAL
   {
     Registration::SServiceMethodId service_id;
 
-    service_id.service_id.entity_id = m_service_id;
-    service_id.service_id.entity_id = Process::GetProcessID();
-    service_id.service_id.host_name = Process::GetHostName();
+    service_id.service_id.entity_id  = m_service_id;
+    service_id.service_id.process_id = Process::GetProcessID();
+    service_id.service_id.host_name  = Process::GetHostName();
 
     service_id.service_name = m_service_name;
     service_id.method_name  = "";