Index: src/ch/task.h
===================================================================
diff -u -N -r3aed0979e4af7cf1ab8083b835216b1edf5aba59 -r2996cfa8b8db93f1b06a4e5f142ab74a23f67235
--- src/ch/task.h	(.../task.h)	(revision 3aed0979e4af7cf1ab8083b835216b1edf5aba59)
+++ src/ch/task.h	(.../task.h)	(revision 2996cfa8b8db93f1b06a4e5f142ab74a23f67235)
@@ -199,13 +199,13 @@
 };
 
 ///////////////////////////////////////////////////////////////////////////
-// TTaskProgressInfo
+// TTaskBasicProgressInfo
 
-class TTaskProgressInfo
+class TTaskBasicProgressInfo
 {
 public:
-	TTaskProgressInfo();
-	~TTaskProgressInfo();
+	TTaskBasicProgressInfo();
+	~TTaskBasicProgressInfo();
 
 	void SetCurrentIndex(size_t stIndex);	// might be unneeded when serialization is implemented
 	void IncreaseCurrentIndex();
@@ -303,7 +303,7 @@
 	mutable boost::shared_mutex m_lock;
 };
 
-class TTaskConfiguration
+class TTaskBasicConfiguration
 {
 public:
 	enum EFlags
@@ -315,8 +315,8 @@
 	};
 
 public:
-	TTaskConfiguration();
-	~TTaskConfiguration();
+	TTaskBasicConfiguration();
+	~TTaskBasicConfiguration();
 
 	bool GetIgnoreDirectories() const;
 	void SetIgnoreDirectories(bool bIgnoreDirectories);
@@ -375,8 +375,8 @@
 	void SetOperationType(EOperationType eOperationType);
 	EOperationType GetOperationType() const;
 
-	void SetTaskConfiguration(const TTaskConfiguration& tTaskConfiguration);
-	const TTaskConfiguration& GetTaskConfiguration() const;
+	void SetTaskBasicConfiguration(const TTaskBasicConfiguration& TTaskBasicConfiguration);
+	const TTaskBasicConfiguration& GetTaskBasicConfiguration() const;
 
 	// m_nBufferSize
 	void SetBufferSizes(const BUFFERSIZES* bsSizes);
@@ -519,9 +519,9 @@
 
 	TOperationDescription m_tOperation;		// manages the operation and its suboperations
 
-	TTaskConfiguration m_tTaskConfig;		// task configuration options
+	TTaskBasicConfiguration m_tTaskConfig;		// task configuration options
 
-	TTaskProgressInfo m_tTaskProgressInfo;	// task progress information
+	TTaskBasicProgressInfo m_TTaskBasicProgressInfo;	// task progress information
 
 	// task control variables (per-session state)
 	TTaskLocalStats m_localStats;       // local statistics