Index: src/libchcore/TCoreException.cpp
===================================================================
diff -u -r71943917b6b34fa6e4f9045558c374322bddfd46 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TCoreException.cpp	(.../TCoreException.cpp)	(revision 71943917b6b34fa6e4f9045558c374322bddfd46)
+++ src/libchcore/TCoreException.cpp	(.../TCoreException.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -23,7 +23,7 @@
 BEGIN_CHCORE_NAMESPACE
 
 // ============================================================================
-/// chcore::TCoreException::TCoreException
+/// TCoreException::TCoreException
 /// @date 2009/11/30
 ///
 /// @brief     Constructs core exception object with additional data.
@@ -38,7 +38,7 @@
 }
 
 // ============================================================================
-/// chcore::TCoreException::TCoreException
+/// TCoreException::TCoreException
 /// @date 2009/11/30
 ///
 /// @brief     Constructs core exception object with additional data.
@@ -54,7 +54,7 @@
 }
 
 // ============================================================================
-/// chcore::TCoreWin32Exception::TCoreWin32Exception
+/// TCoreWin32Exception::TCoreWin32Exception
 /// @date 2011/07/18
 ///
 /// @brief     Constructs core win32 exception.
@@ -71,7 +71,7 @@
 }
 
 // ============================================================================
-/// chcore::TCoreWin32Exception::GetErrorInfo
+/// TCoreWin32Exception::GetErrorInfo
 /// @date 2011/07/18
 ///
 /// @brief     Retrieves formatted exception information.
Index: src/libchcore/TFakeFileSerializer.cpp
===================================================================
diff -u -rcdb4c898156398dd4f4bf8abd7c854eff42f6ae2 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TFakeFileSerializer.cpp	(.../TFakeFileSerializer.cpp)	(revision cdb4c898156398dd4f4bf8abd7c854eff42f6ae2)
+++ src/libchcore/TFakeFileSerializer.cpp	(.../TFakeFileSerializer.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -32,12 +32,12 @@
 {
 }
 
-chcore::TSmartPath TFakeFileSerializer::GetLocation() const
+TSmartPath TFakeFileSerializer::GetLocation() const
 {
 	return m_pathFileSerializer;
 }
 
-chcore::ISerializerContainerPtr TFakeFileSerializer::GetContainer(const TString& /*strContainerName*/)
+ISerializerContainerPtr TFakeFileSerializer::GetContainer(const TString& /*strContainerName*/)
 {
 	throw TCoreException(eErr_InvalidSerializer, m_pathFileSerializer.ToString(), __LINE__, __FUNCTIONW__);
 }
Index: src/libchcore/TFeedbackHandlerBase.cpp
===================================================================
diff -u -r671f4b1792a20d98b186f4e0a9cc6a620dede019 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TFeedbackHandlerBase.cpp	(.../TFeedbackHandlerBase.cpp)	(revision 671f4b1792a20d98b186f4e0a9cc6a620dede019)
+++ src/libchcore/TFeedbackHandlerBase.cpp	(.../TFeedbackHandlerBase.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -116,27 +116,27 @@
 	m_eOperationError = EFeedbackResult::eResult_Unknown;
 }
 
-chcore::EFeedbackResult TFeedbackHandlerBase::FileError(const TString& /*strSrcPath*/, const TString& /*strDstPath*/, EFileError /*eFileError*/, unsigned long /*ulError*/)
+EFeedbackResult TFeedbackHandlerBase::FileError(const TString& /*strSrcPath*/, const TString& /*strDstPath*/, EFileError /*eFileError*/, unsigned long /*ulError*/)
 {
 	return m_eFileError;
 }
 
-chcore::EFeedbackResult TFeedbackHandlerBase::FileAlreadyExists(const TFileInfoPtr& /*spSrcFileInfo*/, const TFileInfoPtr& /*spDstFileInfo*/)
+EFeedbackResult TFeedbackHandlerBase::FileAlreadyExists(const TFileInfoPtr& /*spSrcFileInfo*/, const TFileInfoPtr& /*spDstFileInfo*/)
 {
 	return m_eFileAlreadyExists;
 }
 
-chcore::EFeedbackResult TFeedbackHandlerBase::NotEnoughSpace(const TString& /*strSrcPath*/, const TString& /*strDstPath*/, unsigned long long /*ullRequiredSize*/)
+EFeedbackResult TFeedbackHandlerBase::NotEnoughSpace(const TString& /*strSrcPath*/, const TString& /*strDstPath*/, unsigned long long /*ullRequiredSize*/)
 {
 	return m_eNotEnoughSpace;
 }
 
-chcore::EFeedbackResult TFeedbackHandlerBase::OperationFinished()
+EFeedbackResult TFeedbackHandlerBase::OperationFinished()
 {
 	return m_eOperationFinished;
 }
 
-chcore::EFeedbackResult TFeedbackHandlerBase::OperationError()
+EFeedbackResult TFeedbackHandlerBase::OperationError()
 {
 	return m_eOperationError;
 }
Index: src/libchcore/TFeedbackHandlerWrapper.cpp
===================================================================
diff -u -r671f4b1792a20d98b186f4e0a9cc6a620dede019 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TFeedbackHandlerWrapper.cpp	(.../TFeedbackHandlerWrapper.cpp)	(revision 671f4b1792a20d98b186f4e0a9cc6a620dede019)
+++ src/libchcore/TFeedbackHandlerWrapper.cpp	(.../TFeedbackHandlerWrapper.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -32,35 +32,35 @@
 {
 }
 
-chcore::EFeedbackResult TFeedbackHandlerWrapper::FileError(const TString& strSrcPath, const TString& strDstPath, EFileError eFileError, unsigned long ulError)
+EFeedbackResult TFeedbackHandlerWrapper::FileError(const TString& strSrcPath, const TString& strDstPath, EFileError eFileError, unsigned long ulError)
 {
 	TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard);
 
 	return m_spFeedbackHandler->FileError(strSrcPath, strDstPath, eFileError, ulError);
 }
 
-chcore::EFeedbackResult TFeedbackHandlerWrapper::FileAlreadyExists(const TFileInfoPtr& spSrcFileInfo, const TFileInfoPtr& spDstFileInfo)
+EFeedbackResult TFeedbackHandlerWrapper::FileAlreadyExists(const TFileInfoPtr& spSrcFileInfo, const TFileInfoPtr& spDstFileInfo)
 {
 	TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard);
 
 	return m_spFeedbackHandler->FileAlreadyExists(spSrcFileInfo, spDstFileInfo);
 }
 
