more rename

12 files changed, 72 insertions, 73 deletions

diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj
index 25ed6b74..c8ad4411 100644
--- a/build-mac/mailcore2.xcodeproj/project.pbxproj
+++ b/build-mac/mailcore2.xcodeproj/project.pbxproj
@@ -36,8 +36,8 @@
 		C62C6F0316A7E3B000737497 /* MCPOPOperationCallback.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C62C6EFC16A7CA1500737497 /* MCPOPOperationCallback.h */; };
 		C62C6F0616A7E54500737497 /* MCPOPFetchMessagesOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = C62C6F0416A7E54200737497 /* MCPOPFetchMessagesOperation.cc */; };
 		C62C6F0716A7E7CC00737497 /* MCPOPFetchMessagesOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C62C6F0516A7E54400737497 /* MCPOPFetchMessagesOperation.h */; };
-		C62C6F0A16A8F58000737497 /* MCIMAPAccount.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C62C6F0816A8F57000737497 /* MCIMAPAccount.cpp */; };
-		C62C6F0B16A936CA00737497 /* MCIMAPAccount.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C62C6F0916A8F57700737497 /* MCIMAPAccount.h */; };
+		C62C6F0A16A8F58000737497 /* MCIMAPAsyncSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C62C6F0816A8F57000737497 /* MCIMAPAsyncSession.cpp */; };
+		C62C6F0B16A936CA00737497 /* MCIMAPAsyncSession.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C62C6F0916A8F57700737497 /* MCIMAPAsyncSession.h */; };
 		C64EA6F4169E847800778456 /* MCAbstractMessage.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA694169E847800778456 /* MCAbstractMessage.cc */; };
 		C64EA6F6169E847800778456 /* MCAbstractMessagePart.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA696169E847800778456 /* MCAbstractMessagePart.cc */; };
 		C64EA6F8169E847800778456 /* MCAbstractMultipart.cc in Sources */ = {isa = PBXBuildFile; fileRef = C64EA698169E847800778456 /* MCAbstractMultipart.cc */; };
@@ -237,7 +237,7 @@
 				C62C6F0216A7E3A700737497 /* MCAsyncPOP.h in CopyFiles */,
 				C62C6F0316A7E3B000737497 /* MCPOPOperationCallback.h in CopyFiles */,
 				C62C6F0116A7E32F00737497 /* MCPOPFetchMessageOperation.h in CopyFiles */,
-				C62C6F0B16A936CA00737497 /* MCIMAPAccount.h in CopyFiles */,
+				C62C6F0B16A936CA00737497 /* MCIMAPAsyncSession.h in CopyFiles */,
 				C64EA772169E859600778456 /* MCIMAPSession.h in CopyFiles */,
 				C64EA773169E859600778456 /* MCPOP.h in CopyFiles */,
 				C64EA774169E859600778456 /* MCPOPMessageInfo.h in CopyFiles */,
@@ -288,8 +288,8 @@
 		C62C6EFD16A7DD0300737497 /* MCAsyncPOP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCAsyncPOP.h; sourceTree = "<group>"; };
 		C62C6F0416A7E54200737497 /* MCPOPFetchMessagesOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCPOPFetchMessagesOperation.cc; sourceTree = "<group>"; };
 		C62C6F0516A7E54400737497 /* MCPOPFetchMessagesOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCPOPFetchMessagesOperation.h; sourceTree = "<group>"; };
-		C62C6F0816A8F57000737497 /* MCIMAPAccount.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCIMAPAccount.cpp; sourceTree = "<group>"; };
-		C62C6F0916A8F57700737497 /* MCIMAPAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCIMAPAccount.h; sourceTree = "<group>"; };
+		C62C6F0816A8F57000737497 /* MCIMAPAsyncSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCIMAPAsyncSession.cpp; sourceTree = "<group>"; };
+		C62C6F0916A8F57700737497 /* MCIMAPAsyncSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCIMAPAsyncSession.h; sourceTree = "<group>"; };
 		C64EA537169E772200778456 /* libmailcore2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmailcore2.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		C64EA68C169E847800778456 /* MCIMAPAsyncConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCIMAPAsyncConnection.h; sourceTree = "<group>"; };
 		C64EA68F169E847800778456 /* MCSMTPAsyncSession.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCSMTPAsyncSession.cc; sourceTree = "<group>"; };
@@ -520,8 +520,8 @@
 				C64EA7F916A15A9200778456 /* MCAsyncIMAP.h */,
 				C64EA7FD16A295B500778456 /* MCIMAPAsyncConnection.cc */,
 				C64EA68C169E847800778456 /* MCIMAPAsyncConnection.h */,
