diff --git a/ChangeLog b/ChangeLog
index 86066e5f8..3be508b09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUserDefaults.m (-{set}ContactsCategories):
+	renamed version of the "contactCategories" accessors.
+
 	* SoObjects/SOGo/NSString+Utilities.m (-objectFromJSONString): new
 	method replacing the one below in a more generic way. I.e. the
 	method will accept any JSON object as input and not only
diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m
index 82af5a7de..c6e700714 100644
--- a/SoObjects/Contacts/SOGoContactFolders.m
+++ b/SoObjects/Contacts/SOGoContactFolders.m
@@ -111,7 +111,7 @@
   return keys;
 }
 
-- (NSException *) setDavContactCategories: (NSString *) newCategories
+- (NSException *) setDavContactsCategories: (NSString *) newCategories
 {
   SOGoUser *ownerUser;
   NSMutableArray *categories;
@@ -143,13 +143,13 @@
   NSLog (@"setting categories to : %@", categories);
   ownerUser = [SOGoUser userWithLogin: owner];
   ud = [ownerUser userDefaults];
-  [ud setContactCategories: categories];
+  [ud setContactsCategories: categories];
   [ud synchronize];
 
   return nil;
 }
 
-- (SOGoWebDAVValue *) davContactCategories
+- (SOGoWebDAVValue *) davContactsCategories
 {
   NSMutableArray *davCategories;
   NSArray *categories;
@@ -158,7 +158,7 @@
   NSDictionary *catElement;
 
   ownerUser = [SOGoUser userWithLogin: owner];
-  categories = [[ownerUser userDefaults] contactCategories];
+  categories = [[ownerUser userDefaults] contactsCategories];
 
   max = [categories count];
   davCategories = [NSMutableArray arrayWithCapacity: max];
@@ -170,7 +170,7 @@
       [davCategories addObject: catElement];
     }
 
-  return [davElementWithContent (@"contact-categories",
+  return [davElementWithContent (@"contacts-categories",
                                  XMLNS_INVERSEDAV,
                                  davCategories)
                                 asWebDAVValue];
diff --git a/SoObjects/SOGo/SOGoUserDefaults.h b/SoObjects/SOGo/SOGoUserDefaults.h
index a4f3144f3..2d30cd45f 100644
--- a/SoObjects/SOGo/SOGoUserDefaults.h
+++ b/SoObjects/SOGo/SOGoUserDefaults.h
@@ -165,8 +165,8 @@ extern NSString *SOGoWeekStartFirstFullWeek;
 - (BOOL) remindWithASound;
 
 /* contacts */
-- (void) setContactCategories: (NSArray *) newValues;
-- (NSArray *) contactCategories;
+- (void) setContactsCategories: (NSArray *) newValues;
+- (NSArray *) contactsCategories;
 
 @end
 
diff --git a/SoObjects/SOGo/SOGoUserDefaults.m b/SoObjects/SOGo/SOGoUserDefaults.m
index dfd932756..55e9c7230 100644
--- a/SoObjects/SOGo/SOGoUserDefaults.m
+++ b/SoObjects/SOGo/SOGoUserDefaults.m
@@ -651,14 +651,14 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
   return [self dictionaryForKey: @"Forward"];
 }
 
-- (void) setContactCategories: (NSArray *) newValues
+- (void) setContactsCategories: (NSArray *) newValues
 {
-  [self setObject: newValues forKey: @"SOGoContactCategories"];
+  [self setObject: newValues forKey: @"SOGoContactsCategories"];
 }
 
-- (NSArray *) contactCategories
+- (NSArray *) contactsCategories
 {
-  return [self stringArrayForKey: @"SOGoContactCategories"];
+  return [self stringArrayForKey: @"SOGoContactsCategories"];
 }
 
 @end