-chcore::EFeedbackResult TFeedbackHandlerWrapper::NotEnoughSpace(const TString& strSrcPath, const TString& strDstPath, unsigned long long ullRequiredSize)
+EFeedbackResult TFeedbackHandlerWrapper::NotEnoughSpace(const TString& strSrcPath, const TString& strDstPath, unsigned long long ullRequiredSize)
 {
 	TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard);
 
 	return m_spFeedbackHandler->NotEnoughSpace(strSrcPath, strDstPath, ullRequiredSize);
 }
 
-chcore::EFeedbackResult TFeedbackHandlerWrapper::OperationFinished()
+EFeedbackResult TFeedbackHandlerWrapper::OperationFinished()
 {
 	TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard);
 
 	return m_spFeedbackHandler->OperationFinished();
 }
 
-chcore::EFeedbackResult TFeedbackHandlerWrapper::OperationError()
+EFeedbackResult TFeedbackHandlerWrapper::OperationError()
 {
 	TScopedRunningTimeTrackerPause scopedTimePause(m_rTimeGuard);
 
Index: src/libchcore/TFileFilter.cpp
===================================================================
diff -u -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TFileFilter.cpp	(.../TFileFilter.cpp)	(revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834)
+++ src/libchcore/TFileFilter.cpp	(.../TFileFilter.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -760,7 +760,7 @@
 	m_bUseSize1 = bUseSize1;
 }
 
-chcore::TFileFilter::ESizeCompareType TFileFilter::GetSizeType1() const
+TFileFilter::ESizeCompareType TFileFilter::GetSizeType1() const
 {
 	return m_eSizeCmpType1;
 }
@@ -790,7 +790,7 @@
 	m_bUseSize2 = bUseSize2;
 }
 
-chcore::TFileFilter::ESizeCompareType TFileFilter::GetSizeType2() const
+TFileFilter::ESizeCompareType TFileFilter::GetSizeType2() const
 {
 	return m_eSizeCmpType2;
 }
Index: src/libchcore/TLogger.cpp
===================================================================
diff -u -r95e140c080a7424faba1bc9f35098e3cfd56d4e9 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TLogger.cpp	(.../TLogger.cpp)	(revision 95e140c080a7424faba1bc9f35098e3cfd56d4e9)
+++ src/libchcore/TLogger.cpp	(.../TLogger.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -29,7 +29,7 @@
 TLogger TLogger::S_Logger;
 
 // ============================================================================
-/// chcore::TLogger::TLogger
+/// TLogger::TLogger
 /// @date 2009/05/23
 ///
 /// @brief     Constructs the TLogger object.
@@ -40,7 +40,7 @@
 }
 
 // ============================================================================
