diff --git a/Service/DCEntityMapper/AiPromptbausteinFolderDC_AiPromptbausteinFolder.cs b/Service/DCEntityMapper/AiPromptbausteinFolderDC_AiPromptbausteinFolder.cs
index df97709ae..89b4c704d 100644
--- a/Service/DCEntityMapper/AiPromptbausteinFolderDC_AiPromptbausteinFolder.cs
+++ b/Service/DCEntityMapper/AiPromptbausteinFolderDC_AiPromptbausteinFolder.cs
@@ -33,7 +33,7 @@ namespace BeWo.Service.DCEntityMapper
 
 		public override AiPromptbausteinFolder MergeWithEntity(AiPromptbausteinFolderDC pDataContract, AiPromptbausteinFolder pEntity)
 		{
-			base.MergeWithDC(pEntity, pDataContract);
+			base.MergeWithEntity(pDataContract, pEntity);
 
 			pEntity.Title = pDataContract.Title;
 			pEntity.Description = pDataContract.Description;
diff --git a/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs b/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs
index 205469c5e..4f2c9f177 100644
--- a/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs
+++ b/Service/DCEntityMapper/AiPromptbausteinPromptDC_AiPromptbausteinPrompt.cs
@@ -42,7 +42,7 @@ namespace BeWo.Service.DCEntityMapper
 
 		public override AiPromptbausteinPrompt MergeWithEntity(AiPromptbausteinPromptDC pDataContract, AiPromptbausteinPrompt pEntity)
 		{
-			base.MergeWithDC(pEntity, pDataContract);
+			base.MergeWithEntity(pDataContract, pEntity);
 
 			pEntity.Title = pDataContract.Title;
 			pEntity.Description = pDataContract.Description;
diff --git a/Service/DCEntityMapper/AiUserSettingDC_AiUserSetting.cs b/Service/DCEntityMapper/AiUserSettingDC_AiUserSetting.cs
index 3b84600a1..28f776230 100644
--- a/Service/DCEntityMapper/AiUserSettingDC_AiUserSetting.cs
+++ b/Service/DCEntityMapper/AiUserSettingDC_AiUserSetting.cs
@@ -24,7 +24,7 @@ namespace BeWo.Service.DCEntityMapper
 
 		public override AiUserSetting MergeWithEntity(AiUserSettingDC pDataContract, AiUserSetting pEntity)
 		{
-			base.MergeWithDC(pEntity, pDataContract);
+			base.MergeWithEntity(pDataContract, pEntity);
 
 			pEntity.ApplicationUser = UserRightHelper.GetLoggedInUser();
 			pEntity.AutoStartRecording = pDataContract.AutoStartRecording;
diff --git a/Service/DCEntityMapper/BeWoDataContract_BeWoEntityBase.cs b/Service/DCEntityMapper/BeWoDataContract_BeWoEntityBase.cs
index dcb5bb5a0..4a2f26f3e 100644
--- a/Service/DCEntityMapper/BeWoDataContract_BeWoEntityBase.cs
+++ b/Service/DCEntityMapper/BeWoDataContract_BeWoEntityBase.cs
@@ -26,8 +26,8 @@ namespace BeWo.Service.DCEntityMapper
 		{
 			ConcurrencyCheck(pDataContract.Version, pEntity);
 
-			pEntity.Oid = pDataContract.Oid;
-			pEntity.Version = pDataContract.Version;
+			//pEntity.Oid = pDataContract.Oid;
+			//pEntity.Version = pDataContract.Version;
 			pEntity.Notice = pDataContract.Notice;
 
 			return pEntity;
diff --git a/Service/DCEntityMapper/StoredFileDC_StoredFile.cs b/Service/DCEntityMapper/StoredFileDC_StoredFile.cs
index 563244828..c9170d4b7 100644
--- a/Service/DCEntityMapper/StoredFileDC_StoredFile.cs
+++ b/Service/DCEntityMapper/StoredFileDC_StoredFile.cs
@@ -29,7 +29,7 @@ namespace BeWo.Service.DCEntityMapper
 
 		public override StoredFile MergeWithEntity(StoredFileDC pDataContract, StoredFile pEntity)
 		{
-			base.MergeWithDC(pEntity, pDataContract);
+			base.MergeWithEntity(pDataContract, pEntity);
 
 			pEntity.FileName = pDataContract.FileName;
 			pEntity.FilePath = pDataContract.FilePath;