diff --git a/OpenChange/MAPIStoreCalendarContext.m b/OpenChange/MAPIStoreCalendarContext.m
index 9e02b19a4..16018ce85 100644
--- a/OpenChange/MAPIStoreCalendarContext.m
+++ b/OpenChange/MAPIStoreCalendarContext.m
@@ -46,7 +46,7 @@ static Class MAPIStoreCalendarFolderK;
   return @"calendar";
 }
 
-+ (enum mapistore_context_role) MAPIModuleRole
++ (enum mapistore_context_role) MAPIContextRole
 {
   return MAPISTORE_CALENDAR_ROLE;
 }
diff --git a/OpenChange/MAPIStoreContactsContext.m b/OpenChange/MAPIStoreContactsContext.m
index 831ca0538..967b1ccd3 100644
--- a/OpenChange/MAPIStoreContactsContext.m
+++ b/OpenChange/MAPIStoreContactsContext.m
@@ -46,7 +46,7 @@ static Class MAPIStoreContactsFolderK;
   return @"contacts";
 }
 
-+ (enum mapistore_context_role) MAPIModuleRole
++ (enum mapistore_context_role) MAPIContextRole
 {
   return MAPISTORE_CONTACTS_ROLE;
 }
diff --git a/OpenChange/MAPIStoreGCSBaseContext.m b/OpenChange/MAPIStoreGCSBaseContext.m
index d155200bd..5b8344f1c 100644
--- a/OpenChange/MAPIStoreGCSBaseContext.m
+++ b/OpenChange/MAPIStoreGCSBaseContext.m
@@ -43,11 +43,6 @@
   return nil;
 }
 
-+ (enum mapistore_context_role) MAPIModuleRole
-{
-  return -1;
-}
-
 + (struct mapistore_contexts_list *) listContextsForUser: (NSString *) userName
                                          withTDBIndexing: (struct tdb_wrap *) indexingTdb
                                                 inMemCtx: (TALLOC_CTX *) memCtx
@@ -83,7 +78,7 @@
               context->name = [[currentFolder displayName]
                                 asUnicodeInMemCtx: context];
               context->main_folder = [nameInContainer isEqualToString: @"personal"];
-              context->role = [self MAPIModuleRole];
+              context->role = [self MAPIContextRole];
               context->tag = "tag";
               DLIST_ADD_END (firstContext, context, void);
             }
diff --git a/OpenChange/MAPIStoreTasksContext.m b/OpenChange/MAPIStoreTasksContext.m
index cf95fb736..c8714c469 100644
--- a/OpenChange/MAPIStoreTasksContext.m
+++ b/OpenChange/MAPIStoreTasksContext.m
@@ -45,7 +45,7 @@ static Class MAPIStoreTasksFolderK;
   return @"tasks";
 }
 
-+ (enum mapistore_context_role) MAPIModuleRole
++ (enum mapistore_context_role) MAPIContextRole
 {
   return MAPISTORE_TASKS_ROLE;
 }