diff --git a/OpenChange/MAPIStoreDBFolder.m b/OpenChange/MAPIStoreDBFolder.m
index 6aea4dd9b..4fc954112 100644
--- a/OpenChange/MAPIStoreDBFolder.m
+++ b/OpenChange/MAPIStoreDBFolder.m
@@ -51,16 +51,6 @@
 
 static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
 
-NSString *MAPIStoreRightReadItems = @"RightsReadItems";
-NSString *MAPIStoreRightCreateItems = @"RightsCreateItems";
-NSString *MAPIStoreRightEditOwn = @"RightsEditOwn";
-NSString *MAPIStoreRightEditAll = @"RightsEditAll";
-NSString *MAPIStoreRightDeleteOwn = @"RightsDeleteOwn";
-NSString *MAPIStoreRightDeleteAll = @"RightsDeleteAll";
-NSString *MAPIStoreRightCreateSubfolders = @"RightsCreateSubfolders";
-NSString *MAPIStoreRightFolderOwner = @"RightsFolderOwner";
-NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
-
 @implementation MAPIStoreDBFolder
 
 + (void) initialize
diff --git a/OpenChange/MAPIStoreFolder.h b/OpenChange/MAPIStoreFolder.h
index d361bc12c..a6a591ec2 100644
--- a/OpenChange/MAPIStoreFolder.h
+++ b/OpenChange/MAPIStoreFolder.h
@@ -42,11 +42,19 @@
 
 #import "MAPIStoreSOGoObject.h"
 
-/* Custom MAPI Permissions */
-extern NSString *SOGoOpenChangeRole_EditOwned;
-extern NSString *SOGoOpenChangeRole_DeleteOwned;
-extern NSString *SOGoOpenChangeRole_FolderContact;
-extern NSString *SOGoOpenChangeRole_FolderOwner;
+/* MAPI Permissions
+
+   This set has only sogo-openchange library scope
+ */
+extern NSString *MAPIStoreRightReadItems;
+extern NSString *MAPIStoreRightCreateItems;
+extern NSString *MAPIStoreRightEditOwn;
+extern NSString *MAPIStoreRightEditAll;
+extern NSString *MAPIStoreRightDeleteOwn;
+extern NSString *MAPIStoreRightDeleteAll;
+extern NSString *MAPIStoreRightCreateSubfolders;
+extern NSString *MAPIStoreRightFolderOwner;
+extern NSString *MAPIStoreRightFolderContact;
 
 @interface MAPIStoreFolder : MAPIStoreSOGoObject
 {
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 82f96bfaf..a1ef53f94 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -65,14 +65,16 @@
 
 Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMessageTableK, MAPIStoreFolderTableK;
 
-/* Custom MAPI Permissions:
-
-   This set have sogo-openchange library scope
-*/
-NSString *SOGoOpenChangeRole_EditOwned = @"EditOwned";
-NSString *SOGoOpenChangeRole_DeleteOwned = @"DeleteOwned";
-NSString *SOGoOpenChangeRole_FolderContact = @"FolderContact";
-NSString *SOGoOpenChangeRole_FolderOwner = @"FolderOwner";
+/* MAPI permissions */
+NSString *MAPIStoreRightReadItems = @"RightsReadItems";
+NSString *MAPIStoreRightCreateItems = @"RightsCreateItems";
+NSString *MAPIStoreRightEditOwn = @"RightsEditOwn";
+NSString *MAPIStoreRightEditAll = @"RightsEditAll";
+NSString *MAPIStoreRightDeleteOwn = @"RightsDeleteOwn";
+NSString *MAPIStoreRightDeleteAll = @"RightsDeleteAll";
+NSString *MAPIStoreRightCreateSubfolders = @"RightsCreateSubfolders";
+NSString *MAPIStoreRightFolderOwner = @"RightsFolderOwner";
+NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
 
 @implementation MAPIStoreFolder