-/// chcore::TLogger::Acquire
+/// TLogger::Acquire
 /// @date 2009/05/20
 ///
 /// @brief     Acquires logger object.
@@ -52,7 +52,7 @@
 }
 
 // ============================================================================
-/// chcore::TLogger::LogDebug
+/// TLogger::LogDebug
 /// @date 2009/05/20
 ///
 /// @brief     Logs an information to file (debug level).
@@ -70,7 +70,7 @@
 }
 
 // ============================================================================
-/// chcore::TLogger::LogInfo
+/// TLogger::LogInfo
 /// @date 2009/05/20
 ///
 /// @brief     Logs an information to the file (info level).
@@ -88,7 +88,7 @@
 }
 
 // ============================================================================
-/// chcore::TLogger::LogWarning
+/// TLogger::LogWarning
 /// @date 2009/05/20
 ///
 /// @brief     Logs an information to the file (info level).
@@ -106,7 +106,7 @@
 }
 
 // ============================================================================
-/// chcore::TLogger::LogError
+/// TLogger::LogError
 /// @date 2009/05/20
 ///
 /// @brief     Logs an information to the file (info level).
Index: src/libchcore/TModPathContainer.cpp
===================================================================
diff -u -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TModPathContainer.cpp	(.../TModPathContainer.cpp)	(revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834)
+++ src/libchcore/TModPathContainer.cpp	(.../TModPathContainer.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -147,7 +147,7 @@
 }
 
 // ============================================================================
-/// chcore::TModPathContainer::SetAt
+/// TModPathContainer::SetAt
 /// @date 2009/11/30
 ///
 /// @brief     Sets a path at a specified index.
@@ -164,7 +164,7 @@
 }
 
 // ============================================================================
-/// chcore::TModPathContainer::DeleteAt
+/// TModPathContainer::DeleteAt
 /// @date 2009/11/30
 ///
 /// @brief     Removes a path from container at specified index.
@@ -181,7 +181,7 @@
 }
 
 // ============================================================================
-/// chcore::TModPathContainer::Clear
+/// TModPathContainer::Clear
 /// @date 2009/11/30
 ///
 /// @brief     Removes all paths from this container.
@@ -205,7 +205,7 @@
 }
 
 // ============================================================================
-/// chcore::TModPathContainer::GetCount
+/// TModPathContainer::GetCount
 /// @date 2009/11/30
 ///
 /// @brief     Retrieves count of elements in the container.
@@ -217,7 +217,7 @@
 }
 
 // ============================================================================
-/// chcore::TModPathContainer::GetCount
+/// TModPathContainer::GetCount
 /// @date 2010/10/12
 ///
 /// @brief     Retrieves info if this container is empty.
Index: src/libchcore/TOverlappedDataBuffer.cpp
===================================================================
diff -u -r6103ac74583f2136b821dc67515ed8469abd8155 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TOverlappedDataBuffer.cpp	(.../TOverlappedDataBuffer.cpp)	(revision 6103ac74583f2136b821dc67515ed8469abd8155)
+++ src/libchcore/TOverlappedDataBuffer.cpp	(.../TOverlappedDataBuffer.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -75,7 +75,7 @@
 	ReleaseBuffer();
 }
 
