diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 5c561ab72..a4454136b 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2598,7 +2598,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
     // Check if the problem will be fixed by Apple or if this fix should be kept in the future
     // Ticket #5639
     if ([[context request] isMacOSXVenturaCalendarApp]) {
-      description = [description stringByReplacingOccurrencesOfString:@"/Personal" withString:@"/personal"];
+      description = [description stringByReplacingOccurrencesOfString:@"/PERSONAL" withString:@"/personal"];
     }
     
     [self setFolderPropertyValue: description
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index b7273283c..20f7a411c 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -140,7 +140,7 @@ static NSString *inboxFolderName = @"INBOX";
   // Check if the problem will be fixed by Apple or if this fix should be kept in the future
   // Ticket #5639
   if ([[context request] isMacOSXVenturaCalendarApp]) {
-    namespace = [namespaceDict objectForKey: @"Personal"];
+    namespace = [namespaceDict objectForKey: @"PERSONAL"];
   }
   if (namespace)
     [self _appendNamespace: namespace toFolders: folders];
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index cad9ac1b5..5cce9a53c 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -405,7 +405,7 @@ static NSArray *childRecordFields = nil;
   // Check if the problem will be fixed by Apple or if this fix should be kept in the future
   // Ticket #5639
   if ([[context request] isMacOSXVenturaCalendarApp]) {
-    _path = [_path stringByReplacingOccurrencesOfString:@"/Personal" withString:@"/personal"];
+    _path = [_path stringByReplacingOccurrencesOfString:@"/PERSONAL" withString:@"/personal"];
   }
   
   if (![ocsPath isEqualToString:_path])
@@ -442,7 +442,7 @@ static NSArray *childRecordFields = nil;
   // Check if the problem will be fixed by Apple or if this fix should be kept in the future
   // Ticket #5639
   if ([[context request] isMacOSXVenturaCalendarApp]) {
-    _path = [_path stringByReplacingOccurrencesOfString:@"Personal" withString:@"personal"];
+    _path = [_path stringByReplacingOccurrencesOfString:@"PERSONAL" withString:@"personal"];
   }
 
   // We check if we got a cache miss or a potentially bogus
@@ -475,7 +475,7 @@ static NSArray *childRecordFields = nil;
   // Check if the problem will be fixed by Apple or if this fix should be kept in the future
   // Ticket #5639
   if ([[context request] isMacOSXVenturaCalendarApp]) {
-    realNameInContainer = [realNameInContainer stringByReplacingOccurrencesOfString:@"Personal" withString:@"personal"];
+    realNameInContainer = [realNameInContainer stringByReplacingOccurrencesOfString:@"PERSONAL" withString:@"personal"];
   }
 
   return [NSString stringWithFormat: @"%@:%@/%@",
diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m
index 61dade520..31121ddcc 100644
--- a/SoObjects/SOGo/SOGoParentFolder.m
+++ b/SoObjects/SOGo/SOGoParentFolder.m
@@ -226,7 +226,7 @@ static SoSecurityManager *sm = nil;
       // Ticket #5639
       if ([[context request] isMacOSXVenturaCalendarApp]) {
         if ([key isEqualToString:@"personal"]) {
-          key = @"Personal";
+          key = @"PERSONAL";
         }
       }