diff --git a/OpenChange/MAPIStoreDBBaseContext.m b/OpenChange/MAPIStoreDBBaseContext.m
index e1a67fd76..22a15bc85 100644
--- a/OpenChange/MAPIStoreDBBaseContext.m
+++ b/OpenChange/MAPIStoreDBBaseContext.m
@@ -58,7 +58,7 @@ static Class MAPIStoreDBFolderK;
 
 - (void) ensureContextFolder
 {
-  SOGoMAPIDBFolder *currentFolder;
+  SOGoCacheGCSFolder *currentFolder;
   NSArray *parts;
   NSMutableArray *folders;
   NSString *folderName;
@@ -76,7 +76,7 @@ static Class MAPIStoreDBFolderK;
       folderName = [parts objectAtIndex: count];
       if ([folderName length] > 0)
         {
-          currentFolder = [SOGoMAPIDBFolder objectWithName: folderName
+          currentFolder = [SOGoCacheGCSFolder objectWithName: folderName
                                                inContainer: currentFolder];
           [folders addObject: currentFolder];
         }
@@ -96,11 +96,11 @@ static Class MAPIStoreDBFolderK;
 
 - (id) rootSOGoFolder
 {
-  SOGoMAPIDBFolder *folder;
+  SOGoCacheGCSFolder *folder;
 
   [userContext ensureFolderTableExists];
 
-  folder = [SOGoMAPIDBFolder objectWithName: [isa MAPIModuleName]
+  folder = [SOGoCacheGCSFolder objectWithName: [isa MAPIModuleName]
                                 inContainer: nil];
   [folder setTableUrl: [userContext folderTableURL]];
   // [folder reloadIfNeeded];
diff --git a/OpenChange/MAPIStoreDBFolder.m b/OpenChange/MAPIStoreDBFolder.m
index 70b957852..f9b2e128d 100644
--- a/OpenChange/MAPIStoreDBFolder.m
+++ b/OpenChange/MAPIStoreDBFolder.m
@@ -49,7 +49,7 @@
 #include <mapistore/mapistore.h>
 #include <mapistore/mapistore_errors.h>
 
-static Class EOKeyValueQualifierK, SOGoMAPIDBFolderK, MAPIStoreDBFolderK;
+static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
 
 static NSString *MAPIStoreRightReadItems = @"RightsReadItems";
 static NSString *MAPIStoreRightCreateItems = @"RightsCreateItems";
@@ -66,7 +66,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
 + (void) initialize
 {
   EOKeyValueQualifierK = [EOKeyValueQualifier class];
-  SOGoMAPIDBFolderK = [SOGoMAPIDBFolder class];
+  SOGoCacheGCSFolderK = [SOGoCacheGCSFolder class];
   MAPIStoreDBFolderK = [MAPIStoreDBFolder class];
 }
 
@@ -92,7 +92,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
 {
   enum mapistore_error rc;
   NSString *folderName, *nameInContainer;
-  SOGoMAPIDBFolder *newFolder;
+  SOGoCacheGCSFolder *newFolder;
   struct SPropValue *value;
 
   value = get_SPropValue_SRow (aRow, PidTagDisplayName);
@@ -111,7 +111,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
     {
       nameInContainer = [NSString stringWithFormat: @"0x%.16"PRIx64,
                                   (unsigned long long) newFID];
-      newFolder = [SOGoMAPIDBFolderK objectWithName: nameInContainer
+      newFolder = [SOGoCacheGCSFolderK objectWithName: nameInContainer
                                         inContainer: sogoObject];
       [newFolder reloadIfNeeded];
       [[newFolder properties] setObject: folderName
@@ -198,7 +198,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
   ownerUser = [[self userContext] sogoUser];
   if ([[context activeUser] isEqual: ownerUser]
       || [self subscriberCanReadMessages])
-    keys = [(SOGoMAPIDBFolder *) sogoObject childKeysOfType: MAPIMessageCacheObject
+    keys = [(SOGoCacheGCSFolder *) sogoObject childKeysOfType: MAPIMessageCacheObject
                                              includeDeleted: NO
                                           matchingQualifier: qualifier
                                            andSortOrderings: sortOrderings];
diff --git a/OpenChange/MAPIStoreFolder.h b/OpenChange/MAPIStoreFolder.h
index 860e19636..94a1cb634 100644
--- a/OpenChange/MAPIStoreFolder.h
+++ b/OpenChange/MAPIStoreFolder.h
@@ -1,8 +1,6 @@
 /* MAPIStoreFolder.h - this file is part of SOGo
  *
- * Copyright (C) 2011-2012 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2011-2014 Inverse inc
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +36,7 @@
 @class MAPIStoreMessageTable;
 @class MAPIStorePermissionsTable;
 @class SOGoFolder;
-@class SOGoMAPIDBFolder;
+@class SOGoCacheGCSFolder;
 @class SOGoMAPIDBMessage;
 
 #import "MAPIStoreSOGoObject.h"
@@ -50,7 +48,7 @@
   // NSArray *faiMessageKeys;
   // NSArray *folderKeys;
 
-  SOGoMAPIDBFolder *dbFolder;
+  SOGoCacheGCSFolder *dbFolder;
   // SOGoMAPIDBFolder *faiFolder;
   // SOGoMAPIDBFolder *propsFolder;
   // SOGoMAPIDBMessage *propsMessage;
@@ -60,7 +58,7 @@
 
 - (void) setupAuxiliaryObjects;
 
-- (SOGoMAPIDBFolder *) dbFolder;
+- (SOGoCacheGCSFolder *) dbFolder;
 
 - (NSArray *) activeMessageTables;
 - (NSArray *) activeFAIMessageTables;
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index fa2111b93..3dba819b8 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -119,7 +119,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   [userContext ensureFolderTableExists];
 
   ASSIGN (dbFolder,
-          [SOGoMAPIDBFolder objectWithName: folderName
+          [SOGoCacheGCSFolder objectWithName: folderName
                                inContainer: [container dbFolder]]);
   [dbFolder setTableUrl: [userContext folderTableURL]];
   if (!container && [path length] > 0)
@@ -191,7 +191,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   [super dealloc];
 }
 
-- (SOGoMAPIDBFolder *) dbFolder
+- (SOGoCacheGCSFolder *) dbFolder
 {
   return dbFolder;
 }