-void chcore::TOverlappedDataBuffer::ReinitializeBuffer(size_t stNewBufferSize)
+void TOverlappedDataBuffer::ReinitializeBuffer(size_t stNewBufferSize)
 {
 	if (stNewBufferSize > m_stBufferSize)
 	{
@@ -103,17 +103,17 @@
 	return m_pBuffer;
 }
 
-void chcore::TOverlappedDataBuffer::RequeueAsEmpty()
+void TOverlappedDataBuffer::RequeueAsEmpty()
 {
 	m_pQueue->AddEmptyBuffer(this);
 }
 
-void chcore::TOverlappedDataBuffer::RequeueAsFull()
+void TOverlappedDataBuffer::RequeueAsFull()
 {
 	m_pQueue->AddFullBuffer(this);
 }
 
-void chcore::TOverlappedDataBuffer::RequeueAsFinished()
+void TOverlappedDataBuffer::RequeueAsFinished()
 {
 	m_pQueue->AddFinishedBuffer(this);
 }
Index: src/libchcore/TOverlappedDataBufferQueue.cpp
===================================================================
diff -u -r6103ac74583f2136b821dc67515ed8469abd8155 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TOverlappedDataBufferQueue.cpp	(.../TOverlappedDataBufferQueue.cpp)	(revision 6103ac74583f2136b821dc67515ed8469abd8155)
+++ src/libchcore/TOverlappedDataBufferQueue.cpp	(.../TOverlappedDataBufferQueue.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -29,7 +29,7 @@
 	return pBufferA->GetBufferOrder() < pBufferB->GetBufferOrder();
 }
 
-chcore::TOverlappedDataBufferQueue::TOverlappedDataBufferQueue() :
+TOverlappedDataBufferQueue::TOverlappedDataBufferQueue() :
 	m_eventReadPossible(true, true),
 	m_eventWritePossible(true, false),
 	m_eventWriteFinished(true, false),
Index: src/libchcore/TPath.cpp
===================================================================
diff -u -r2fe97a93f21771d75901d4b6559057d1ea055104 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TPath.cpp	(.../TPath.cpp)	(revision 2fe97a93f21771d75901d4b6559057d1ea055104)
+++ src/libchcore/TPath.cpp	(.../TPath.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -215,7 +215,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::FromString
+/// TSmartPath::FromString
 /// @date 2010/10/12
 ///
 /// @brief     Initializes this path object with path contained in string.
@@ -230,7 +230,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::FromString
+/// TSmartPath::FromString
 /// @date 2010/10/12
 ///
 /// @brief     Initializes this path object with path contained in string.
@@ -242,7 +242,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::ToString
+/// TSmartPath::ToString
 /// @date 2010/10/12
 ///
 /// @brief     Retrieves the pointer to a string containing path.
@@ -254,7 +254,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::ToString
+/// TSmartPath::ToString
 /// @date 2010/10/12
 ///
 /// @brief     Retrieves the string containing path.
@@ -338,7 +338,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::MakeRelativePath
+/// TSmartPath::MakeRelativePath
 /// @date 2010/10/12
 ///
 /// @brief     Converts this path to be relative to the reference, base path.
@@ -426,7 +426,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::IsNetworkPath
+/// TSmartPath::IsNetworkPath
 /// @date 2010/10/17
 ///
 /// @brief     Checks if the path is network one (\\server_name...)
@@ -438,7 +438,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::IsDrive
+/// TSmartPath::IsDrive
 /// @date 2011/04/05
 ///
 /// @brief     Checks if this path contains only drive specification (i.e. c:)
@@ -450,7 +450,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::HasDrive
+/// TSmartPath::HasDrive
 /// @date 2010/10/16
 ///
 /// @brief     Checks if path has a drive component.
@@ -462,7 +462,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::GetDrive
+/// TSmartPath::GetDrive
 /// @date 2010/10/16
 ///
 /// @brief     Retrieves drive from path.
@@ -482,7 +482,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::GetDriveLetter
+/// TSmartPath::GetDriveLetter
 /// @date 2011/07/17
 ///
 /// @brief     Retrieves drive letter from path.
@@ -502,7 +502,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::IsServerName
+/// TSmartPath::IsServerName
 /// @date 2011/04/05
 ///
 /// @brief     Checks if this path contains only the server specification (i.e. \\server - witn no ending backslash)
@@ -517,7 +517,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::HasServerName
+/// TSmartPath::HasServerName
 /// @date 2010/10/17
 ///
 /// @brief     
@@ -529,7 +529,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::GetServerName
+/// TSmartPath::GetServerName
 /// @date 2010/10/17
 ///
 /// @brief     Retrieves server name from path (if network path).
@@ -552,7 +552,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::HasFileRoot
+/// TSmartPath::HasFileRoot
 /// @date 2010/10/17
 ///
 /// @brief     Checks if this path has a file root part.
@@ -565,7 +565,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::GetFileRoot
+/// TSmartPath::GetFileRoot
 /// @date 2010/10/17
 ///
 /// @brief     Retrieves the root of the file.
@@ -581,7 +581,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::HasFileDir
+/// TSmartPath::HasFileDir
 /// @date 2010/10/16
 ///
 /// @brief     Checks if path contains directory specification.
@@ -600,7 +600,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::GetFileDir
+/// TSmartPath::GetFileDir
 /// @date 2010/10/16
 ///
 /// @brief     Retrieves the directory specification from path.
@@ -624,7 +624,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::HasFileTitle
+/// TSmartPath::HasFileTitle
 /// @date 2010/10/16
 ///
 /// @brief     Checks if the path has file title part.
@@ -645,7 +645,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::GetFileTitle
+/// TSmartPath::GetFileTitle
 /// @date 2010/10/16
 ///
 /// @brief     Retrieves file title from path.
@@ -668,7 +668,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::HasExtension
+/// TSmartPath::HasExtension
 /// @date 2010/10/16
 ///
 /// @brief     Checks if this path has a file extension.
@@ -682,7 +682,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::GetExtension
+/// TSmartPath::GetExtension
 /// @date 2010/10/16
 ///
 /// @brief     Retrieves file extension from this path.
@@ -699,7 +699,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::HasFileName
+/// TSmartPath::HasFileName
 /// @date 2010/10/16
 ///
 /// @brief     Checks if this path contains filename part.
@@ -715,7 +715,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::GetFileName
+/// TSmartPath::GetFileName
 /// @date 2010/10/16
 ///
 /// @brief     Retrieves filename part of this path.
@@ -731,7 +731,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::DeleteFileName
+/// TSmartPath::DeleteFileName
 /// @date 2010/10/17
 ///
 /// @brief     Deletes the filename part of this path if exists.
@@ -749,7 +749,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::EndsWithSeparator
+/// TSmartPath::EndsWithSeparator
 /// @date 2010/10/16
 ///
 /// @brief     Checks if path end with a path separator (/ or \)
@@ -768,7 +768,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::AppendSeparatorIfDoesNotExist
+/// TSmartPath::AppendSeparatorIfDoesNotExist
 /// @date 2010/10/16
 ///
 /// @brief     Appends separator to this path if does not exist already.
@@ -780,7 +780,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::StripSeparatorAtEnd
+/// TSmartPath::StripSeparatorAtEnd
 /// @date 2010/10/17
 ///
 /// @brief     Strips separator at the end of path if exists.
@@ -792,7 +792,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::StartsWithSeparator
+/// TSmartPath::StartsWithSeparator
 /// @date 2010/10/16
 ///
 /// @brief     Checks if path starts with a separator.
@@ -808,7 +808,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::PrependSeparatorIfDoesNotExist
+/// TSmartPath::PrependSeparatorIfDoesNotExist
 /// @date 2010/10/17
 ///
 /// @brief     Prepends a separator to this path if not exist already.
@@ -820,7 +820,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::StripSeparatorAtFront
+/// TSmartPath::StripSeparatorAtFront
 /// @date 2010/10/17
 ///
 /// @brief     Strips separator at the front of this path (if exists).
@@ -843,7 +843,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::GetLength
+/// TSmartPath::GetLength
 /// @date 2011/04/05
 ///
 /// @brief     Retrieves path length in characters.
@@ -855,7 +855,7 @@
 }
 
 // ============================================================================
-/// chcore::TSmartPath::IsSeparator
+/// TSmartPath::IsSeparator
 /// @date 2010/10/17
 ///
 /// @brief     Checks if the character is a separator.
@@ -873,7 +873,7 @@
 }
 
 // ============================================================================