-				C62C6F0816A8F57000737497 /* MCIMAPAccount.cpp */,
-				C62C6F0916A8F57700737497 /* MCIMAPAccount.h */,
+				C62C6F0816A8F57000737497 /* MCIMAPAsyncSession.cpp */,
+				C62C6F0916A8F57700737497 /* MCIMAPAsyncSession.h */,
 				C64EA7EF16A15A4D00778456 /* MCIMAPOperation.cc */,
 				C64EA7F016A15A4D00778456 /* MCIMAPOperation.h */,
 				C64EA7F416A15A6300778456 /* MCIMAPOperationCallback.h */,
@@ -920,7 +920,7 @@
 				C62C6EF816A7C6F500737497 /* MCPOPDeleteMessagesOperation.cc in Sources */,
 				C62C6EFB16A7C94000737497 /* MCPOPOperation.cc in Sources */,
 				C62C6F0616A7E54500737497 /* MCPOPFetchMessagesOperation.cc in Sources */,
-				C62C6F0A16A8F58000737497 /* MCIMAPAccount.cpp in Sources */,
+				C62C6F0A16A8F58000737497 /* MCIMAPAsyncSession.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/scripts/.DS_Store b/scripts/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
--- a/scripts/.DS_Store
+++ /dev/null
diff --git a/src/async/imap/MCAsyncIMAP.h b/src/async/imap/MCAsyncIMAP.h
index 96c0345f..1391439b 100644
--- a/src/async/imap/MCAsyncIMAP.h
+++ b/src/async/imap/MCAsyncIMAP.h
@@ -9,7 +9,6 @@
 #ifndef mailcore2_MCAsyncIMAP_h
 #define mailcore2_MCAsyncIMAP_h
 
-#include <mailcore/MCIMAPAccount.h>
 #include <mailcore/MCIMAPAsyncSession.h>
 #include <mailcore/MCIMAPOperation.h>
 #include <mailcore/MCIMAPFetchFoldersOperation.h>
diff --git a/src/async/imap/MCIMAPAccount.cpp b/src/async/imap/MCIMAPAsyncSession.cpp
index bc214b6b..a6389bc7 100644
--- a/src/async/imap/MCIMAPAccount.cpp
+++ b/src/async/imap/MCIMAPAsyncSession.cpp
@@ -1,12 +1,12 @@
 //
-//  MCIMAPAccount.cpp
+//  MCIMAPAsyncSession.cpp
 //  mailcore2
 //
 //  Created by DINH Viêt Hoà on 1/17/13.
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#include "MCIMAPAccount.h"
+#include "MCIMAPAsyncSession.h"
 
 #include "MCIMAPAsyncConnection.h"
 #include "MCIMAPNamespace.h"
@@ -15,150 +15,150 @@
 
 using namespace mailcore;
 
-IMAPAccount::IMAPAccount()
+IMAPAsyncSession::IMAPAsyncSession()
 {
     mSessions = new Array();
     mMaximumConnections = DEFAULT_MAX_CONNECTIONS;
     mAllowsFolderConcurrentAccessEnabled = true;
 }
 
-IMAPAccount::~IMAPAccount()
+IMAPAsyncSession::~IMAPAsyncSession()
 {
     MC_SAFE_RELEASE(mSessions);
 }
 
-void IMAPAccount::setHostname(String * hostname)
+void IMAPAsyncSession::setHostname(String * hostname)
 {
     MC_SAFE_REPLACE_COPY(String, mHostname, hostname);
 }
 
-String * IMAPAccount::hostname()
+String * IMAPAsyncSession::hostname()
 {
     return mHostname;
 }
 
-void IMAPAccount::setPort(unsigned int port)
+void IMAPAsyncSession::setPort(unsigned int port)
 {
     mPort = port;
 }
 
-unsigned int IMAPAccount::port()
+unsigned int IMAPAsyncSession::port()
 {
     return mPort;
 }
 
-void IMAPAccount::setUsername(String * username)
+void IMAPAsyncSession::setUsername(String * username)
 {
     MC_SAFE_REPLACE_COPY(String, mUsername, username);
 }
 
-String * IMAPAccount::username()
+String * IMAPAsyncSession::username()
 {
     return mUsername;
 }
 
-void IMAPAccount::setPassword(String * password)
+void IMAPAsyncSession::setPassword(String * password)
 {
     MC_SAFE_REPLACE_COPY(String, mPassword, password);
 }
 
-String * IMAPAccount::password()
+String * IMAPAsyncSession::password()
 {
     return mPassword;
 }
 
-void IMAPAccount::setAuthType(AuthType authType)
+void IMAPAsyncSession::setAuthType(AuthType authType)
 {
     mAuthType = authType;
 }
 
-AuthType IMAPAccount::authType()
+AuthType IMAPAsyncSession::authType()
 {
     return mAuthType;
 }
 
-void IMAPAccount::setConnectionType(ConnectionType connectionType)
+void IMAPAsyncSession::setConnectionType(ConnectionType connectionType)
 {
     mConnectionType = connectionType;
 }
 
-ConnectionType IMAPAccount::connectionType()
+ConnectionType IMAPAsyncSession::connectionType()
 {
     return mConnectionType;
 }
 
-void IMAPAccount::setTimeout(time_t timeout)
+void IMAPAsyncSession::setTimeout(time_t timeout)
 {
     mTimeout = timeout;
 }
 
-time_t IMAPAccount::timeout()
+time_t IMAPAsyncSession::timeout()
 {
     return mTimeout;
 }
 
-void IMAPAccount::setCheckCertificateEnabled(bool enabled)
+void IMAPAsyncSession::setCheckCertificateEnabled(bool enabled)
 {
     mCheckCertificateEnabled = enabled;
 }
 
-bool IMAPAccount::isCheckCertificateEnabled()
+bool IMAPAsyncSession::isCheckCertificateEnabled()
 {
     return mCheckCertificateEnabled;
 }
 
-void IMAPAccount::setVoIPEnabled(bool enabled)
+void IMAPAsyncSession::setVoIPEnabled(bool enabled)
 {
     mVoIPEnabled = enabled;
 }
 
-bool IMAPAccount::isVoIPEnabled()
+bool IMAPAsyncSession::isVoIPEnabled()
 {
     return mVoIPEnabled;
 }
 
 
-void IMAPAccount::setDelimiter(char delimiter)
+void IMAPAsyncSession::setDelimiter(char delimiter)
 {
     mDelimiter = delimiter;
 }
 
-char IMAPAccount::delimiter()
+char IMAPAsyncSession::delimiter()
 {
     return mDelimiter;
 }
 
-IMAPNamespace * IMAPAccount::defaultNamespace()
+IMAPNamespace * IMAPAsyncSession::defaultNamespace()
 {
     return mDefaultNamespace;
 }
 
-void IMAPAccount::setDefaultNamespace(IMAPNamespace * ns)
+void IMAPAsyncSession::setDefaultNamespace(IMAPNamespace * ns)
 {
     MC_SAFE_REPLACE_RETAIN(IMAPNamespace, mDefaultNamespace, ns);
 }
 
-void IMAPAccount::setAllowsFolderConcurrentAccessEnabled(bool enabled)
+void IMAPAsyncSession::setAllowsFolderConcurrentAccessEnabled(bool enabled)
 {
     mAllowsFolderConcurrentAccessEnabled = enabled;
 }
 
-bool IMAPAccount::allowsFolderConcurrentAccessEnabled()
+bool IMAPAsyncSession::allowsFolderConcurrentAccessEnabled()
 {
     return mAllowsFolderConcurrentAccessEnabled;
 }
 
-void IMAPAccount::setMaximumConnections(unsigned int maxConnections)
+void IMAPAsyncSession::setMaximumConnections(unsigned int maxConnections)
 {
     mMaximumConnections = maxConnections;
 }
 
-unsigned int IMAPAccount::maximumConnections()
+unsigned int IMAPAsyncSession::maximumConnections()
 {
     return mMaximumConnections;
 }
 
-IMAPAsyncConnection * IMAPAccount::session()
+IMAPAsyncConnection * IMAPAsyncSession::session()
 {
     IMAPAsyncConnection * session = new IMAPAsyncConnection();
     session->autorelease();
@@ -178,7 +178,7 @@ IMAPAsyncConnection * IMAPAccount::session()
     return session;
 }
 
-IMAPAsyncConnection * IMAPAccount::sessionForFolder(String * folder, bool urgent)
+IMAPAsyncConnection * IMAPAsyncSession::sessionForFolder(String * folder, bool urgent)
 {
     if (folder == NULL) {
         return availableSession();
@@ -199,7 +199,7 @@ IMAPAsyncConnection * IMAPAccount::sessionForFolder(String * folder, bool urgent
     }
 }
 
-IMAPAsyncConnection * IMAPAccount::availableSession()
+IMAPAsyncConnection * IMAPAsyncSession::availableSession()
 {
     if (mMaximumConnections == 0) {
         for(unsigned int i = 0 ; i < mSessions->count() ; i ++) {
@@ -239,7 +239,7 @@ IMAPAsyncConnection * IMAPAccount::availableSession()
     }
 }
 
-IMAPAsyncConnection * IMAPAccount::matchingSessionForFolder(String * folder)
+IMAPAsyncConnection * IMAPAsyncSession::matchingSessionForFolder(String * folder)
 {
     for(unsigned int i = 0 ; i < mSessions->count() ; i ++) {
         IMAPAsyncConnection * currentSession = (IMAPAsyncConnection *) mSessions->objectAtIndex(i);
@@ -255,156 +255,156 @@ IMAPAsyncConnection * IMAPAccount::matchingSessionForFolder(String * folder)
     return availableSession();
 }
 
-IMAPFolderInfoOperation * IMAPAccount::folderInfoOperation(String * folder)
+IMAPFolderInfoOperation * IMAPAsyncSession::folderInfoOperation(String * folder)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->folderInfoOperation(folder);
 }
 
-IMAPFetchFoldersOperation * IMAPAccount::fetchSubscribedFoldersOperation()
+IMAPFetchFoldersOperation * IMAPAsyncSession::fetchSubscribedFoldersOperation()
 {
     IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
     return session->fetchSubscribedFoldersOperation();
 }
 
-IMAPFetchFoldersOperation * IMAPAccount::fetchAllFoldersOperation()
+IMAPFetchFoldersOperation * IMAPAsyncSession::fetchAllFoldersOperation()
 {
     IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
     return session->fetchAllFoldersOperation();
 }
 
-IMAPOperation * IMAPAccount::renameFolderOperation(String * folder, String * otherName)
+IMAPOperation * IMAPAsyncSession::renameFolderOperation(String * folder, String * otherName)
 {
     IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
     return session->renameFolderOperation(folder, otherName);
 }
 
-IMAPOperation * IMAPAccount::deleteFolderOperation(String * folder)
+IMAPOperation * IMAPAsyncSession::deleteFolderOperation(String * folder)
 {
     IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
     return session->deleteFolderOperation(folder);
 }
 
-IMAPOperation * IMAPAccount::createFolderOperation(String * folder)
+IMAPOperation * IMAPAsyncSession::createFolderOperation(String * folder)
 {
     IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
     return session->createFolderOperation(folder);
 }
 
-IMAPOperation * IMAPAccount::subscribeFolderOperation(String * folder)
+IMAPOperation * IMAPAsyncSession::subscribeFolderOperation(String * folder)
 {
     IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
     return session->subscribeFolderOperation(folder);
 }
 
-IMAPOperation * IMAPAccount::unsubscribeFolderOperation(String * folder)
+IMAPOperation * IMAPAsyncSession::unsubscribeFolderOperation(String * folder)
 {
     IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
     return session->unsubscribeFolderOperation(folder);
 }
 
-IMAPAppendMessageOperation * IMAPAccount::appendMessageOperation(String * folder, Data * messageData, MessageFlag flags)
+IMAPAppendMessageOperation * IMAPAsyncSession::appendMessageOperation(String * folder, Data * messageData, MessageFlag flags)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->appendMessageOperation(folder, messageData, flags);
 }
 
-IMAPCopyMessagesOperation * IMAPAccount::copyMessagesOperation(String * folder, Array * uids, String * destFolder)
+IMAPCopyMessagesOperation * IMAPAsyncSession::copyMessagesOperation(String * folder, Array * uids, String * destFolder)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->copyMessagesOperation(folder, uids, destFolder);
 }
 
-IMAPOperation * IMAPAccount::expungeOperation(String * folder)
+IMAPOperation * IMAPAsyncSession::expungeOperation(String * folder)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->expungeOperation(folder);
 }
 
-IMAPFetchMessagesOperation * IMAPAccount::fetchMessagesByUIDOperation(String * folder, IMAPMessagesRequestKind requestKind,
+IMAPFetchMessagesOperation * IMAPAsyncSession::fetchMessagesByUIDOperation(String * folder, IMAPMessagesRequestKind requestKind,
                                                                       uint32_t firstUID, uint32_t lastUID)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->fetchMessagesByUIDOperation(folder, requestKind, firstUID, lastUID);
 }
 
-IMAPFetchMessagesOperation * IMAPAccount::fetchMessagesByNumberOperation(String * folder, IMAPMessagesRequestKind requestKind,
+IMAPFetchMessagesOperation * IMAPAsyncSession::fetchMessagesByNumberOperation(String * folder, IMAPMessagesRequestKind requestKind,
                                                                          uint32_t firstNumber, uint32_t lastNumber)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->fetchMessagesByNumberOperation(folder, requestKind, firstNumber, lastNumber);
 }
 
-IMAPFetchMessagesOperation * IMAPAccount::fetchMessagesByUIDOperation(String * folder, IMAPMessagesRequestKind requestKind,
+IMAPFetchMessagesOperation * IMAPAsyncSession::fetchMessagesByUIDOperation(String * folder, IMAPMessagesRequestKind requestKind,
                                                                       Array * uids)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->fetchMessagesByUIDOperation(folder, requestKind, uids);
 }
 
-IMAPFetchMessagesOperation * IMAPAccount::fetchMessagesByNumberOperation(String * folder, IMAPMessagesRequestKind requestKind,
+IMAPFetchMessagesOperation * IMAPAsyncSession::fetchMessagesByNumberOperation(String * folder, IMAPMessagesRequestKind requestKind,
                                                                          Array * numbers)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->fetchMessagesByNumberOperation(folder, requestKind, numbers);
 }
 
-IMAPFetchContentOperation * IMAPAccount::fetchMessageByUIDOperation(String * folder, uint32_t uid, bool urgent)
+IMAPFetchContentOperation * IMAPAsyncSession::fetchMessageByUIDOperation(String * folder, uint32_t uid, bool urgent)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder, urgent);
     return session->fetchMessageByUIDOperation(folder, uid);
 }
 
-IMAPFetchContentOperation * IMAPAccount::fetchMessageAttachmentByUIDOperation(String * folder, uint32_t uid, String * partID,
+IMAPFetchContentOperation * IMAPAsyncSession::fetchMessageAttachmentByUIDOperation(String * folder, uint32_t uid, String * partID,
                                                                          Encoding encoding, bool urgent)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder, urgent);
     return session->fetchMessageAttachmentByUIDOperation(folder, uid, partID, encoding);
 }
 
-IMAPOperation * IMAPAccount::storeFlagsOperation(String * folder, Array * uids, IMAPStoreFlagsRequestKind kind, MessageFlag flags)
+IMAPOperation * IMAPAsyncSession::storeFlagsOperation(String * folder, Array * uids, IMAPStoreFlagsRequestKind kind, MessageFlag flags)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->storeFlagsOperation(folder, uids, kind, flags);
 }
 
-IMAPOperation * IMAPAccount::storeLabelsOperation(String * folder, Array * uids, IMAPStoreFlagsRequestKind kind, Array * labels)
+IMAPOperation * IMAPAsyncSession::storeLabelsOperation(String * folder, Array * uids, IMAPStoreFlagsRequestKind kind, Array * labels)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->storeLabelsOperation(folder, uids, kind, labels);
 }
 
-IMAPSearchOperation * IMAPAccount::searchOperation(String * folder, IMAPSearchKind kind, String * searchString)
+IMAPSearchOperation * IMAPAsyncSession::searchOperation(String * folder, IMAPSearchKind kind, String * searchString)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->searchOperation(folder, kind, searchString);
 }
 
-IMAPSearchOperation * IMAPAccount::searchOperation(String * folder, IMAPSearchExpression * expression)
+IMAPSearchOperation * IMAPAsyncSession::searchOperation(String * folder, IMAPSearchExpression * expression)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->searchOperation(folder, expression);
 }
 
-IMAPIdleOperation * IMAPAccount::idleOperation(String * folder, uint32_t lastKnownUID)
+IMAPIdleOperation * IMAPAsyncSession::idleOperation(String * folder, uint32_t lastKnownUID)
 {
     IMAPAsyncConnection * session = sessionForFolder(folder);
     return session->idleOperation(folder, lastKnownUID);
 }
 
-IMAPFetchNamespaceOperation * IMAPAccount::fetchNamespaceOperation()
+IMAPFetchNamespaceOperation * IMAPAsyncSession::fetchNamespaceOperation()
 {
     IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
     return session->fetchNamespaceOperation();
 }
 
-IMAPIdentityOperation * IMAPAccount::identityOperation(String * vendor, String * name, String * version)
+IMAPIdentityOperation * IMAPAsyncSession::identityOperation(String * vendor, String * name, String * version)
 {
     IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
     return session->identityOperation(vendor, name, version);
 }
 
-IMAPOperation * IMAPAccount::checkAccountOperation()
+IMAPOperation * IMAPAsyncSession::checkAccountOperation()
 {
     IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
     return session->checkAccountOperation();
diff --git a/src/async/imap/MCIMAPAccount.h b/src/async/imap/MCIMAPAsyncSession.h
index a34daca5..90489292 100644
--- a/src/async/imap/MCIMAPAccount.h
+++ b/src/async/imap/MCIMAPAsyncSession.h
@@ -29,7 +29,7 @@ namespace mailcore {
     class IMAPIdentityOperation;
     class IMAPAsyncConnection;
     
-	class IMAPAccount : public Object {
+	class IMAPAsyncSession : public Object {
 	private:
         Array * mSessions;
         
@@ -53,8 +53,8 @@ namespace mailcore {
         IMAPAsyncConnection * availableSession();
         
 	public:
-		IMAPAccount();
-		virtual ~IMAPAccount();
+		IMAPAsyncSession();
+		virtual ~IMAPAsyncSession();
 		
 		virtual void setHostname(String * hostname);
 		virtual String * hostname();
diff --git a/src/core/abstract/.DS_Store b/src/core/abstract/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
--- a/src/core/abstract/.DS_Store
+++ /dev/null
diff --git a/src/core/basetypes/.DS_Store b/src/core/basetypes/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
--- a/src/core/basetypes/.DS_Store
+++ /dev/null
diff --git a/src/core/imap/.DS_Store b/src/core/imap/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
--- a/src/core/imap/.DS_Store
+++ /dev/null
diff --git a/src/core/pop/.DS_Store b/src/core/pop/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
--- a/src/core/pop/.DS_Store
+++ /dev/null
diff --git a/src/core/rfc822/.DS_Store b/src/core/rfc822/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
--- a/src/core/rfc822/.DS_Store
+++ /dev/null
diff --git a/src/core/smtp/.DS_Store b/src/core/smtp/.DS_Store
deleted file mode 100644
index 5008ddfc..00000000
--- a/src/core/smtp/.DS_Store
+++ /dev/null
diff --git a/tests/main.mm b/tests/main.mm
index c0b494e8..56a270fa 100644
--- a/tests/main.mm
+++ b/tests/main.mm
@@ -210,10 +210,10 @@ class TestIMAPCallback : public mailcore::Object, public mailcore::OperationCall
 
 static void testAsyncIMAP()
 {
-    mailcore::IMAPAccount * session;
+    mailcore::IMAPAsyncSession * session;
     TestIMAPCallback * callback = new TestIMAPCallback();
     
-    session = new mailcore::IMAPAccount();
+    session = new mailcore::IMAPAsyncSession();
     session->setHostname(MCSTR("imap.gmail.com"));
     session->setPort(993);
     session->setUsername(email);