diff --git a/CHANGELOG.md b/CHANGELOG.md
index 837be63..30ecfd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- manipulation AssociateValidateAndChangeIdentificationOfContextState for contexts
+- manipulation AssociateValidateAndChangeIdentificationOfPatientOrLocationContextState for contexts
 - manipulation ProvideInformationAboutLastCalibration for devices
 - manipulation ProvideInformationAboutNextCalibration for devices
 - manipulation SetSystemContextActivationStateAndContextAssociation for combined settings
diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index 0ce735b..0130be9 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -113,10 +113,10 @@ service ContextService {
   - its pm:Identification changes.
   The pm:Identification of the created resp. adapted context state must differ structurally from
   the pm:Identification of the previously associated context state of the same @DescriptorHandle.
-  Returns the handle of the created or adapted context state and the mdib version
+  Returns the handle of the created or adapted context state and a mdib version
   that contains the version of the previously associated context state whose pm:Identification
   the changed pm:Identification must structurally differ from.
-  The mdib version must be the one that represents the mdib of the device before the changes of the
+  The mdib version must represent the mdib of the device before the changes of the
   manipulation are applied to the mdib.
   The manipulated 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.