-/// chcore::PathFromString
+/// PathFromString
 /// @date 2010/10/12
 ///
 /// @brief     Creates a path object from string.
@@ -891,7 +891,7 @@
 }
 
 // ============================================================================
-/// chcore::PathFromWString
+/// PathFromWString
 /// @date 2010/10/12
 ///
 /// @brief     Creates a path object from string.
Index: src/libchcore/TPathContainer.cpp
===================================================================
diff -u -rb1e03eb232a784d6e2d40f67cbbbb33be0972228 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TPathContainer.cpp	(.../TPathContainer.cpp)	(revision b1e03eb232a784d6e2d40f67cbbbb33be0972228)
+++ src/libchcore/TPathContainer.cpp	(.../TPathContainer.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -123,7 +123,7 @@
 }
 
 // ============================================================================
-/// chcore::TPathContainer::SetAt
+/// TPathContainer::SetAt
 /// @date 2009/11/30
 ///
 /// @brief     Sets a path at a specified index.
@@ -139,7 +139,7 @@
 }
 
 // ============================================================================
-/// chcore::TPathContainer::DeleteAt
+/// TPathContainer::DeleteAt
 /// @date 2009/11/30
 ///
 /// @brief     Removes a path from container at specified index.
@@ -154,7 +154,7 @@
 }
 
 // ============================================================================
-/// chcore::TPathContainer::Clear
+/// TPathContainer::Clear
 /// @date 2009/11/30
 ///
 /// @brief     Removes all paths from this container.
