diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d1e9e4..715f94d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,8 +26,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - manipulation GetMdsUiSupportedLanguages for devices
 - manipulation InsertContainmentTreeEntryForSequenceId for devices
 - manipulation to shut down and restart for devices
-- manipulation RepresentativeEnsembleMembershipIndication for contexts
-- manipulation EndMembershipInEnsemble for contexts
+- manipulation GetEnsembleIds for contexts
+- manipulation IndicateMembershipInEnsembleByEnsembleId for contexts
+- manipulation EndMembershipInEnsembleByEnsembleId for contexts
 
 ## [4.1.0] - 2024-02-22
 
diff --git a/src/t2iapi/context/context_requests.proto b/src/t2iapi/context/context_requests.proto
index ff622e2..cc490ad 100644
--- a/src/t2iapi/context/context_requests.proto
+++ b/src/t2iapi/context/context_requests.proto
@@ -85,9 +85,8 @@ message AssociatePatientRequest {
 Request to indicate or end membership in an SDC PARTICIPANT ENSEMBLE for a provided pm:EnsembleContextDescriptor and a
 provided ensemble-id.
  */
-message EnsembleIdentifierRequest {
+message EnsembleIdRequest {
     string descriptor_handle = 1;
-    string ensemble_identifier = 2;  // ensemble-id that refers to an SDC PARTICIPANT ENSEMBLE membership
-                                     // shall be indicated in
+    string ensemble_id = 2;  // ensemble-id that refers to an SDC PARTICIPANT ENSEMBLE membership shall be indicated in
 }
 
diff --git a/src/t2iapi/context/context_responses.proto b/src/t2iapi/context/context_responses.proto
index 5e60375..19658de 100644
--- a/src/t2iapi/context/context_responses.proto
+++ b/src/t2iapi/context/context_responses.proto
@@ -66,7 +66,7 @@ Response containing the @Handles of the newly created or adapted pm:EnsembleCont
 such that their @ContextAssociation is 'Assoc' in order to indicate membership in an SDC PARTICIPANT ENSEMBLE specified
 by the provided ensemble-id.
  */
-message IndicateMembershipInEnsembleByIdentifierResponse {
+message IndicateMembershipInEnsembleByEnsembleIdResponse {
     BasicResponse status = 1;
     repeated string context_state_handle = 2;  // @Handles of the pm:EnsembleContextStates, that were created or adapted
                                                // to indicate membership in an SDC PARTICIPANT ENSEMBLE
diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index bf73f85..1f0109f 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -201,8 +201,8 @@ service ContextService {
   The state shall be persistent until a next manipulation call. If the device is not able to maintain the static state,
   it shall return RESULT_NOT_SUPPORTED.
    */
-  rpc IndicateMembershipInEnsembleByIdentifier (EnsembleIdentifierRequest)
-      returns (IndicateMembershipInEnsembleByIdentifierResponse);
+  rpc IndicateMembershipInEnsembleByEnsembleId (EnsembleIdRequest)
+      returns (IndicateMembershipInEnsembleByEnsembleIdResponse);
 
   /*
   End membership in an SDC PARTICIPANT ENSEMBLE for a provided pm:EnsembleContextDescriptor and a provided ensemble-id.
@@ -211,7 +211,7 @@ service ContextService {
   The state shall be persistent until a next manipulation call. If the device is not able to maintain the static state,
   it shall return RESULT_NOT_SUPPORTED.
    */
-  rpc EndMembershipInEnsemble (EnsembleIdentifierRequest)
+  rpc EndMembershipInEnsembleByEnsembleId (EnsembleIdRequest)
       returns (BasicResponse);
 
   /*