@@ -165,7 +165,7 @@
 }
 
 // ============================================================================
-/// chcore::TPathContainer::GetCount
+/// TPathContainer::GetCount
 /// @date 2009/11/30
 ///
 /// @brief     Retrieves count of elements in the container.
@@ -177,7 +177,7 @@
 }
 
 // ============================================================================
-/// chcore::TPathContainer::GetCount
+/// TPathContainer::GetCount
 /// @date 2010/10/12
 ///
 /// @brief     Retrieves info if this container is empty.
Index: src/libchcore/TSQLiteDatabase.cpp
===================================================================
diff -u -r9479911a096555a7504c5c8a8eaee83ecb63440c -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TSQLiteDatabase.cpp	(.../TSQLiteDatabase.cpp)	(revision 9479911a096555a7504c5c8a8eaee83ecb63440c)
+++ src/libchcore/TSQLiteDatabase.cpp	(.../TSQLiteDatabase.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -61,7 +61,7 @@
 		m_bInTransaction = bInTransaction;
 	}
 
-	chcore::TSmartPath TSQLiteDatabase::GetLocation() const
+	TSmartPath TSQLiteDatabase::GetLocation() const
 	{
 		return m_pathDatabase;
 	}
Index: src/libchcore/TSQLiteSerializer.cpp
===================================================================
diff -u -r7b830c34855c8aaa81aac2c6e0ca0fa6bae95e66 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TSQLiteSerializer.cpp	(.../TSQLiteSerializer.cpp)	(revision 7b830c34855c8aaa81aac2c6e0ca0fa6bae95e66)
+++ src/libchcore/TSQLiteSerializer.cpp	(.../TSQLiteSerializer.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -61,7 +61,7 @@
 	return iterMap->second;
 }
 
-chcore::TSmartPath TSQLiteSerializer::GetLocation() const
+TSmartPath TSQLiteSerializer::GetLocation() const
 {
 	return m_spDatabase->GetLocation();
 }
Index: src/libchcore/TSQLiteSerializerFactory.cpp
===================================================================
diff -u -rcdb4c898156398dd4f4bf8abd7c854eff42f6ae2 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TSQLiteSerializerFactory.cpp	(.../TSQLiteSerializerFactory.cpp)	(revision cdb4c898156398dd4f4bf8abd7c854eff42f6ae2)
+++ src/libchcore/TSQLiteSerializerFactory.cpp	(.../TSQLiteSerializerFactory.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -40,7 +40,7 @@
 {
 }
 
-chcore::ISerializerPtr TSQLiteSerializerFactory::CreateTaskManagerSerializer(bool bForceRecreate)
+ISerializerPtr TSQLiteSerializerFactory::CreateTaskManagerSerializer(bool bForceRecreate)
 {
 	TSmartPath pathTaskManager = m_pathSerializeDir + PathFromString(_T("tasks.sqlite"));
 
@@ -61,7 +61,7 @@
 	return spSerializer;
 }
 
-chcore::ISerializerPtr TSQLiteSerializerFactory::CreateTaskSerializer(const TString& strNameHint, bool bForceRecreate)
+ISerializerPtr TSQLiteSerializerFactory::CreateTaskSerializer(const TString& strNameHint, bool bForceRecreate)
 {
 	TString strName(strNameHint);
 	if (strName.IsEmpty())
Index: src/libchcore/TSubTaskContext.cpp
===================================================================
diff -u -r7d59ab9183c933f2fc2682a95fb5d26cf2f952d7 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TSubTaskContext.cpp	(.../TSubTaskContext.cpp)	(revision 7d59ab9183c933f2fc2682a95fb5d26cf2f952d7)
+++ src/libchcore/TSubTaskContext.cpp	(.../TSubTaskContext.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -58,12 +58,12 @@
 	return m_rConfig;
 }
 
-chcore::EOperationType TSubTaskContext::GetOperationType() const
+EOperationType TSubTaskContext::GetOperationType() const
 {
 	return m_eOperationType;
 }
 
-void TSubTaskContext::SetOperationType(chcore::EOperationType eOperationType)
+void TSubTaskContext::SetOperationType(EOperationType eOperationType)
 {
 	m_eOperationType = eOperationType;
 }
@@ -83,7 +83,7 @@
 	return m_tFilesCache;
 }
 
-chcore::TSmartPath TSubTaskContext::GetDestinationPath() const
+TSmartPath TSubTaskContext::GetDestinationPath() const
 {
 	return m_pathDestination;
 }
Index: src/libchcore/TSubTaskContext.h
===================================================================
diff -u -r7d59ab9183c933f2fc2682a95fb5d26cf2f952d7 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TSubTaskContext.h	(.../TSubTaskContext.h)	(revision 7d59ab9183c933f2fc2682a95fb5d26cf2f952d7)
+++ src/libchcore/TSubTaskContext.h	(.../TSubTaskContext.h)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -58,8 +58,8 @@
 	TConfig& GetConfig();
 	const TConfig& GetConfig() const;
 
-	chcore::EOperationType GetOperationType() const;
-	void SetOperationType(chcore::EOperationType eOperationType);
+	EOperationType GetOperationType() const;
+	void SetOperationType(EOperationType eOperationType);
 
 	TBasePathDataContainerPtr GetBasePaths() const;
 
Index: src/libchcore/TSubTaskStatsInfo.cpp
===================================================================
diff -u -rc66b22f786f8434075a09e92de52bba8a53a85db -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TSubTaskStatsInfo.cpp	(.../TSubTaskStatsInfo.cpp)	(revision c66b22f786f8434075a09e92de52bba8a53a85db)
+++ src/libchcore/TSubTaskStatsInfo.cpp	(.../TSubTaskStatsInfo.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -148,7 +148,7 @@
 		THROW_CORE_EXCEPTION(eErr_InternalProblem);
 }
 
-chcore::file_count_t TSubTaskStatsInfo::GetTotalCount() const
+file_count_t TSubTaskStatsInfo::GetTotalCount() const
 {
 	boost::shared_lock<boost::shared_mutex> lock(m_lock);
 	return m_fcTotalCount;
@@ -420,7 +420,7 @@
 	m_fcCurrentIndex = fcIndex;
 }
 
-chcore::file_count_t TSubTaskStatsInfo::GetCurrentIndex() const
+file_count_t TSubTaskStatsInfo::GetCurrentIndex() const
 {
 	boost::shared_lock<boost::shared_mutex> lock(m_lock);
 	return m_fcCurrentIndex.Get();
Index: src/libchcore/TSubTaskStatsSnapshot.h
===================================================================
diff -u -rd76d3ce6c8c55fa23009dbb03b8bc06f482c5b72 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TSubTaskStatsSnapshot.h	(.../TSubTaskStatsSnapshot.h)	(revision d76d3ce6c8c55fa23009dbb03b8bc06f482c5b72)
+++ src/libchcore/TSubTaskStatsSnapshot.h	(.../TSubTaskStatsSnapshot.h)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -92,8 +92,8 @@
 	double GetAvgSizeSpeed() const;
 	double GetAvgCountSpeed() const;
 
-	chcore::ESubOperationType GetSubOperationType() const { return m_eSubOperationType; }
-	void SetSubOperationType(chcore::ESubOperationType val) { m_eSubOperationType = val; }
+	ESubOperationType GetSubOperationType() const { return m_eSubOperationType; }
+	void SetSubOperationType(ESubOperationType val) { m_eSubOperationType = val; }
 
 private:
 	double CalculateProgress() const;
Index: src/libchcore/TTask.cpp
===================================================================
diff -u -r2e384de25de613cb582a966df7d1cb9468f1c825 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TTask.cpp	(.../TTask.cpp)	(revision 2e384de25de613cb582a966df7d1cb9468f1c825)
+++ src/libchcore/TTask.cpp	(.../TTask.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -169,7 +169,7 @@
 		m_tSubTaskContext.SetDestinationPath(m_tBaseData.GetDestinationPath());
 		m_tSubTaskContext.SetOperationType(m_tSubTasksArray.GetOperationType());
 	}
-	catch(const chcore::TBaseException& e)
+	catch(const TBaseException& e)
 	{
 		SetTaskState(eTaskState_LoadError);
 		bLoadFailed = true;
@@ -643,12 +643,12 @@
 	return m_tLocalStats.IsRunning();
 }
 
-chcore::TSmartPath TTask::GetLogPath() const
+TSmartPath TTask::GetLogPath() const
 {
 	return m_tBaseData.GetLogPath();
 }
 
-chcore::TString chcore::TTask::GetTaskName() const
+TString TTask::GetTaskName() const
 {
 	return m_tBaseData.GetTaskName();
 }
@@ -658,7 +658,7 @@
 	m_tBaseData.SetLogPath(pathLog);
 }
 
-chcore::ISerializerPtr TTask::GetSerializer() const
+ISerializerPtr TTask::GetSerializer() const
 {
 	return m_spSerializer;
 }
Index: src/libchcore/TTaskBaseData.cpp
===================================================================
diff -u -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TTaskBaseData.cpp	(.../TTaskBaseData.cpp)	(revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834)
+++ src/libchcore/TTaskBaseData.cpp	(.../TTaskBaseData.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -38,7 +38,7 @@
 {
 }
 
-chcore::TString TTaskBaseData::GetTaskName() const
+TString TTaskBaseData::GetTaskName() const
 {
 	return m_strTaskName;
 }
@@ -48,7 +48,7 @@
 	m_strTaskName = strTaskName;
 }
 
-chcore::ETaskCurrentState TTaskBaseData::GetCurrentState() const
+ETaskCurrentState TTaskBaseData::GetCurrentState() const
 {
 	return m_eCurrentState;
 }
@@ -58,7 +58,7 @@
 	m_eCurrentState = eCurrentState;
 }
 
-chcore::TSmartPath TTaskBaseData::GetLogPath() const
+TSmartPath TTaskBaseData::GetLogPath() const
 {
 	return m_pathLog;
 }
@@ -68,7 +68,7 @@
 	m_pathLog = pathLog;
 }
 
-chcore::TSmartPath TTaskBaseData::GetDestinationPath() const
+TSmartPath TTaskBaseData::GetDestinationPath() const
 {
 	return m_pathDestinationPath;
 }
Index: src/libchcore/TTaskConfiguration.h
===================================================================
diff -u -r6103ac74583f2136b821dc67515ed8469abd8155 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TTaskConfiguration.h	(.../TTaskConfiguration.h)	(revision 6103ac74583f2136b821dc67515ed8469abd8155)
+++ src/libchcore/TTaskConfiguration.h	(.../TTaskConfiguration.h)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -128,7 +128,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////
 // Properties retrieval
 template<ETaskOptions PropID>
-typename TaskPropData<PropID>::value_type GetTaskPropValue(const chcore::TConfig& rConfig)
+typename TaskPropData<PropID>::value_type GetTaskPropValue(const TConfig& rConfig)
 {
 	typename TaskPropData<PropID>::value_type tValue;
 	bool bResult = GetConfigValue(rConfig, TaskPropData<PropID>::GetPropertyName(), tValue);
@@ -140,7 +140,7 @@
 }
 
 template<ETaskOptions PropID>
-bool GetTaskPropValue(const chcore::TConfig& rConfig, typename TaskPropData<PropID>::value_type& rValue)
+bool GetTaskPropValue(const TConfig& rConfig, typename TaskPropData<PropID>::value_type& rValue)
 {
 	bool bResult = GetConfigValue(rConfig, TaskPropData<PropID>::GetPropertyName(), rValue);
 	if(bResult)
@@ -149,7 +149,7 @@
 }
 
 template<ETaskOptions PropID>
-void SetTaskPropValue(chcore::TConfig& rConfig, const typename TaskPropData<PropID>::value_type& rValue)
+void SetTaskPropValue(TConfig& rConfig, const typename TaskPropData<PropID>::value_type& rValue)
 {
 	SetConfigValue(rConfig, TaskPropData<PropID>::GetPropertyName(), rValue);
 }
Index: src/libchcore/TTaskDefinition.cpp
===================================================================
diff -u -r2e384de25de613cb582a966df7d1cb9468f1c825 -r11b0a299be97bc3afaa633d6522c17b214ba3b79
--- src/libchcore/TTaskDefinition.cpp	(.../TTaskDefinition.cpp)	(revision 2e384de25de613cb582a966df7d1cb9468f1c825)
+++ src/libchcore/TTaskDefinition.cpp	(.../TTaskDefinition.cpp)	(revision 11b0a299be97bc3afaa633d6522c17b214ba3b79)
@@ -251,7 +251,7 @@
 	tTaskInfo.WriteToString(strOutput);
 }
 
-void chcore::TTaskDefinition::Store(const TSmartPath& strPath) const
+void TTaskDefinition::Store(const TSmartPath& strPath) const
 {
 	TConfig tTaskInfo;
 	Store(tTaskInfo);
@@ -260,7 +260,7 @@
 	tTaskInfo.Write();
 }
 
-void chcore::TTaskDefinition::Store(TConfig& rConfig) const
+void TTaskDefinition::Store(TConfig& rConfig) const
 {
 	// get information from config file
 	// task unique id - use if provided, generate otherwise