35 files changed, 806 insertions, 806 deletions

diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt
index c0cd7cef6..60c4d1436 100644
--- a/src/modules/dcc/CMakeLists.txt
+++ b/src/modules/dcc/CMakeLists.txt
@@ -1,44 +1,44 @@
 # CMakeLists for src/modules/dcc
 
 SET(kvidcc_MOC_HDRS
-	broker.h
-	chat.h
-	dialogs.h
-	marshal.h
-	send.h
-	voice.h
-	window.h
+	DccBroker.h
+	DccChatWindow.h
+	DccDialog.h
+	DccMarshal.h
+	DccFileTransfer.h
+	DccVoiceWindow.h
+	DccWindow.h
 )
 
 IF(NOT DEFINED COMPILE_DISABLE_DCC_VIDEO) 
         LIST(APPEND kvidcc_MOC_HDRS 
-                video.h 
+                DccVideoWindow.h 
         ) 
 ENDIF() 
 
 SET(kvidcc_SRCS
-	adpcmcodec.cpp
-	broker.cpp
-	canvas.cpp
+	DccVoiceAdpcmCodec.cpp
+	DccBroker.cpp
+	DccCanvasWindow.cpp
 	canvaswidget.cpp
-	chat.cpp
-	codec.cpp
-	descriptor.cpp
-	dialogs.cpp
-	gsmcodec.cpp
+	DccChatWindow.cpp
+	DccVoiceCodec.cpp
+	DccDescriptor.cpp
+	DccDialog.cpp
+	DccVoiceGsmCodec.cpp
 	libkvidcc.cpp
-	marshal.cpp
+	DccMarshal.cpp
 	requests.cpp
-	send.cpp
-	thread.cpp
-	utils.cpp
-	voice.cpp
-	window.cpp
+	DccFileTransfer.cpp
+	DccThread.cpp
+	DccUtils.cpp
+	DccVoiceWindow.cpp
+	DccWindow.cpp
 )
 
 IF(NOT DEFINED COMPILE_DISABLE_DCC_VIDEO) 
         LIST(APPEND kvidcc_SRCS 
-                video.cpp 
+                DccVideoWindow.cpp 
         ) 
 ENDIF()
 
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/DccBroker.cpp
index db56e1fe7..3f9191f78 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/DccBroker.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : broker.cpp
+//   File : DccBroker.cpp
 //   Creation date : Tue Sep 19 09 2000 10:21:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,18 +24,18 @@
 
 #include "kvi_settings.h"
 
-#include "broker.h"
-#include "dialogs.h"
-#include "chat.h"
-#include "send.h"
-#include "voice.h"
+#include "DccBroker.h"
+#include "DccDialog.h"
+#include "DccChatWindow.h"
+#include "DccFileTransfer.h"
+#include "DccVoiceWindow.h"
 
 #ifndef COMPILE_DISABLE_DCC_VIDEO
-	#include "video.h"
+	#include "DccVideoWindow.h"
 #endif
 
 #ifdef COMPILE_DCC_CANVAS
-	#include "canvas.h"
+	#include "DccCanvasWindow.h"
 #endif
 
 #include "KviApplication.h"
@@ -58,13 +58,13 @@ extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 
 //#warning "The broker might lookup the remote host name"
 
-KviDccBroker::KviDccBroker()
+DccBroker::DccBroker()
 : QObject(0)
 {
 	setObjectName("dcc_broker");
-	KviDccFileTransfer::init();
+	DccFileTransfer::init();
 
-	m_pBoxList = new KviPointerList<KviDccBox>;
+	m_pBoxList = new KviPointerList<DccDialog>;
 	m_pBoxList->setAutoDelete(false);
 
 	m_pDccWindowList = new KviPointerList<KviWindow>;
@@ -74,7 +74,7 @@ KviDccBroker::KviDccBroker()
 	m_pZeroPortTags->setAutoDelete(true);
 }
 
-KviDccBroker::~KviDccBroker()
+DccBroker::~DccBroker()
 {
 	delete m_pZeroPortTags;
 	while(m_pBoxList->first())delete m_pBoxList->first();
@@ -82,11 +82,11 @@ KviDccBroker::~KviDccBroker()
 	m_pBoxList = 0;
 	while(m_pDccWindowList->first())delete m_pDccWindowList->first();
 	delete m_pDccWindowList;
-	KviDccFileTransfer::done();
+	DccFileTransfer::done();
 }
 
 
-KviDccZeroPortTag * KviDccBroker::addZeroPortTag()
+KviDccZeroPortTag * DccBroker::addZeroPortTag()
 {
 	static unsigned int g_uNextZeroPortTag = 0;
 	g_uNextZeroPortTag++;
@@ -100,7 +100,7 @@ KviDccZeroPortTag * KviDccBroker::addZeroPortTag()
 	return t;
 }
 
-KviDccZeroPortTag * KviDccBroker::findZeroPortTag(const QString &szTag)
+KviDccZeroPortTag * DccBroker::findZeroPortTag(const QString &szTag)
 {
 	KviDccZeroPortTag * t = m_pZeroPortTags->find(szTag);
 	if(!t)return 0;
@@ -113,34 +113,34 @@ KviDccZeroPortTag * KviDccBroker::findZeroPortTag(const QString &szTag)
 	return t;
 }
 
-void KviDccBroker::removeZeroPortTag(const QString &szTag)
+void DccBroker::removeZeroPortTag(const QString &szTag)
 {
 	m_pZeroPortTags->remove(szTag);
 }
 
-unsigned int KviDccBroker::dccBoxCount()
+unsigned int DccBroker::dccBoxCount()
 {
 	return m_pBoxList->count();
 }
 
-void KviDccBroker::unregisterDccWindow(KviWindow *wnd)
+void DccBroker::unregisterDccWindow(KviWindow *wnd)
 {
 	m_pDccWindowList->removeRef(wnd);
 }
 
-void KviDccBroker::unregisterDccBox(KviDccBox * box)
+void DccBroker::unregisterDccBox(DccDialog * box)
 {
 	//qDebug("Forgetting box %d",box);
 	m_pBoxList->removeRef(box);
 }
 
-void KviDccBroker::cancelDcc(KviDccDescriptor * dcc)
+void DccBroker::cancelDcc(DccDescriptor * dcc)
 {
 	delete dcc;
 	dcc = 0;
 }
 
-void KviDccBroker::cancelDcc(KviDccBox *box,KviDccDescriptor * dcc)
+void DccBroker::cancelDcc(DccDialog *box,DccDescriptor * dcc)
 {
 	if(box)box->forgetDescriptor();
 	delete dcc;
@@ -151,7 +151,7 @@ void KviDccBroker::cancelDcc(KviDccBox *box,KviDccDescriptor * dcc)
 // RSEND
 ///////////////////////////////////////////////////////////////////////////////
 
-void KviDccBroker::rsendManage(KviDccDescriptor * dcc)
+void DccBroker::rsendManage(DccDescriptor * dcc)
 {
 	// We need the filename...
 	QFileInfo fi(dcc->szLocalFileName);
@@ -159,7 +159,7 @@ void KviDccBroker::rsendManage(KviDccDescriptor * dcc)
 	else rsendAskForFileName(dcc);
 }
 
-void KviDccBroker::rsendAskForFileName(KviDccDescriptor * dcc)
+void DccBroker::rsendAskForFileName(DccDescriptor * dcc)
 {
 	QStringList filenames;
 	if(
@@ -168,11 +168,11 @@ void KviDccBroker::rsendAskForFileName(KviDccDescriptor * dcc)
 		) {
 			if(filenames.count() > 0)
 			{
-				KviDccDescriptor * d;
+				DccDescriptor * d;
 				QStringList::Iterator it=filenames.begin();
 				while(it != filenames.end())
 				{
-					d = new KviDccDescriptor(*dcc);
+					d = new DccDescriptor(*dcc);
 					d->szLocalFileName = *(it);
 					d->szLocalFileName.trimmed();
 					++it;
@@ -188,7 +188,7 @@ void KviDccBroker::rsendAskForFileName(KviDccDescriptor * dcc)
 	}
 }
 
-void KviDccBroker::rsendExecute(KviDccDescriptor * dcc)
+void DccBroker::rsendExecute(DccDescriptor * dcc)
 {
 	if(!g_pApp->windowExists(dcc->console()))
 	{
@@ -255,7 +255,7 @@ void KviDccBroker::rsendExecute(KviDccDescriptor * dcc)
 	delete dcc;
 }
 
-void KviDccBroker::rsendExecute(KviDccBox * box,KviDccDescriptor * dcc)
+void DccBroker::rsendExecute(DccDialog * box,DccDescriptor * dcc)
 {
 	if(box)box->forgetDescriptor();
 	rsendExecute(dcc);
@@ -266,7 +266,7 @@ void KviDccBroker::rsendExecute(KviDccBox * box,KviDccDescriptor * dcc)
 // DCC CHAT
 ///////////////////////////////////////////////////////////////////////////////
 
-void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc)
+void DccBroker::handleChatRequest(DccDescriptor * dcc)
 {
 	if(!dcc->bAutoAccept)
 	{
@@ -295,13 +295,13 @@ void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc)
 
 		QString caption = __tr2qs_ctx("DCC %1 Request - KVIrc","dcc").arg(dcc->szType);
 
-		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,caption);
+		DccAcceptDialog * box = new DccAcceptDialog(this,dcc,tmp,caption);
 
 		m_pBoxList->append(box);
-		connect(box,SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
-				this,SLOT(executeChat(KviDccBox *,KviDccDescriptor *)));
-		connect(box,SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
-				this,SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
+		connect(box,SIGNAL(accepted(DccDialog *,DccDescriptor *)),
+				this,SLOT(executeChat(DccDialog *,DccDescriptor *)));
+		connect(box,SIGNAL(rejected(DccDialog *,DccDescriptor *)),
+				this,SLOT(cancelDcc(DccDialog *,DccDescriptor *)));
 		box->show();
 	} else {
 		// auto accept
@@ -309,7 +309,7 @@ void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc)
 	}
 }
 
-void KviDccBroker::executeChat(KviDccBox *box,KviDccDescriptor * dcc)
+void DccBroker::executeChat(DccDialog *box,DccDescriptor * dcc)
 {
 	if(box)box->forgetDescriptor();
 
@@ -323,7 +323,7 @@ void KviDccBroker::executeChat(KviDccBox *box,KviDccDescriptor * dcc)
 	szSubProto.toLower();
 
 	QString tmp = QString("dcc: %1 %2@%3:%4").arg(szSubProto.ptr(), dcc->szNick, dcc->szIp, dcc->szPort);
-	KviDccChat * chat = new KviDccChat(dcc->console()->frame(),dcc,tmp.toUtf8().data());
+	DccChatWindow * chat = new DccChatWindow(dcc->console()->frame(),dcc,tmp.toUtf8().data());
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
 			(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat) || \
@@ -338,7 +338,7 @@ void KviDccBroker::executeChat(KviDccBox *box,KviDccDescriptor * dcc)
 // ACTIVE VOICE
 ///////////////////////////////////////////////////////////////////////////////
 
-void KviDccBroker::activeVoiceManage(KviDccDescriptor * dcc)
+void DccBroker::activeVoiceManage(DccDescriptor * dcc)
 {
 	if(!dcc->bAutoAccept)
 	{
@@ -350,12 +350,12 @@ void KviDccBroker::activeVoiceManage(KviDccDescriptor * dcc)
 				,"dcc" \
 			).arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szIp, dcc->szPort);
 
-		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC VOICE request","dcc"));
+		DccAcceptDialog * box = new DccAcceptDialog(this,dcc,tmp,__tr2qs_ctx("DCC VOICE request","dcc"));
 		m_pBoxList->append(box);
-		connect(box,SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
-				this,SLOT(activeVoiceExecute(KviDccBox *,KviDccDescriptor *)));
-		connect(box,SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
-				this,SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
+		connect(box,SIGNAL(accepted(DccDialog *,DccDescriptor *)),
+				this,SLOT(activeVoiceExecute(DccDialog *,DccDescriptor *)));
+		connect(box,SIGNAL(rejected(DccDialog *,DccDescriptor *)),
+				this,SLOT(cancelDcc(DccDialog *,DccDescriptor *)));
 		box->show();
 	} else {
 		// auto accept
@@ -363,7 +363,7 @@ void KviDccBroker::activeVoiceManage(KviDccDescriptor * dcc)
 	}
 }
 
-void KviDccBroker::activeVoiceExecute(KviDccBox *box,KviDccDescriptor * dcc)
+void DccBroker::activeVoiceExecute(DccDialog *box,DccDescriptor * dcc)
 {
 	if(box)box->forgetDescriptor();
 
@@ -374,7 +374,7 @@ void KviDccBroker::activeVoiceExecute(KviDccBox *box,KviDccDescriptor * dcc)
 	}
 
 	KviCString tmp(KviCString::Format,"dcc: voice %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	KviDccVoice * v = new KviDccVoice(dcc->console()->frame(),dcc,tmp.ptr());
+	DccVoiceWindow * v = new DccVoiceWindow(dcc->console()->frame(),dcc,tmp.ptr());
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
 			(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice) || \
@@ -391,10 +391,10 @@ void KviDccBroker::activeVoiceExecute(KviDccBox *box,KviDccDescriptor * dcc)
 // PASSIVE VOICE
 ///////////////////////////////////////////////////////////////////////////////
 
-void KviDccBroker::passiveVoiceExecute(KviDccDescriptor * dcc)
+void DccBroker::passiveVoiceExecute(DccDescriptor * dcc)
 {
 	KviCString tmp(KviCString::Format,"dcc: voice %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	KviDccVoice * v = new KviDccVoice(dcc->console()->frame(),dcc,tmp.ptr());
+	DccVoiceWindow * v = new DccVoiceWindow(dcc->console()->frame(),dcc,tmp.ptr());
 	//#warning "Create minimized dcc voice ?... or maybe it's too much ? :)"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat);
 	dcc->console()->frame()->addWindow(v,!bMinimized);
@@ -408,7 +408,7 @@ void KviDccBroker::passiveVoiceExecute(KviDccDescriptor * dcc)
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef COMPILE_DISABLE_DCC_VIDEO
-void KviDccBroker::activeVideoManage(KviDccDescriptor * dcc)
+void DccBroker::activeVideoManage(DccDescriptor * dcc)
 {
 	if(!dcc->bAutoAccept)
 	{
@@ -420,12 +420,12 @@ void KviDccBroker::activeVideoManage(KviDccDescriptor * dcc)
 				,"dcc" \
 			).arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szIp, dcc->szPort);
 
-		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC VIDEO request","dcc"));
+		DccAcceptDialog * box = new DccAcceptDialog(this,dcc,tmp,__tr2qs_ctx("DCC VIDEO request","dcc"));
 		m_pBoxList->append(box);
-		connect(box,SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
-				this,SLOT(activeVideoExecute(KviDccBox *,KviDccDescriptor *)));
-		connect(box,SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
-				this,SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
+		connect(box,SIGNAL(accepted(DccDialog *,DccDescriptor *)),
+				this,SLOT(activeVideoExecute(DccDialog *,DccDescriptor *)));
+		connect(box,SIGNAL(rejected(DccDialog *,DccDescriptor *)),
+				this,SLOT(cancelDcc(DccDialog *,DccDescriptor *)));
 		box->show();
 	} else {
 		// auto accept
@@ -433,7 +433,7 @@ void KviDccBroker::activeVideoManage(KviDccDescriptor * dcc)
 	}
 }
 
-void KviDccBroker::activeVideoExecute(KviDccBox *box,KviDccDescriptor * dcc)
+void DccBroker::activeVideoExecute(DccDialog *box,DccDescriptor * dcc)
 {
 	if(box)box->forgetDescriptor();
 
@@ -444,7 +444,7 @@ void KviDccBroker::activeVideoExecute(KviDccBox *box,KviDccDescriptor * dcc)
 	}
 
 	KviCString tmp(KviCString::Format,"dcc: video %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	KviDccVideo * v = new KviDccVideo(dcc->console()->frame(),dcc,tmp.ptr());
+	DccVideoWindow * v = new DccVideoWindow(dcc->console()->frame(),dcc,tmp.ptr());
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
 			(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVideo) || \
@@ -455,7 +455,7 @@ void KviDccBroker::activeVideoExecute(KviDccBox *box,KviDccDescriptor * dcc)
 
 	m_pDccWindowList->append(v);
 #else
-void KviDccBroker::activeVideoExecute(KviDccBox *,KviDccDescriptor *)
+void DccBroker::activeVideoExecute(DccDialog *,DccDescriptor *)
 {
 #endif
 }
@@ -466,17 +466,17 @@ void KviDccBroker::activeVideoExecute(KviDccBox *,KviDccDescriptor *)
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef COMPILE_DISABLE_DCC_VIDEO
-void KviDccBroker::passiveVideoExecute(KviDccDescriptor * dcc)
+void DccBroker::passiveVideoExecute(DccDescriptor * dcc)
 {
 	KviCString tmp(KviCString::Format,"dcc: video %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	KviDccVideo * v = new KviDccVideo(dcc->console()->frame(),dcc,tmp.ptr());
+	DccVideoWindow * v = new DccVideoWindow(dcc->console()->frame(),dcc,tmp.ptr());
 	//#warning "Create minimized dcc video ?... or maybe it's too much ? :)"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat);
 	dcc->console()->frame()->addWindow(v,!bMinimized);
 	if(bMinimized)v->minimize();
 	m_pDccWindowList->append(v);
 #else
-void KviDccBroker::passiveVideoExecute(KviDccDescriptor *)
+void DccBroker::passiveVideoExecute(DccDescriptor *)
 {
 #endif
 }
@@ -487,7 +487,7 @@ void KviDccBroker::passiveVideoExecute(KviDccDescriptor *)
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef COMPILE_DCC_CANVAS
-void KviDccBroker::activeCanvasManage(KviDccDescriptor * dcc)
+void DccBroker::activeCanvasManage(DccDescriptor * dcc)
 {
 	if(!dcc->bAutoAccept)
 	{
@@ -499,12 +499,12 @@ void KviDccBroker::activeCanvasManage(KviDccDescriptor * dcc)
 				,"dcc" \
 			).arg(dcc->szNick, dcc->szUser, dcc->szHost, dcc->szIp, dcc->szPort);
 
-		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC CANVAS request","dcc"));
+		DccAcceptDialog * box = new DccAcceptDialog(this,dcc,tmp,__tr2qs_ctx("DCC CANVAS request","dcc"));
 		m_pBoxList->append(box);
-		connect(box,SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
-				this,SLOT(activeCanvasExecute(KviDccBox *,KviDccDescriptor *)));
-		connect(box,SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
-				this,SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
+		connect(box,SIGNAL(accepted(DccDialog *,DccDescriptor *)),
+				this,SLOT(activeCanvasExecute(DccDialog *,DccDescriptor *)));
+		connect(box,SIGNAL(rejected(DccDialog *,DccDescriptor *)),
+				this,SLOT(cancelDcc(DccDialog *,DccDescriptor *)));
 		box->show();
 	} else {
 		// auto accept
@@ -514,7 +514,7 @@ void KviDccBroker::activeCanvasManage(KviDccDescriptor * dcc)
 #endif
 
 #ifdef COMPILE_DCC_CANVAS
-void KviDccBroker::activeCanvasExecute(KviDccBox *box,KviDccDescriptor * dcc)
+void DccBroker::activeCanvasExecute(DccDialog *box,DccDescriptor * dcc)
 {
 	if(box)box->forgetDescriptor();
 
@@ -525,7 +525,7 @@ void KviDccBroker::activeCanvasExecute(KviDccBox *box,KviDccDescriptor * dcc)
 	}
 
 	KviCString tmp(KviCString::Format,"dcc: canvas %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	KviDccCanvas * cnv = new KviDccCanvas(dcc->console()->frame(),dcc,tmp.ptr());
+	DccCanvasWindow * cnv = new DccCanvasWindow(dcc->console()->frame(),dcc,tmp.ptr());
 
 	//#warning "This option should be dedicated to Dcc Canvas!....for now we are using the DccChat options"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
@@ -537,7 +537,7 @@ void KviDccBroker::activeCanvasExecute(KviDccBox *box,KviDccDescriptor * dcc)
 
 	m_pDccWindowList->append(cnv);
 #else
-void KviDccBroker::activeCanvasExecute(KviDccBox *,KviDccDescriptor *)
+void DccBroker::activeCanvasExecute(DccDialog *,DccDescriptor *)
 {
 #endif
 }
@@ -546,10 +546,10 @@ void KviDccBroker::activeCanvasExecute(KviDccBox *,KviDccDescriptor *)
 // PASSIVE CANVAS
 ///////////////////////////////////////////////////////////////////////////////
 #ifdef COMPILE_DCC_CANVAS
-void KviDccBroker::passiveCanvasExecute(KviDccDescriptor * dcc)
+void DccBroker::passiveCanvasExecute(DccDescriptor * dcc)
 {
 	KviCString tmp(KviCString::Format,"dcc: canvas %s@%s:%s",dcc->szNick.toUtf8().data(),dcc->szIp.toUtf8().data(),dcc->szPort.toUtf8().data());
-	KviDccCanvas * cnv = new KviDccCanvas(dcc->console()->frame(),dcc,tmp.ptr());
+	DccCanvasWindow * cnv = new DccCanvasWindow(dcc->console()->frame(),dcc,tmp.ptr());
 	//#warning "This option should be dedicated to Dcc Canvas!....for now we are using the DccChat options"
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat);
 	dcc->console()->frame()->addWindow(cnv,!bMinimized);
@@ -562,7 +562,7 @@ void KviDccBroker::passiveCanvasExecute(KviDccDescriptor * dcc)
 // SEND
 ///////////////////////////////////////////////////////////////////////////////
 
-void KviDccBroker::recvFileManage(KviDccDescriptor * dcc)
+void DccBroker::recvFileManage(DccDescriptor * dcc)
 {
 	if(dcc->bIsIncomingAvatar)
 	{
@@ -628,12 +628,12 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc)
 
 		QString title = __tr2qs_ctx("DCC %1 Request - KVIrc","dcc").arg(dcc->szType);
 
-		KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,title);
+		DccAcceptDialog * box = new DccAcceptDialog(this,dcc,tmp,title);
 		m_pBoxList->append(box);
-		connect(box,SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)),
-				this,SLOT(chooseSaveFileName(KviDccBox *,KviDccDescriptor *)));
-		connect(box,SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)),
-				this,SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
+		connect(box,SIGNAL(accepted(DccDialog *,DccDescriptor *)),
+				this,SLOT(chooseSaveFileName(DccDialog *,DccDescriptor *)));
+		connect(box,SIGNAL(rejected(DccDialog *,DccDescriptor *)),
+				this,SLOT(cancelDcc(DccDialog *,DccDescriptor *)));
 		box->show();
 	} else {
 		// auto accept
@@ -647,7 +647,7 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc)
 	}
 }
 
-void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc)
+void DccBroker::chooseSaveFileName(DccDialog *box,DccDescriptor *dcc)
 {
 	if(box)box->forgetDescriptor();
 
@@ -729,7 +729,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc)
 	}
 }
 
-void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc)
+void DccBroker::renameOverwriteResume(DccDialog *box,DccDescriptor * dcc)
 {
 	if(box)box->forgetDescriptor();
 
@@ -776,14 +776,14 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc)
 					).arg(dcc->szLocalFileName);
 			}
 
-			KviDccRenameBox * box = new KviDccRenameBox(this,dcc,tmp,bDisableResume);
+			DccRenameDialog * box = new DccRenameDialog(this,dcc,tmp,bDisableResume);
 			m_pBoxList->append(box);
-			connect(box,SIGNAL(renameSelected(KviDccBox *,KviDccDescriptor *)),
-					this,SLOT(renameDccSendFile(KviDccBox *,KviDccDescriptor *)));
-			connect(box,SIGNAL(overwriteSelected(KviDccBox *,KviDccDescriptor *)),
-					this,SLOT(recvFileExecute(KviDccBox *,KviDccDescriptor *)));
-			connect(box,SIGNAL(cancelSelected(KviDccBox *,KviDccDescriptor *)),
-					this,SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *)));
+			connect(box,SIGNAL(renameSelected(DccDialog *,DccDescriptor *)),
+					this,SLOT(renameDccSendFile(DccDialog *,DccDescriptor *)));
+			connect(box,SIGNAL(overwriteSelected(DccDialog *,DccDescriptor *)),
+					this,SLOT(recvFileExecute(DccDialog *,DccDescriptor *)));
+			connect(box,SIGNAL(cancelSelected(DccDialog *,DccDescriptor *)),
+					this,SLOT(cancelDcc(DccDialog *,DccDescriptor *)));
 			box->show();
 			return;
 		}
@@ -793,7 +793,7 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc)
 				KVI_OPTION_BOOL(KviOption_boolAutoResumeDccSendWhenAutoAccepted) &&
 				(bOk) &&                              // only if the remote size is really known
 				(iRemoteSize > (quint64)fi.size()) && // only if the remote size is larger than the local size
-				(!KviDccFileTransfer::nonFailedTransferWithLocalFileName(dcc->szLocalFileName)) // only if there is no transfer with this local file name yet
+				(!DccFileTransfer::nonFailedTransferWithLocalFileName(dcc->szLocalFileName)) // only if there is no transfer with this local file name yet
 			)
 		{
 			// yep, auto resume...
@@ -816,7 +816,7 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc)
 	recvFileExecute(0,dcc);
 }
 
-void KviDccBroker::renameDccSendFile(KviDccBox *box,KviDccDescriptor * dcc)
+void DccBroker::renameDccSendFile(DccDialog *box,DccDescriptor * dcc)
 {
 	if(box)box->forgetDescriptor();
 
@@ -855,7 +855,7 @@ void KviDccBroker::renameDccSendFile(KviDccBox *box,KviDccDescriptor * dcc)
 	recvFileExecute(0,dcc);
 }
 
-void KviDccBroker::recvFileExecute(KviDccBox *box,KviDccDescriptor * dcc)
+void DccBroker::recvFileExecute(DccDialog *box,DccDescriptor * dcc)
 {
 	if(box)box->forgetDescriptor();
 
@@ -866,7 +866,7 @@ void KviDccBroker::recvFileExecute(KviDccBox *box,KviDccDescriptor * dcc)
 	}
 
 	//KviDccSend * send = new KviDccSend(dcc->console()->frame(),dcc,tmp.ptr());
-	KviDccFileTransfer * send = new KviDccFileTransfer(dcc);
+	DccFileTransfer * send = new DccFileTransfer(dcc);
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : \
 			(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccSend) || \
@@ -876,18 +876,18 @@ void KviDccBroker::recvFileExecute(KviDccBox *box,KviDccDescriptor * dcc)
 }
 
 
-void KviDccBroker::sendFileManage(KviDccDescriptor * dcc)
+void DccBroker::sendFileManage(DccDescriptor * dcc)
 {
 	QStringList filenames;
 	if(KviFileDialog::askForOpenFileNames(filenames,__tr2qs_ctx("Choose Files to Send - KVIrc","dcc"),""))
 	{
 		if(filenames.count() > 0)
 		{
-			KviDccDescriptor * d;
+			DccDescriptor * d;
 			QStringList::Iterator it=filenames.begin();
 			while(it != filenames.end())
 			{
-				d = new KviDccDescriptor(*dcc);
+				d = new DccDescriptor(*dcc);
 				d->szLocalFileName = *(it);
 				d->szLocalFileName.trimmed();
 				++it;
@@ -903,7 +903,7 @@ void KviDccBroker::sendFileManage(KviDccDescriptor * dcc)
 	}
 }
 
-void KviDccBroker::sendFileExecute(KviDccBox * box,KviDccDescriptor *dcc)
+void DccBroker::sendFileExecute(DccDialog * box,DccDescriptor *dcc)
 {
 	if(box)box->forgetDescriptor();
 
@@ -927,30 +927,30 @@ void KviDccBroker::sendFileExecute(KviDccBox * box,KviDccDescriptor *dcc)
 
 	dcc->szLocalFileSize.setNum(fi.size());
 
-	KviDccFileTransfer * send = new KviDccFileTransfer(dcc);
+	DccFileTransfer * send = new DccFileTransfer(dcc);
 
 	bool bMinimized = dcc->bOverrideMinimize ? dcc->bShowMinimized : KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccSend);
 
 	send->invokeTransferWindow(dcc->console(),bMinimized,bMinimized);
 }
 
-bool KviDccBroker::canUnload()
+bool DccBroker::canUnload()
 {
 	if(m_pBoxList)
 	{
 		if((m_pBoxList->count() != 0) ||
 			(m_pDccWindowList->count() != 0) ||
-			(KviDccFileTransfer::transferCount() != 0))return false;
+			(DccFileTransfer::transferCount() != 0))return false;
 	} // else in the destructor anyway (going to die)
 	return true;
 }
 
-bool KviDccBroker::handleResumeAccepted(const char * filename,const char * port,const char * szZeroPortTag)
+bool DccBroker::handleResumeAccepted(const char * filename,const char * port,const char * szZeroPortTag)
 {
-	return KviDccFileTransfer::handleResumeAccepted(filename,port,szZeroPortTag);
+	return DccFileTransfer::handleResumeAccepted(filename,port,szZeroPortTag);
 }
 
-bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename,const char * port,unsigned long filePos,const char * szZeroPortTag)
+bool DccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename,const char * port,unsigned long filePos,const char * szZeroPortTag)
 {
 	//qDebug("HANDLE %s %s %u %s",filename,port,filePos,szZeroPortTag);
 	// the zeroPOrtTag is nonempty here only if port == 0
@@ -986,9 +986,9 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename
 	}
 	//qDebug("NOT A ZeRO PORT");
 
-	return KviDccFileTransfer::handleResumeRequest(filename,port,filePos);
+	return DccFileTransfer::handleResumeRequest(filename,port,filePos);
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_broker.moc"
+#include "m_DccBroker.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/broker.h b/src/modules/dcc/DccBroker.h
index 5f69a4c3d..6aefcea5b 100644
--- a/src/modules/dcc/broker.h
+++ b/src/modules/dcc/DccBroker.h
@@ -2,7 +2,7 @@
 #define _BROKER_H_
 //=============================================================================
 //
-//   File : broker.h
+//   File : DccBroker.h
 //   Creation date : Tue Sep 19 09 2000 10:20:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "descriptor.h"
+#include "DccDescriptor.h"
 
 #include "kvi_settings.h"
 #include "KviCString.h"
@@ -36,9 +36,9 @@
 #include <QObject>
 
 class KviConsoleWindow;
-class KviDccBroker;
+class DccBroker;
 class KviWindow;
-class KviDccBox;
+class DccDialog;
 
 // #define COMPILE_DCC_CANVAS
 
@@ -52,14 +52,14 @@ public:
 	unsigned long  m_uResumePosition; // if 0 = no resume, valid only for file transfers obviously
 };
 
-class KviDccBroker : public QObject
+class DccBroker : public QObject
 {
 	Q_OBJECT
 public:
-	KviDccBroker();
-	~KviDccBroker();
+	DccBroker();
+	~DccBroker();
 protected:
-	KviPointerList<KviDccBox>         * m_pBoxList;
+	KviPointerList<DccDialog>         * m_pBoxList;
 	KviPointerList<KviWindow>         * m_pDccWindowList;
 	KviPointerHashTable<QString,KviDccZeroPortTag>      * m_pZeroPortTags;
 public:
@@ -70,51 +70,51 @@ public:
 	unsigned int dccWindowsCount(){ return m_pDccWindowList->count(); };
 	unsigned int dccBoxCount();
 
-	void unregisterDccBox(KviDccBox * box);
+	void unregisterDccBox(DccDialog * box);
 	void unregisterDccWindow(KviWindow *dcc);
 
-	void rsendManage(KviDccDescriptor * dcc);
-	void rsendAskForFileName(KviDccDescriptor * dcc);
+	void rsendManage(DccDescriptor * dcc);
+	void rsendAskForFileName(DccDescriptor * dcc);
 
-	void handleChatRequest(KviDccDescriptor * dcc);
+	void handleChatRequest(DccDescriptor * dcc);
 
 #ifdef COMPILE_DCC_CANVAS
-	void activeCanvasManage(KviDccDescriptor * dcc);
-	void passiveCanvasExecute(KviDccDescriptor * dcc);
+	void activeCanvasManage(DccDescriptor * dcc);
+	void passiveCanvasExecute(DccDescriptor * dcc);
 #endif
 
-	void activeVoiceManage(KviDccDescriptor * dcc);
-	void passiveVoiceExecute(KviDccDescriptor * dcc);
+	void activeVoiceManage(DccDescriptor * dcc);
+	void passiveVoiceExecute(DccDescriptor * dcc);
 
-	void activeVideoManage(KviDccDescriptor * dcc);
-	void passiveVideoExecute(KviDccDescriptor * dcc);
+	void activeVideoManage(DccDescriptor * dcc);
+	void passiveVideoExecute(DccDescriptor * dcc);
 
-	void recvFileManage(KviDccDescriptor * dcc);
-	void sendFileManage(KviDccDescriptor * dcc);
+	void recvFileManage(DccDescriptor * dcc);
+	void sendFileManage(DccDescriptor * dcc);
 
 	bool handleResumeAccepted(const char * filename,const char * port,const char * szZeroPortTag);
 	bool handleResumeRequest(KviDccRequest * dcc,const char * filename,const char * port,unsigned long filePos,const char * szZeroPortTag);
 
 public slots:
-	void rsendExecute(KviDccBox * box,KviDccDescriptor * dcc);
-	void rsendExecute(KviDccDescriptor * dcc);
+	void rsendExecute(DccDialog * box,DccDescriptor * dcc);
+	void rsendExecute(DccDescriptor * dcc);
 
-//	void activeChatExecute(KviDccBox * box,KviDccDescriptor * dcc);
-	void executeChat(KviDccBox * box,KviDccDescriptor * dcc);
+//	void activeChatExecute(DccDialog * box,DccDescriptor * dcc);
+	void executeChat(DccDialog * box,DccDescriptor * dcc);
 
-	void activeCanvasExecute(KviDccBox * box,KviDccDescriptor * dcc);
-	void activeVoiceExecute(KviDccBox * box,KviDccDescriptor * dcc);
-	void activeVideoExecute(KviDccBox * box,KviDccDescriptor * dcc);
+	void activeCanvasExecute(DccDialog * box,DccDescriptor * dcc);
+	void activeVoiceExecute(DccDialog * box,DccDescriptor * dcc);
+	void activeVideoExecute(DccDialog * box,DccDescriptor * dcc);
 
-	void sendFileExecute(KviDccBox * box,KviDccDescriptor * dcc);
-	void recvFileExecute(KviDccBox * box,KviDccDescriptor * dcc);
+	void sendFileExecute(DccDialog * box,DccDescriptor * dcc);
+	void recvFileExecute(DccDialog * box,DccDescriptor * dcc);
 
-	void chooseSaveFileName(KviDccBox *box,KviDccDescriptor * dcc);
-	void renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc);
-	void renameDccSendFile(KviDccBox *box,KviDccDescriptor * dcc);
+	void chooseSaveFileName(DccDialog *box,DccDescriptor * dcc);
+	void renameOverwriteResume(DccDialog *box,DccDescriptor * dcc);
+	void renameDccSendFile(DccDialog *box,DccDescriptor * dcc);
 
-	void cancelDcc(KviDccBox *box,KviDccDescriptor * dcc);
-	void cancelDcc(KviDccDescriptor * dcc);
+	void cancelDcc(DccDialog *box,DccDescriptor * dcc);
+	void cancelDcc(DccDescriptor * dcc);
 
 public:
 	bool canUnload();
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/DccCanvasWindow.cpp
index a9f943371..73f442b2c 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/DccCanvasWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : canvas.cpp
+//   File : DccCanvasWindow.cpp
 //   Creation date : Sun Jul 29 07 2001 20:23:13 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,12 +24,12 @@
 
 #define QT_MODULE_CANVAS
 
-#include "canvas.h"
+#include "DccCanvasWindow.h"
 
 #ifdef COMPILE_DCC_CANVAS
 
-	#include "dialogs.h"
-	#include "marshal.h"
+	#include "DccDialog.h"
+	#include "DccMarshal.h"
 	#include "canvaswidget.h"
 
 	#define _KVI_DEBUG_CHECK_RANGE_
@@ -53,22 +53,22 @@
 
 	#include <QSplitter>
 
-	extern KviDccBroker * g_pDccBroker;
+	extern DccBroker * g_pDccBroker;
 
 
-	KviDccCanvas::KviDccCanvas(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name)
-	: KviDccWindow(KVI_WINDOW_TYPE_DCCCANVAS,pFrm,name,dcc)
+	DccCanvasWindow::DccCanvasWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
+	: DccWindow(KVI_WINDOW_TYPE_DCCCANVAS,pFrm,name,dcc)
 	{
 		m_pSplitter = new QSplitter(QSplitter::Vertical,this,"splitter");
 
-		m_pCanvas   = new KviCanvasWidget(m_pSplitter);
+		m_pCanvas   = new DccCanvasWidget(m_pSplitter);
 
 		m_pIrcView  = new KviIrcView(m_pSplitter,pFrm,this);
 		m_pInput    = new KviInput(this);
 
 	//	setFocusHandler(m_pInput,this);
 
-		m_pMarshal = new KviDccMarshal(this);
+		m_pMarshal = new DccMarshal(this);
 		connect(m_pMarshal,SIGNAL(error(int)),this,SLOT(handleMarshalError(int)));
 		connect(m_pMarshal,SIGNAL(connected()),this,SLOT(connected()));
 
@@ -111,7 +111,7 @@
 	//	m_pSlaveThread = 0;
 	}
 
-	KviDccCanvas::~KviDccCanvas()
+	DccCanvasWindow::~DccCanvasWindow()
 	{
 		g_pDccBroker->unregisterDccWindow(this);
 	//	if(m_pSlaveThread)
@@ -125,7 +125,7 @@
 	//	delete m_pMarshal;
 	}
 
-	const QString & KviDccCanvas::target()
+	const QString & DccCanvasWindow::target()
 	{
 		// This may change on the fly...
 		m_szTarget.sprintf("%s@%s:%s",
@@ -133,7 +133,7 @@
 		return m_szTarget;
 	}
 
-	void KviDccCanvas::fillCaptionBuffers()
+	void DccCanvasWindow::fillCaptionBuffers()
 	{
 		KviCString tmp(KviCString::Format,"DCC Canvas %s@%s:%s",
 			m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
@@ -146,17 +146,17 @@
 			KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),tmp.ptr());
 	}
 
-	QPixmap * KviDccCanvas::myIconPtr()
+	QPixmap * DccCanvasWindow::myIconPtr()
 	{
 		return g_pIconManager->getSmallIcon(KVI_SMALLICON_CANVAS);
 	}
 
-	void KviDccCanvas::getBaseLogFileName(KviCString &buffer)
+	void DccCanvasWindow::getBaseLogFileName(KviCString &buffer)
 	{
 		buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 	}
 
-	void KviDccCanvas::ownMessage(const char * text, bool bUserFeedback)
+	void DccCanvasWindow::ownMessage(const char * text, bool bUserFeedback)
 	{
 		KviCString buf(KviCString::Format,"%s\r\n",text);
 	//	m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
@@ -167,14 +167,14 @@
 				m_pDescriptor->szLocalHost.toUtf8().data(),text);
 	}
 
-	void KviDccCanvas::ownAction(const char * text)
+	void DccCanvasWindow::ownAction(const char * text)
 	{
 		KviCString buf(KviCString::Format,"%cACTION %s%c\r\n",text);
 	//	m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
 		output(KVI_OUT_ACTION,"%Q %s",&(m_pDescriptor->szLocalNick),text);
 	}
 
-	bool KviDccCanvas::event(QEvent *e)
+	bool DccCanvasWindow::event(QEvent *e)
 	{
 	//	if(e->type() == KVI_THREAD_EVENT)
 	//	{
@@ -257,7 +257,7 @@
 		return KviWindow::event(e);
 	}
 
-	void KviDccCanvas::resizeEvent(QResizeEvent *e)
+	void DccCanvasWindow::resizeEvent(QResizeEvent *e)
 	{
 		int hght = m_pInput->heightHint();
 	//	int hght2 = m_pTopSplitter->sizeHint().height();
@@ -266,20 +266,20 @@
 		m_pInput->setGeometry(0,height() - hght,width(),hght);
 	}
 
-	QSize KviDccCanvas::sizeHint() const
+	QSize DccCanvasWindow::sizeHint() const
 	{
 		QSize ret(m_pIrcView->sizeHint().width(),
 			m_pIrcView->sizeHint().height() + m_pInput->heightHint());
 		return ret;
 	}
 
-	void KviDccCanvas::handleMarshalError(int err)
+	void DccCanvasWindow::handleMarshalError(int err)
 	{
 		QString sss = KviError::getDescription(err);
 		output(KVI_OUT_DCCERROR,__tr2qs_ctx("DCC Failed: %Q","dcc"),&sss);
 	}
 
-	void KviDccCanvas::connected()
+	void DccCanvasWindow::connected()
 	{
 		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Connected to %Q:%Q","dcc"),
 			&(m_pMarshal->remoteIp()),&(m_pMarshal->remotePort()));
@@ -297,5 +297,5 @@
 	//	m_pSlaveThread->start();
 	}
 
-	#include "m_canvas.moc"
+	#include "m_DccCanvasWindow.moc"
 #endif
diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/DccCanvasWindow.h
index 721cf7f00..c931759b6 100644
--- a/src/modules/dcc/canvas.h
+++ b/src/modules/dcc/DccCanvasWindow.h
@@ -2,7 +2,7 @@
 #define _CANVAS_H_
 //=============================================================================
 //
-//   File : canvas.h
+//   File : DccCanvasWindow.h
 //   Creation date : Sun Jul 29 07 2001 20:17:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,30 +24,30 @@
 //
 //=============================================================================
 
-#include "broker.h"
+#include "DccBroker.h"
 
 #ifdef COMPILE_DCC_CANVAS
-	#include "descriptor.h"
-	#include "window.h"
-	#include "thread.h"
+	#include "DccDescriptor.h"
+	#include "DccWindow.h"
+	#include "DccThread.h"
 
 	#include "KviWindow.h"
 	#include "KviCString.h"
 	#include "KviPointerList.h"
 
-	class KviDccMarshal;
-	class KviCanvasWidget;
+	class DccMarshal;
+	class DccCanvasWidget;
 	class QSplitter;
 
-	class KviDccCanvas : public KviDccWindow
+	class DccCanvasWindow : public DccWindow
 	{
 		Q_OBJECT
 	public:
-		KviDccCanvas(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name);
-		~KviDccCanvas();
+		DccCanvasWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name);
+		~DccCanvasWindow();
 	protected:
 	//	KviDccCanvasThread     * m_pSlaveThread;
-		KviCanvasWidget        * m_pCanvas;
+		DccCanvasWidget        * m_pCanvas;
 	//	QSplitter              * m_pTopSplitter;
 		QString                  m_szTarget;
 	protected:
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/DccChatWindow.cpp
index f7dbf6048..bf5a935c9 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/DccChatWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : chat.cpp
+//   File : DccChatWindow.cpp
 //   Creation date : Tue Sep 20 09 2000 15:13:13 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "chat.h"
-#include "marshal.h"
-#include "broker.h"
+#include "DccChatWindow.h"
+#include "DccMarshal.h"
+#include "DccBroker.h"
 
 #ifdef COMPILE_ON_WINDOWS
 	// Ugly Windoze compiler...
-	#include "dialogs.h"
+	#include "DccDialog.h"
 #endif
 
 #include "kvi_debug.h"
@@ -69,7 +69,7 @@
 	#include "KviSSLMaster.h"
 #endif
 
-extern KviDccBroker * g_pDccBroker;
+extern DccBroker * g_pDccBroker;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -81,8 +81,8 @@ extern KviDccBroker * g_pDccBroker;
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviDccChat::KviDccChat(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name)
-: KviDccWindow(KVI_WINDOW_TYPE_DCCCHAT,pFrm,name,dcc)
+DccChatWindow::DccChatWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
+: DccWindow(KVI_WINDOW_TYPE_DCCCHAT,pFrm,name,dcc)
 {
 	m_pButtonBox = new KviTalHBox(this);
 
@@ -111,7 +111,7 @@ KviDccChat::KviDccChat(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * n
 
 	if(KVI_OPTION_BOOL(KviOption_boolAutoLogDccChat))m_pIrcView->startLogging();
 
-	m_pMarshal = new KviDccMarshal(this);
+	m_pMarshal = new DccMarshal(this);
 	connect(m_pMarshal,SIGNAL(error(int)),this,SLOT(handleMarshalError(int)));
 	connect(m_pMarshal,SIGNAL(connected()),this,SLOT(connected()));
 	connect(m_pMarshal,SIGNAL(inProgress()),this,SLOT(connectionInProgress()));
@@ -125,7 +125,7 @@ KviDccChat::KviDccChat(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * n
 	startConnection();
 }
 
-KviDccChat::~KviDccChat()
+DccChatWindow::~DccChatWindow()
 {
 	g_pDccBroker->unregisterDccWindow(this);
 	if(m_pSlaveThread)
@@ -137,22 +137,22 @@ KviDccChat::~KviDccChat()
 	KviThreadManager::killPendingEvents(this);
 }
 
-void KviDccChat::textViewRightClicked()
+void DccChatWindow::textViewRightClicked()
 {
 	KVS_TRIGGER_EVENT_1(KviEvent_OnDCCChatPopupRequest,this,m_pDescriptor->idString());
 }
 
-void KviDccChat::triggerCreationEvents()
+void DccChatWindow::triggerCreationEvents()
 {
 	KVS_TRIGGER_EVENT_1(KviEvent_OnDCCChatWindowCreated,this,m_pDescriptor->idString());
 }
 
-void KviDccChat::triggerDestructionEvents()
+void DccChatWindow::triggerDestructionEvents()
 {
 	KVS_TRIGGER_EVENT_1(KviEvent_OnDCCChatWindowClosing,this,m_pDescriptor->idString());
 }
 
-void KviDccChat::startConnection()
+void DccChatWindow::startConnection()
 {
 	if(!(m_pDescriptor->bActive))
 	{
@@ -178,7 +178,7 @@ void KviDccChat::startConnection()
 	}
 }
 
-void KviDccChat::connectionInProgress()
+void DccChatWindow::connectionInProgress()
 {
 	if(m_pDescriptor->bActive)
 	{
@@ -241,7 +241,7 @@ void KviDccChat::connectionInProgress()
 	KVS_TRIGGER_EVENT_1(KviEvent_OnDCCChatConnectionInProgress,this,m_pDescriptor->idString());
 }
 
-void KviDccChat::startingSSLHandshake()
+void DccChatWindow::startingSSLHandshake()
 {
 #ifdef COMPILE_SSL_SUPPORT
 	outputNoFmt(KVI_OUT_SSL,__tr2qs_ctx("Low-level transport connection established","dcc"));
@@ -249,7 +249,7 @@ void KviDccChat::startingSSLHandshake()
 #endif
 }
 
-void KviDccChat::sslError(const char * msg)
+void DccChatWindow::sslError(const char * msg)
 {
 #ifdef COMPILE_SSL_SUPPORT
 	if(!KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnDCCChatError,this,QString(msg),m_pDescriptor->idString()))
@@ -257,7 +257,7 @@ void KviDccChat::sslError(const char * msg)
 #endif
 }
 
-const QString & KviDccChat::target()
+const QString & DccChatWindow::target()
 {
 	// This may change on the fly...
 	m_szTarget = m_pDescriptor->szNick;
@@ -268,7 +268,7 @@ const QString & KviDccChat::target()
 	return m_szTarget;
 }
 
-void KviDccChat::fillCaptionBuffers()
+void DccChatWindow::fillCaptionBuffers()
 {
 	QString tmp = QString("DCC %1 %2@%3:%4").arg(
 #ifdef COMPILE_SSL_SUPPORT
@@ -281,17 +281,17 @@ void KviDccChat::fillCaptionBuffers()
 	m_szPlainTextCaption = tmp;
 }
 
-QPixmap * KviDccChat::myIconPtr()
+QPixmap * DccChatWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG);
 }
 
-void KviDccChat::getBaseLogFileName(QString &buffer)
+void DccChatWindow::getBaseLogFileName(QString &buffer)
 {
 	buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 }
 
-void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
+void DccChatWindow::ownMessage(const QString &text, bool bUserFeedback)
 {
 	if(!m_pSlaveThread)
 	{
@@ -371,14 +371,14 @@ void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
 			m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsoleWindow::NoNotifications);
 }
 
-const QString & KviDccChat::localNick()
+const QString & DccChatWindow::localNick()
 {
 	// FIXME: This is just a complete HACK
 	m_szLocalNick = m_pDescriptor->szLocalNick;
 	return m_szLocalNick;
 }
 
-void KviDccChat::ownAction(const QString &text)
+void DccChatWindow::ownAction(const QString &text)
 {
 	if(m_pSlaveThread)
 	{
@@ -403,7 +403,7 @@ void KviDccChat::ownAction(const QString &text)
 	}
 }
 
-bool KviDccChat::event(QEvent *e)
+bool DccChatWindow::event(QEvent *e)
 {
 	if(e->type() == KVI_THREAD_EVENT)
 	{
@@ -514,7 +514,7 @@ bool KviDccChat::event(QEvent *e)
 	return KviWindow::event(e);
 }
 
-void KviDccChat::resizeEvent(QResizeEvent *)
+void DccChatWindow::resizeEvent(QResizeEvent *)
 {
 	int hght = m_pInput->heightHint();
 	int hght2 = m_pButtonBox->sizeHint().height();
@@ -523,21 +523,21 @@ void KviDccChat::resizeEvent(QResizeEvent *)
 	m_pInput->setGeometry(0,height() - hght,width(),hght);
 }
 
-QSize KviDccChat::sizeHint() const
+QSize DccChatWindow::sizeHint() const
 {
 	QSize ret(m_pIrcView->sizeHint().width(),
 		m_pIrcView->sizeHint().height() + m_pInput->heightHint());
 	return ret;
 }
 
-void KviDccChat::handleMarshalError(KviError::Code eError)
+void DccChatWindow::handleMarshalError(KviError::Code eError)
 {
 	QString szErr = KviError::getDescription(eError);
 	if(!KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnDCCChatError,this,szErr,m_pDescriptor->idString()))
 		output(KVI_OUT_DCCERROR,__tr2qs_ctx("DCC %Q failed: %Q","dcc"),&(m_pDescriptor->szType),&szErr);
 }
 
-void KviDccChat::connected()
+void DccChatWindow::connected()
 {
 	if(!(m_pDescriptor->bActive))
 	{
@@ -549,7 +549,7 @@ void KviDccChat::connected()
 
 	updateCaption();
 
-	m_pSlaveThread = new KviDccChatThread(this,m_pMarshal->releaseSocket());
+	m_pSlaveThread = new DccChatThread(this,m_pMarshal->releaseSocket());
 	
 #ifdef COMPILE_SSL_SUPPORT
 	KviSSL * s = m_pMarshal->releaseSSL();
@@ -587,19 +587,19 @@ void KviDccChat::connected()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviDccChatThread::KviDccChatThread(KviWindow *wnd,kvi_socket_t fd)
-: KviDccThread(wnd,fd)
+DccChatThread::DccChatThread(KviWindow *wnd,kvi_socket_t fd)
+: DccThread(wnd,fd)
 {
 	m_pOutBuffers = new KviPointerList<KviDataBuffer>;
 	m_pOutBuffers->setAutoDelete(true);
 }
 
-KviDccChatThread::~KviDccChatThread()
+DccChatThread::~DccChatThread()
 {
 	if(m_pOutBuffers)delete m_pOutBuffers;
 }
 
-void KviDccChatThread::run()
+void DccChatThread::run()
 {
 	KviDccThreadIncomingData data;
 	data.iLen   = 0;
@@ -725,7 +725,7 @@ out_of_the_loop:
 	m_fd = KVI_INVALID_SOCKET;
 }
 
-bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool bCritical)
+bool DccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool bCritical)
 {
 	KVI_ASSERT(data->iLen);
 	KVI_ASSERT(data->buffer);
@@ -787,14 +787,14 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
 	return true;
 }
 
-void KviDccChatThread::sendRawData(const void * buffer,int len)
+void DccChatThread::sendRawData(const void * buffer,int len)
 {
 	m_pMutex->lock();
 	m_pOutBuffers->append(new KviDataBuffer((unsigned int)len,(const unsigned char *)buffer));
 	m_pMutex->unlock();
 }
 
-bool KviDccChatThread::tryFlushOutBuffers()
+bool DccChatThread::tryFlushOutBuffers()
 {
 	bool bRet = true;
 	m_pMutex->lock();
@@ -889,5 +889,5 @@ out_of_the_loop:
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_chat.moc"
+#include "m_DccChatWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/DccChatWindow.h
index dddf0a6ba..7a2eb1531 100644
--- a/src/modules/dcc/chat.h
+++ b/src/modules/dcc/DccChatWindow.h
@@ -2,7 +2,7 @@
 #define _CHAT_H_
 //=============================================================================
 //
-//   File : chat.h
+//   File : DccChatWindow.h
 //   Creation date : Tue Sep 20 09 2000 15:11:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,9 +24,9 @@
 //
 //=============================================================================
 
-#include "descriptor.h"
-#include "thread.h"
-#include "window.h"
+#include "DccDescriptor.h"
+#include "DccThread.h"
+#include "DccWindow.h"
 
 #include "KviDataBuffer.h"
 #include "KviPointerList.h"
@@ -39,14 +39,14 @@
 	class KviSSL;
 #endif
 
-class KviDccMarshal;
+class DccMarshal;
 class QSplitter;
 
-class KviDccChatThread : public KviDccThread
+class DccChatThread : public DccThread
 {
 public:
-	KviDccChatThread(KviWindow * wnd,kvi_socket_t fd);
-	~KviDccChatThread();
+	DccChatThread(KviWindow * wnd,kvi_socket_t fd);
+	~DccChatThread();
 protected:
 	KviPointerList<KviDataBuffer>    * m_pOutBuffers;
 protected:
@@ -65,15 +65,15 @@ public:
 };
 
 
-class KviDccChat : public KviDccWindow
+class DccChatWindow : public DccWindow
 {
 	Q_OBJECT
 public:
-	KviDccChat(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name);
-	~KviDccChat();
+	DccChatWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name);
+	~DccChatWindow();
 	QFrame * buttonContainer() { return (QFrame*)m_pButtonContainer; };
 protected:
-	KviDccChatThread       * m_pSlaveThread;
+	DccChatThread       * m_pSlaveThread;
 	QString                  m_szTarget;
 	QString                  m_szLocalNick;
 	KviThemedLabel         * m_pLabel;
@@ -93,7 +93,7 @@ protected:
 	virtual void triggerCreationEvents();
 	virtual void triggerDestructionEvents();
 	void startConnection();
-	virtual KviDccThread * getSlaveThread() { return m_pSlaveThread; };
+	virtual DccThread * getSlaveThread() { return m_pSlaveThread; };
 protected slots:
 	void handleMarshalError(KviError::Code eError);
 	void connected();
diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/DccDescriptor.cpp
index ba0f7270a..cd50ac319 100644
--- a/src/modules/dcc/descriptor.cpp
+++ b/src/modules/dcc/DccDescriptor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : descriptor.cpp
+//   File : DccDescriptor.cpp
 //   Creation date : Tue Jul 23 01:11:54 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "descriptor.h"
-#include "send.h"
-#include "window.h"
+#include "DccDescriptor.h"
+#include "DccFileTransfer.h"
+#include "DccWindow.h"
 
 #include "KviLocale.h"
 #include "KviKvsEventTriggers.h"
@@ -32,19 +32,19 @@
 #include "KviApplication.h"
 
 static unsigned int g_uNextDescriptorId = 1; // we use 0 as an invalid descriptor id
-static KviPointerHashTable<int,KviDccDescriptor> * g_pDescriptorDict = 0;
+static KviPointerHashTable<int,DccDescriptor> * g_pDescriptorDict = 0;
 
-KviPointerHashTable<int,KviDccDescriptor> * KviDccDescriptor::descriptorDict()
+KviPointerHashTable<int,DccDescriptor> * DccDescriptor::descriptorDict()
 {
 	return g_pDescriptorDict;
 }
 
-KviDccDescriptor::KviDccDescriptor(const KviDccDescriptor & src)
+DccDescriptor::DccDescriptor(const DccDescriptor & src)
 {
 	copyFrom(src);
 }
 
-KviDccDescriptor::KviDccDescriptor(KviConsoleWindow * pConsole)
+DccDescriptor::DccDescriptor(KviConsoleWindow * pConsole)
 {
 	m_pConsole   = pConsole;
 	m_pDccWindow = 0;
@@ -57,7 +57,7 @@ KviDccDescriptor::KviDccDescriptor(KviConsoleWindow * pConsole)
 
 	if(!g_pDescriptorDict)
 	{
-		g_pDescriptorDict = new KviPointerHashTable<int,KviDccDescriptor>;
+		g_pDescriptorDict = new KviPointerHashTable<int,DccDescriptor>;
 		g_pDescriptorDict->setAutoDelete(false);
 	}
 	g_pDescriptorDict->replace((long)m_uId,this);
@@ -93,7 +93,7 @@ KviDccDescriptor::KviDccDescriptor(KviConsoleWindow * pConsole)
 	m_bCreationEventTriggered = false;
 }
 
-KviDccDescriptor::~KviDccDescriptor()
+DccDescriptor::~DccDescriptor()
 {
 	if(m_bCreationEventTriggered)
 	{
@@ -125,7 +125,7 @@ KviDccDescriptor::~KviDccDescriptor()
 
 }
 
-void KviDccDescriptor::triggerCreationEvent()
+void DccDescriptor::triggerCreationEvent()
 {
 	if(m_bCreationEventTriggered)
 	{
@@ -141,13 +141,13 @@ void KviDccDescriptor::triggerCreationEvent()
 	}
 }
 
-KviDccDescriptor * KviDccDescriptor::find(unsigned int uId)
+DccDescriptor * DccDescriptor::find(unsigned int uId)
 {
 	if(!g_pDescriptorDict)return 0;
 	return g_pDescriptorDict->find((long)uId);
 }
 
-void KviDccDescriptor::copyFrom(const KviDccDescriptor &src)
+void DccDescriptor::copyFrom(const DccDescriptor &src)
 {
 	m_uId = g_uNextDescriptorId;
 	g_uNextDescriptorId++;
@@ -155,7 +155,7 @@ void KviDccDescriptor::copyFrom(const KviDccDescriptor &src)
 
 	if(!g_pDescriptorDict)
 	{
-		g_pDescriptorDict = new KviPointerHashTable<int,KviDccDescriptor>;
+		g_pDescriptorDict = new KviPointerHashTable<int,DccDescriptor>;
 		g_pDescriptorDict->setAutoDelete(false);
 	}
 	g_pDescriptorDict->replace((long)m_uId,this);
@@ -201,7 +201,7 @@ void KviDccDescriptor::copyFrom(const KviDccDescriptor &src)
 	iSampleRate           = src.iSampleRate;
 }
 
-bool KviDccDescriptor::isFileUpload()
+bool DccDescriptor::isFileUpload()
 {
 	if(szType.toUpper()=="SEND")return true;
 	if(szType.toUpper()=="TSEND")return true;
@@ -211,7 +211,7 @@ bool KviDccDescriptor::isFileUpload()
 	return false;
 }
 
-bool KviDccDescriptor::isFileDownload()
+bool DccDescriptor::isFileDownload()
 {
 	if(szType.toUpper()=="RECV")return true;
 	if(szType.toUpper()=="TRECV")return true;
@@ -221,7 +221,7 @@ bool KviDccDescriptor::isFileDownload()
 	return false;
 }
 
-bool KviDccDescriptor::isDccChat()
+bool DccDescriptor::isDccChat()
 {
 	if(szType.toUpper()=="CHAT")return true;
 #ifdef COMPILE_SSL_SUPPORT
diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/DccDescriptor.h
index 4cea82e51..ae5784dc5 100644
--- a/src/modules/dcc/descriptor.h
+++ b/src/modules/dcc/DccDescriptor.h
@@ -2,7 +2,7 @@
 #define _DESCRIPTOR_H_
 //=============================================================================
 //
-//   File : descriptor.h
+//   File : DccDescriptor.h
 //   Creation date : Tue Jul 23 01:11:52 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,15 +28,15 @@
 #include "KviConsoleWindow.h"
 #include "KviPointerHashTable.h"
 
-class KviDccWindow;
-class KviDccFileTransfer;
-class KviDccDescriptor
+class DccWindow;
+class DccFileTransfer;
+class DccDescriptor
 {
 public:
-	KviDccDescriptor(KviConsoleWindow * pConsole);
-	KviDccDescriptor(const KviDccDescriptor & src);
+	DccDescriptor(KviConsoleWindow * pConsole);
+	DccDescriptor(const DccDescriptor & src);
 
-	~KviDccDescriptor();
+	~DccDescriptor();
 protected:
 	KviConsoleWindow         * m_pConsole;
 
@@ -46,8 +46,8 @@ protected:
 	unsigned int         m_uId; // this dcc session ID
 	QString              m_szId;
 
-	KviDccWindow       * m_pDccWindow;   // 0 if it has no window
-	KviDccFileTransfer * m_pDccTransfer; // 0 if it is not a transfer
+	DccWindow       * m_pDccWindow;   // 0 if it has no window
+	DccFileTransfer * m_pDccTransfer; // 0 if it is not a transfer
 
 	bool                 m_bCreationEventTriggered;
 public:
@@ -55,11 +55,11 @@ public:
 	KviConsoleWindow * console() const { return m_pConsole; };
 	void setConsole(KviConsoleWindow * c){ m_pConsole = c; };
 
-	KviDccWindow * window() const { return m_pDccWindow; };
-	void setWindow(KviDccWindow * w){ m_pDccWindow = w; };
+	DccWindow * window() const { return m_pDccWindow; };
+	void setWindow(DccWindow * w){ m_pDccWindow = w; };
 
-	KviDccFileTransfer * transfer() const { return m_pDccTransfer; };
-	void setTransfer(KviDccFileTransfer * t){ m_pDccTransfer = t; };
+	DccFileTransfer * transfer() const { return m_pDccTransfer; };
+	void setTransfer(DccFileTransfer * t){ m_pDccTransfer = t; };
 
 	// mIrc zero port reverse send/chat extension
 	bool isZeroPortRequest() const { return m_szZeroPortRequestTag.hasData(); };
@@ -68,12 +68,12 @@ public:
 
 	unsigned int id() const { return m_uId; };
 	const QString & idString() const { return m_szId; };
-	static KviDccDescriptor * find(unsigned int uId);
-	static KviPointerHashTable<int,KviDccDescriptor> * descriptorDict();
+	static DccDescriptor * find(unsigned int uId);
+	static KviPointerHashTable<int,DccDescriptor> * descriptorDict();
 
 	void triggerCreationEvent(); // this MUST be called by the creator of the descriptor!
 private:
-	void copyFrom(const KviDccDescriptor &src);
+	void copyFrom(const DccDescriptor &src);
 public:
 	// Generic parameters
 	QString         szType;            // DCC protocol : CHAT, SCHAT, SEND, TSSEND....
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/DccDialog.cpp
index 75ceb8cc0..9cc68b906 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/DccDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : dialogs.cpp
+//   File : DccDialog.cpp
 //   Creation date : Tue Sep 19 09 2000 15:23:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "dialogs.h"
+#include "DccDialog.h"
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
@@ -38,26 +38,26 @@
 #include <QShowEvent>
 #include <QIcon>
 
-KviDccBox::KviDccBox(KviDccBroker * br,KviDccDescriptor * dcc)
+DccDialog::DccDialog(DccBroker * br,DccDescriptor * dcc)
 {
 	m_pDescriptor = dcc;
 	m_pBroker = br;
 }
 
-KviDccBox::~KviDccBox()
+DccDialog::~DccDialog()
 {
 	if(m_pDescriptor)delete m_pDescriptor;
 	m_pDescriptor = 0;
 	m_pBroker->unregisterDccBox(this);
 }
 
-void KviDccBox::forgetDescriptor()
+void DccDialog::forgetDescriptor()
 {
 	m_pDescriptor = 0;
 }
 
-KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const QString &text,const QString &capt)
-: QWidget(0), KviDccBox(br,dcc)
+DccAcceptDialog::DccAcceptDialog(DccBroker * br,DccDescriptor * dcc,const QString &text,const QString &capt)
+: QWidget(0), DccDialog(br,dcc)
 {
 	setObjectName("dcc_accept_box");
 	//QVBoxLayout * vb = new QVBoxLayout(this,4,4);
@@ -88,11 +88,11 @@ KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const
 	l->setFocus();
 }
 
-KviDccAcceptBox::~KviDccAcceptBox()
+DccAcceptDialog::~DccAcceptDialog()
 {
 }
 
-void KviDccAcceptBox::acceptClicked()
+void DccAcceptDialog::acceptClicked()
 {
 	hide();
 	emit accepted(this,m_pDescriptor);
@@ -100,7 +100,7 @@ void KviDccAcceptBox::acceptClicked()
 	//g_pApp->collectGarbage(this);
 }
 
-void KviDccAcceptBox::rejectClicked()
+void DccAcceptDialog::rejectClicked()
 {
 	hide();
 	emit rejected(this,m_pDescriptor);
@@ -108,7 +108,7 @@ void KviDccAcceptBox::rejectClicked()
 	//g_pApp->collectGarbage(this);
 }
 
-void KviDccAcceptBox::closeEvent(QCloseEvent *e)
+void DccAcceptDialog::closeEvent(QCloseEvent *e)
 {
 	hide();
 	e->ignore();
@@ -117,7 +117,7 @@ void KviDccAcceptBox::closeEvent(QCloseEvent *e)
 	//g_pApp->collectGarbage(this);
 }
 
-void KviDccAcceptBox::showEvent(QShowEvent *e)
+void DccAcceptDialog::showEvent(QShowEvent *e)
 {
 	QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
 	move((rect.width() - width())/2,(rect.height() - height())/2);
@@ -125,8 +125,8 @@ void KviDccAcceptBox::showEvent(QShowEvent *e)
 }
 
 
-KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const QString &text,bool bDisableResume)
-: QWidget(0), KviDccBox(br,dcc)
+DccRenameDialog::DccRenameDialog(DccBroker * br,DccDescriptor * dcc,const QString &text,bool bDisableResume)
+: QWidget(0), DccDialog(br,dcc)
 {
 	setObjectName("dcc_rename_box");
 	//QVBoxLayout * vb = new QVBoxLayout(this,4,4);
@@ -165,11 +165,11 @@ KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const
 	setWindowTitle(__tr2qs_ctx("File Already Exists - KVIrc","dcc"));
 }
 
-KviDccRenameBox::~KviDccRenameBox()
+DccRenameDialog::~DccRenameDialog()
 {
 }
 
-void KviDccRenameBox::closeEvent(QCloseEvent *e)
+void DccRenameDialog::closeEvent(QCloseEvent *e)
 {
 	hide();
 	e->ignore();
@@ -181,14 +181,14 @@ void KviDccRenameBox::closeEvent(QCloseEvent *e)
 	}
 }
 
-void KviDccRenameBox::showEvent(QShowEvent *e)
+void DccRenameDialog::showEvent(QShowEvent *e)
 {
 	move((g_pApp->desktop()->width() - width()) >> 1,
 		(g_pApp->desktop()->height() - height()) >> 1);
 	QWidget::showEvent(e);
 }
 
-void KviDccRenameBox::renameClicked()
+void DccRenameDialog::renameClicked()
 {
 	hide();
 	emit renameSelected(this,m_pDescriptor);
@@ -196,7 +196,7 @@ void KviDccRenameBox::renameClicked()
 	this->deleteLater();
 }
 
-void KviDccRenameBox::overwriteClicked()
+void DccRenameDialog::overwriteClicked()
 {
 	hide();
 	emit overwriteSelected(this,m_pDescriptor);
@@ -204,7 +204,7 @@ void KviDccRenameBox::overwriteClicked()
 	this->deleteLater();
 }
 
-void KviDccRenameBox::resumeClicked()
+void DccRenameDialog::resumeClicked()
 {
 	hide();
 	m_pDescriptor->bResume = true;
@@ -213,7 +213,7 @@ void KviDccRenameBox::resumeClicked()
 	//g_pApp->collectGarbage(this);
 }
 
-void KviDccRenameBox::cancelClicked()
+void DccRenameDialog::cancelClicked()
 {
 	hide();
 	emit cancelSelected(this,m_pDescriptor);
@@ -222,5 +222,5 @@ void KviDccRenameBox::cancelClicked()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_dialogs.moc"
+#include "m_DccDialog.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/dialogs.h b/src/modules/dcc/DccDialog.h
index 6e1081893..546c789a4 100644
--- a/src/modules/dcc/dialogs.h
+++ b/src/modules/dcc/DccDialog.h
@@ -2,7 +2,7 @@
 #define _DIALOGS_H_
 //=============================================================================
 //
-//   File : dialogs.h
+//   File : DccDialog.h
 //   Creation date : Tue Sep 19 09 2000 15:17:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,31 +24,31 @@
 //
 //=============================================================================
 
-#include "broker.h"
+#include "DccBroker.h"
 
 #include "KviFileDialog.h"
 
 #include <QWidget>
 
-class KviDccBox
+class DccDialog
 {
 protected:
-	KviDccDescriptor * m_pDescriptor;
-	KviDccBroker           * m_pBroker;
+	DccDescriptor * m_pDescriptor;
+	DccBroker           * m_pBroker;
 public:
-	KviDccBox(KviDccBroker * br,KviDccDescriptor * dcc);
-	virtual ~KviDccBox();
+	DccDialog(DccBroker * br,DccDescriptor * dcc);
+	virtual ~DccDialog();
 public:
 	virtual void forgetDescriptor();
 };
 
 
-class KviDccAcceptBox : public QWidget, public KviDccBox
+class DccAcceptDialog : public QWidget, public DccDialog
 {
 	Q_OBJECT
 public:
-	KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const QString &text,const QString &capt);
-	~KviDccAcceptBox();
+	DccAcceptDialog(DccBroker * br,DccDescriptor * dcc,const QString &text,const QString &capt);
+	~DccAcceptDialog();
 protected:
 	virtual void closeEvent(QCloseEvent *e);
 	virtual void showEvent(QShowEvent *e);
@@ -56,16 +56,16 @@ private slots:
 	void acceptClicked();
 	void rejectClicked();
 signals:
-	void accepted(KviDccBox *,KviDccDescriptor *);
-	void rejected(KviDccBox *,KviDccDescriptor *);
+	void accepted(DccDialog *,DccDescriptor *);
+	void rejected(DccDialog *,DccDescriptor *);
 };
 
-class KviDccRenameBox : public QWidget, public KviDccBox
+class DccRenameDialog : public QWidget, public DccDialog
 {
 	Q_OBJECT
 public:
-	KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const QString &text,bool bDisableResume);
-	~KviDccRenameBox();
+	DccRenameDialog(DccBroker * br,DccDescriptor * dcc,const QString &text,bool bDisableResume);
+	~DccRenameDialog();
 protected:
 	virtual void closeEvent(QCloseEvent *e);
 	virtual void showEvent(QShowEvent *e);
@@ -75,9 +75,9 @@ private slots:
 	void resumeClicked();
 	void cancelClicked();
 signals:
-	void overwriteSelected(KviDccBox *,KviDccDescriptor *);
-	void renameSelected(KviDccBox *,KviDccDescriptor *);
-	void cancelSelected(KviDccBox *,KviDccDescriptor *);
+	void overwriteSelected(DccDialog *,DccDescriptor *);
+	void renameSelected(DccDialog *,DccDescriptor *);
+	void cancelSelected(DccDialog *,DccDescriptor *);
 };
 
 #endif
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/DccFileTransfer.cpp
index b4c1f0cde..4fd0ed4a2 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : send.cpp
+//   File : DccFileTransfer.cpp
 //   Creation date : Tue Sep 20 09 2000 15:14:14 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,11 +24,11 @@
 
 #define _KVI_DEBUG_CHECK_RANGE_
 
-#include "send.h"
-#include "broker.h"
-#include "marshal.h"
-#include "broker.h"
-#include "window.h"
+#include "DccFileTransfer.h"
+#include "DccBroker.h"
+#include "DccMarshal.h"
+#include "DccBroker.h"
+#include "DccWindow.h"
 
 #include "kvi_debug.h"
 #include "KviApplication.h"
@@ -56,7 +56,7 @@
 
 #ifdef COMPILE_ON_WINDOWS
 	// Ugly Windoze compiler...
-	#include "dialogs.h"
+	#include "DccDialog.h"
 #endif
 
 #include <QFile>
@@ -79,19 +79,19 @@
 
 // FIXME: The events OnDCCConnect etc are in wrong places here...!
 
-extern KviDccBroker * g_pDccBroker;
+extern DccBroker * g_pDccBroker;
 
 extern KVIRC_API KviMediaManager * g_pMediaManager; // KviApplication.cpp
 
 
-static KviPointerList<KviDccFileTransfer> * g_pDccFileTransfers = 0;
+static KviPointerList<DccFileTransfer> * g_pDccFileTransfers = 0;
 static QPixmap * g_pDccFileTransferIcon = 0;
 
 //#warning "The events that have a KviCString data pointer should become real classes, that take care of deleting the data pointer!"
 //#warning "Otherwise, when left undispatched we will be leaking memory (event class destroyed but not the data ptr)"
 
-KviDccRecvThread::KviDccRecvThread(QObject * par,kvi_socket_t fd,KviDccRecvThreadOptions * opt)
-: KviDccThread(par,fd)
+DccRecvThread::DccRecvThread(QObject * par,kvi_socket_t fd,KviDccRecvThreadOptions * opt)
+: DccThread(par,fd)
 {
 	m_pOpt                  = opt;
 	m_uAverageSpeed         = 0;
@@ -106,14 +106,14 @@ KviDccRecvThread::KviDccRecvThread(QObject * par,kvi_socket_t fd,KviDccRecvThrea
 	m_uInstantSpeedInterval = 0;
 }
 
-KviDccRecvThread::~KviDccRecvThread()
+DccRecvThread::~DccRecvThread()
 {
 	if(m_pOpt)delete m_pOpt;
 	if(m_pFile)delete m_pFile;
 	delete m_pTimeInterval;
 }
 
-bool KviDccRecvThread::sendAck(int filePos)
+bool DccRecvThread::sendAck(int filePos)
 {
 	quint32 size = htonl(filePos & 0xffffffff);
 	int iRet=0;
@@ -136,7 +136,7 @@ bool KviDccRecvThread::sendAck(int filePos)
 	return true;
 }
 
-void KviDccRecvThread::updateStats()
+void DccRecvThread::updateStats()
 {
 	m_uInstantSpeedInterval += m_pTimeInterval->mark();
 	unsigned long uCurTime = m_pTimeInterval->secondsCounter();
@@ -163,7 +163,7 @@ void KviDccRecvThread::updateStats()
 	m_pMutex->unlock();
 }
 
-void KviDccRecvThread::postMessageEvent(const char * m)
+void DccRecvThread::postMessageEvent(const char * m)
 {
 	KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_MESSAGE);
 	e->setData(new KviCString(m));
@@ -174,7 +174,7 @@ void KviDccRecvThread::postMessageEvent(const char * m)
 #define KVI_DCC_RECV_BLOCK_SIZE 8192
 #define KVI_DCC_RECV_75PERCENTOF_BLOCK_SIZE 6150
 
-void KviDccRecvThread::run()
+void DccRecvThread::run()
 {
 	// take care of sleeping a bit if we can't read stuff
 	// so we don't hog the CPU too much...
@@ -465,18 +465,18 @@ exit_dcc:
 	m_fd = KVI_INVALID_SOCKET;
 }
 
-void KviDccRecvThread::initGetInfo()
+void DccRecvThread::initGetInfo()
 {
 	m_pMutex->lock();
 }
 
-void KviDccRecvThread::doneGetInfo()
+void DccRecvThread::doneGetInfo()
 {
 	m_pMutex->unlock();
 }
 
-KviDccSendThread::KviDccSendThread(QObject * par,kvi_socket_t fd,KviDccSendThreadOptions * opt)
-: KviDccThread(par,fd)
+DccSendThread::DccSendThread(QObject * par,kvi_socket_t fd,KviDccSendThreadOptions * opt)
+: DccThread(par,fd)
 {
 	m_pOpt = opt;
 	// stats
@@ -489,13 +489,13 @@ KviDccSendThread::KviDccSendThread(QObject * par,kvi_socket_t fd,KviDccSendThrea
 	m_uInstantSpeedInterval = 0;
 }
 
-KviDccSendThread::~KviDccSendThread()
+DccSendThread::~DccSendThread()
 {
 	if(m_pOpt)delete m_pOpt;
 	delete m_pTimeInterval;
 }
 
-void KviDccSendThread::updateStats()
+void DccSendThread::updateStats()
 {
 	m_uInstantSpeedInterval += m_pTimeInterval->mark();
 
@@ -544,7 +544,7 @@ union _ack_buffer {
 	quint32 i32AckBuffer;
 };
 
-void KviDccSendThread::run()
+void DccSendThread::run()
 {
 	m_pTimeInterval->mark();
 	m_pMutex->lock();
@@ -983,18 +983,18 @@ exit_dcc:
 	m_fd = KVI_INVALID_SOCKET;
 }
 
-void KviDccSendThread::initGetInfo()
+void DccSendThread::initGetInfo()
 {
 	m_pMutex->lock();
 }
 
-void KviDccSendThread::doneGetInfo()
+void DccSendThread::doneGetInfo()
 {
 	m_pMutex->unlock();
 }
 
 
-KviDccFileTransfer::KviDccFileTransfer(KviDccDescriptor * dcc)
+DccFileTransfer::DccFileTransfer(DccDescriptor * dcc)
 : KviFileTransfer()
 {
 	init(); // ensure we're initialized
@@ -1008,7 +1008,7 @@ KviDccFileTransfer::KviDccFileTransfer(KviDccDescriptor * dcc)
 	m_pDescriptor = dcc;
 	m_pDescriptor->setTransfer(this);
 
-	m_pMarshal = new KviDccMarshal(this);
+	m_pMarshal = new DccMarshal(this);
 
 	connect(m_pMarshal,SIGNAL(error(int)),this,SLOT(handleMarshalError(int)));
 	connect(m_pMarshal,SIGNAL(connected()),this,SLOT(connected()));
@@ -1044,7 +1044,7 @@ KviDccFileTransfer::KviDccFileTransfer(KviDccDescriptor * dcc)
 	startConnection();
 }
 
-KviDccFileTransfer::~KviDccFileTransfer()
+DccFileTransfer::~DccFileTransfer()
 {
 	g_pDccFileTransfers->removeRef(this);
 
@@ -1071,19 +1071,19 @@ KviDccFileTransfer::~KviDccFileTransfer()
 	delete m_pMarshal;
 }
 
-void KviDccFileTransfer::bandwidthDialogDestroyed()
+void DccFileTransfer::bandwidthDialogDestroyed()
 {
 	m_pBandwidthDialog = 0;
 }
 
-KviWindow * KviDccFileTransfer::eventWindow()
+KviWindow * DccFileTransfer::eventWindow()
 {
 	KviWindow *w = transferWindow();
 	if(w)return w;
 	return m_pDescriptor->console();
 }
 
-void KviDccFileTransfer::startConnection()
+void DccFileTransfer::startConnection()
 {
 	if(!(m_pDescriptor->bActive))
 	{
@@ -1139,7 +1139,7 @@ void KviDccFileTransfer::startConnection()
 	displayUpdate();
 }
 
-void KviDccFileTransfer::listenOrConnect()
+void DccFileTransfer::listenOrConnect()
 {
 	if(!(m_pDescriptor->bActive))
 	{
@@ -1163,7 +1163,7 @@ void KviDccFileTransfer::listenOrConnect()
 	displayUpdate();
 }
 
-void KviDccFileTransfer::resumeTimedOut()
+void DccFileTransfer::resumeTimedOut()
 {
 	if(m_pResumeTimer)
 	{
@@ -1173,22 +1173,22 @@ void KviDccFileTransfer::resumeTimedOut()
 	handleMarshalError(KviError::ConnectionTimedOut);
 }
 
-KviWindow * KviDccFileTransfer::dccMarshalOutputWindow()
+KviWindow * DccFileTransfer::dccMarshalOutputWindow()
 {
 	return transferWindow();
 }
 
-const char * KviDccFileTransfer::dccMarshalOutputContextString()
+const char * DccFileTransfer::dccMarshalOutputContextString()
 {
 	return m_szTransferIdString.toUtf8().data();
 }
 
-QString KviDccFileTransfer::localFileName()
+QString DccFileTransfer::localFileName()
 {
 	return m_pDescriptor->szLocalFileName;
 }
 
-void KviDccFileTransfer::abort()
+void DccFileTransfer::abort()
 {
 	if(m_pSlaveRecvThread)m_pSlaveRecvThread->terminate();
 	if(m_pSlaveSendThread)m_pSlaveSendThread->terminate();
@@ -1214,7 +1214,7 @@ void KviDccFileTransfer::abort()
 	displayUpdate();
 }
 
-void KviDccFileTransfer::fillContextPopup(KviTalPopupMenu * m)
+void DccFileTransfer::fillContextPopup(KviTalPopupMenu * m)
 {
 	m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,SLOT(configureBandwidth()));
 	m->insertSeparator();
@@ -1225,16 +1225,16 @@ void KviDccFileTransfer::fillContextPopup(KviTalPopupMenu * m)
 	if(!active())m->setItemEnabled(id,false);
 }
 
-void KviDccFileTransfer::configureBandwidth()
+void DccFileTransfer::configureBandwidth()
 {
 	if(m_pBandwidthDialog)return;
-	m_pBandwidthDialog = new KviDccFileTransferBandwidthDialog(g_pFrame,this);
+	m_pBandwidthDialog = new DccFileTransferBandwidthDialog(g_pFrame,this);
 	connect(m_pBandwidthDialog,SIGNAL(destroyed()),this,SLOT(bandwidthDialogDestroyed()));
 	m_pBandwidthDialog->setModal(true);
 	m_pBandwidthDialog->show();
 }
 
-void KviDccFileTransfer::retryDCC()
+void DccFileTransfer::retryDCC()
 {
 	abort();
 	QString szRemoteNick = m_pDescriptor->remoteNick();
@@ -1247,7 +1247,7 @@ void KviDccFileTransfer::retryDCC()
 	KviKvsScript::run(szCommand,g_pActiveWindow);
 }
 
-void KviDccFileTransfer::retryTDCC()
+void DccFileTransfer::retryTDCC()
 {
 	abort();
 	QString szRemoteNick = m_pDescriptor->remoteNick();
@@ -1260,7 +1260,7 @@ void KviDccFileTransfer::retryTDCC()
 	KviKvsScript::run(szCommand,g_pActiveWindow);
 }
 
-void KviDccFileTransfer::retryRevDCC()
+void DccFileTransfer::retryRevDCC()
 {
 	abort();
 	QString szRemoteNick = m_pDescriptor->remoteNick();
@@ -1273,7 +1273,7 @@ void KviDccFileTransfer::retryRevDCC()
 	KviKvsScript::run(szCommand,g_pActiveWindow);
 }
 
-void KviDccFileTransfer::fillStatusString(QString &szBuffer)
+void DccFileTransfer::fillStatusString(QString &szBuffer)
 {
 	switch(m_eGeneralStatus)
 	{
@@ -1295,12 +1295,12 @@ void KviDccFileTransfer::fillStatusString(QString &szBuffer)
 	}
 }
 
-bool KviDccFileTransfer::active()
+bool DccFileTransfer::active()
 {
 	return ((m_eGeneralStatus == Connecting) || (m_eGeneralStatus == Transferring));
 }
 
-int KviDccFileTransfer::bandwidthLimit()
+int DccFileTransfer::bandwidthLimit()
 {
 	int iLimit = m_uMaxBandwidth; // we have the cached value anyway...
 	if(m_pDescriptor->bRecvFile)
@@ -1324,7 +1324,7 @@ int KviDccFileTransfer::bandwidthLimit()
 	return iLimit;
 }
 
-void KviDccFileTransfer::setBandwidthLimit(int iVal)
+void DccFileTransfer::setBandwidthLimit(int iVal)
 {
 	if(iVal < 0)iVal = MAX_DCC_BANDWIDTH_LIMIT;
 	if(iVal > MAX_DCC_BANDWIDTH_LIMIT)iVal = MAX_DCC_BANDWIDTH_LIMIT;
@@ -1347,7 +1347,7 @@ void KviDccFileTransfer::setBandwidthLimit(int iVal)
 	}
 }
 
-unsigned int KviDccFileTransfer::averageSpeed()
+unsigned int DccFileTransfer::averageSpeed()
 {
 	unsigned int uAvgBandwidth = 0;
 	if(m_pDescriptor->bRecvFile)
@@ -1369,7 +1369,7 @@ unsigned int KviDccFileTransfer::averageSpeed()
 	return uAvgBandwidth;
 }
 
-unsigned int KviDccFileTransfer::transferredBytes()
+unsigned int DccFileTransfer::transferredBytes()
 {
 	unsigned int uTransferred = 0;
 	if(m_pDescriptor->bRecvFile)
@@ -1391,7 +1391,7 @@ unsigned int KviDccFileTransfer::transferredBytes()
 	return uTransferred;
 }
 
-void KviDccFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
+void DccFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 {
 	int width = rect.width(), height = rect.height();
 	QString txt;
@@ -1609,13 +1609,13 @@ void KviDccFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 
 }
 
-int KviDccFileTransfer::displayHeight(int iLineSpacing)
+int DccFileTransfer::displayHeight(int iLineSpacing)
 {
 	int iH = (iLineSpacing * 3) + 10;
 	return iH >= 70 ? iH : 70;
 }
 
-QString KviDccFileTransfer::tipText()
+QString DccFileTransfer::tipText()
 {
 	QString s;
 
@@ -1632,10 +1632,10 @@ QString KviDccFileTransfer::tipText()
 	return s;
 }
 
-void KviDccFileTransfer::init()
+void DccFileTransfer::init()
 {
 	if(g_pDccFileTransfers)return;
-	g_pDccFileTransfers = new KviPointerList<KviDccFileTransfer>;
+	g_pDccFileTransfers = new KviPointerList<DccFileTransfer>;
 	g_pDccFileTransfers->setAutoDelete(false);
 
 	QPixmap * pix = g_pIconManager->getImage("kvi_dccfiletransfericons.png", false);
@@ -1643,10 +1643,10 @@ void KviDccFileTransfer::init()
 	else g_pDccFileTransferIcon = 0;
 }
 
-void KviDccFileTransfer::done()
+void DccFileTransfer::done()
 {
 	if(!g_pDccFileTransfers)return;
-	while(KviDccFileTransfer * t = g_pDccFileTransfers->first())
+	while(DccFileTransfer * t = g_pDccFileTransfers->first())
 		delete t;
 	delete g_pDccFileTransfers;
 	g_pDccFileTransfers = 0;
@@ -1654,16 +1654,16 @@ void KviDccFileTransfer::done()
 	g_pDccFileTransferIcon = 0;
 }
 
-unsigned int KviDccFileTransfer::transferCount()
+unsigned int DccFileTransfer::transferCount()
 {
 	if(!g_pDccFileTransfers)return 0;
 	return g_pDccFileTransfers->count();
 }
 
-KviDccFileTransfer * KviDccFileTransfer::nonFailedTransferWithLocalFileName(const QString &szLocalFileName)
+DccFileTransfer * DccFileTransfer::nonFailedTransferWithLocalFileName(const QString &szLocalFileName)
 {
 	if(!g_pDccFileTransfers)return 0;
-	for(KviDccFileTransfer * t = g_pDccFileTransfers->first();t;t = g_pDccFileTransfers->next())
+	for(DccFileTransfer * t = g_pDccFileTransfers->first();t;t = g_pDccFileTransfers->next())
 	{
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		// on windows the file names are case insensitive
@@ -1679,22 +1679,22 @@ KviDccFileTransfer * KviDccFileTransfer::nonFailedTransferWithLocalFileName(cons
 	return 0;
 }
 
-unsigned int KviDccFileTransfer::runningTransfersCount()
+unsigned int DccFileTransfer::runningTransfersCount()
 {
 	if(!g_pDccFileTransfers)return 0;
 	unsigned int cnt = 0;
-	for(KviDccFileTransfer * t = g_pDccFileTransfers->first();t;t = g_pDccFileTransfers->next())
+	for(DccFileTransfer * t = g_pDccFileTransfers->first();t;t = g_pDccFileTransfers->next())
 	{
 		if(t->active())cnt++;
 	}
 	return cnt;
 }
 
-bool KviDccFileTransfer::handleResumeAccepted(const char * filename,const char * port,const char * szZeroPortTag)
+bool DccFileTransfer::handleResumeAccepted(const char * filename,const char * port,const char * szZeroPortTag)
 {
 	if(!g_pDccFileTransfers)return false;
 
-	for(KviDccFileTransfer * t = g_pDccFileTransfers->first();t;t = g_pDccFileTransfers->next())
+	for(DccFileTransfer * t = g_pDccFileTransfers->first();t;t = g_pDccFileTransfers->next())
 	{
 		if(t->resumeAccepted(filename,port,szZeroPortTag))return true;
 	}
@@ -1702,12 +1702,12 @@ bool KviDccFileTransfer::handleResumeAccepted(const char * filename,const char *
 	return false;
 }
 
-bool KviDccFileTransfer::handleResumeRequest(const char * filename,const char * port,quint64 filePos)
+bool DccFileTransfer::handleResumeRequest(const char * filename,const char * port,quint64 filePos)
 {
 	if(!g_pDccFileTransfers)
 		return false;
 
-	for(KviDccFileTransfer * t = g_pDccFileTransfers->first();t;t = g_pDccFileTransfers->next())
+	for(DccFileTransfer * t = g_pDccFileTransfers->first();t;t = g_pDccFileTransfers->next())
 	{
 		if(t->doResume(filename,port,filePos))
 			return true;
@@ -1716,14 +1716,14 @@ bool KviDccFileTransfer::handleResumeRequest(const char * filename,const char *
 	return false;
 }
 
-void KviDccFileTransfer::outputAndLog(const QString &s)
+void DccFileTransfer::outputAndLog(const QString &s)
 {
 	KviWindow * out = transferWindow();
 	addToTransferLog(s);
 	if(out)out->output(KVI_OUT_DCCMSG,"[%Q]: %Q",&m_szTransferIdString,&s);
 }
 
-void KviDccFileTransfer::outputAndLog(int msgtype,const QString &s)
+void DccFileTransfer::outputAndLog(int msgtype,const QString &s)
 {
 	KviWindow * out = transferWindow();
 	addToTransferLog(s);
@@ -1731,7 +1731,7 @@ void KviDccFileTransfer::outputAndLog(int msgtype,const QString &s)
 }
 
 
-void KviDccFileTransfer::addToTransferLog(const QString &s)
+void DccFileTransfer::addToTransferLog(const QString &s)
 {
 	QDateTime dt = QDateTime::currentDateTime();
 	QString ts;
@@ -1740,7 +1740,7 @@ void KviDccFileTransfer::addToTransferLog(const QString &s)
 	m_szTransferLog += "<br>";
 }
 
-void KviDccFileTransfer::connectionInProgress()
+void DccFileTransfer::connectionInProgress()
 {
 	if(m_pDescriptor->bActive)
 	{
@@ -1848,7 +1848,7 @@ void KviDccFileTransfer::connectionInProgress()
 	displayUpdate();
 }
 
-void KviDccFileTransfer::startingSSLHandshake()
+void DccFileTransfer::startingSSLHandshake()
 {
 #ifdef COMPILE_SSL_SUPPORT
 	outputAndLog(KVI_OUT_SSL,__tr2qs_ctx("Low-level transport connection established","dcc"));
@@ -1856,14 +1856,14 @@ void KviDccFileTransfer::startingSSLHandshake()
 #endif
 }
 
-void KviDccFileTransfer::sslError(const char * msg)
+void DccFileTransfer::sslError(const char * msg)
 {
 #ifdef COMPILE_SSL_SUPPORT
 	outputAndLog(KVI_OUT_DCCERROR,__tr2qs_ctx("[SSL ERROR]: %1","dcc").arg(msg));
 #endif
 }
 
-bool KviDccFileTransfer::event(QEvent *e)
+bool DccFileTransfer::event(QEvent *e)
 {
 	if(e->type() == KVI_THREAD_EVENT)
 	{
@@ -1952,7 +1952,7 @@ bool KviDccFileTransfer::event(QEvent *e)
 	return KviFileTransfer::event(e);
 }
 
-void KviDccFileTransfer::handleMarshalError(KviError::Code eError)
+void DccFileTransfer::handleMarshalError(KviError::Code eError)
 {
 	QString szErr = KviError::getDescription(eError);
 	m_eGeneralStatus = Failure;
@@ -1963,7 +1963,7 @@ void KviDccFileTransfer::handleMarshalError(KviError::Code eError)
 	displayUpdate();
 }
 
-void KviDccFileTransfer::connected()
+void DccFileTransfer::connected()
 {
 	outputAndLog(__tr2qs_ctx("Connected to %1:%2","dcc").arg(m_pMarshal->remoteIp(), m_pMarshal->remotePort()));
 	outputAndLog(__tr2qs_ctx("Local end is %1:%2","dcc").arg(m_pMarshal->localIp(), m_pMarshal->localPort()));
@@ -1990,7 +1990,7 @@ void KviDccFileTransfer::connected()
 		o->bSendZeroAck    = KVI_OPTION_BOOL(KviOption_boolSendZeroAckInDccRecv);
 		o->bNoAcks         = m_pDescriptor->bNoAcks;
 		o->uMaxBandwidth   = m_uMaxBandwidth;
-		m_pSlaveRecvThread = new KviDccRecvThread(this,m_pMarshal->releaseSocket(),o);
+		m_pSlaveRecvThread = new DccRecvThread(this,m_pMarshal->releaseSocket(),o);
 
 #ifdef COMPILE_SSL_SUPPORT
 		KviSSL * s = m_pMarshal->releaseSSL();
@@ -2013,7 +2013,7 @@ void KviDccFileTransfer::connected()
 		if(o->iPacketSize < 32)o->iPacketSize = 32;
 		o->uMaxBandwidth   = m_uMaxBandwidth;
 		o->bNoAcks         = m_pDescriptor->bNoAcks;
-		m_pSlaveSendThread = new KviDccSendThread(this,m_pMarshal->releaseSocket(),o);
+		m_pSlaveSendThread = new DccSendThread(this,m_pMarshal->releaseSocket(),o);
 #ifdef COMPILE_SSL_SUPPORT
 		KviSSL * s = m_pMarshal->releaseSSL();
 		if(s)
@@ -2033,7 +2033,7 @@ void KviDccFileTransfer::connected()
 	displayUpdate();
 }
 
-bool KviDccFileTransfer::resumeAccepted(const char *filename,const char *port,const char *szZeroPortTag)
+bool DccFileTransfer::resumeAccepted(const char *filename,const char *port,const char *szZeroPortTag)
 {
 	if(!(kvi_strEqualCI(filename,m_pDescriptor->szFileName.toUtf8().data()) || KVI_OPTION_BOOL(KviOption_boolAcceptBrokenFileNameDccResumeRequests)))
 		return false;
@@ -2070,7 +2070,7 @@ bool KviDccFileTransfer::resumeAccepted(const char *filename,const char *port,co
 	return true;
 }
 
-bool KviDccFileTransfer::doResume(const char * filename,const char * port,quint64 filePos)
+bool DccFileTransfer::doResume(const char * filename,const char * port,quint64 filePos)
 {
 	if(m_pSlaveRecvThread)
 		return false; // we're already receiving stuff...
@@ -2157,7 +2157,7 @@ bool KviDccFileTransfer::doResume(const char * filename,const char * port,quint6
 	return true;
 }
 
-KviDccThread * KviDccFileTransfer::getSlaveThread()
+DccThread * DccFileTransfer::getSlaveThread()
 {
 	if(m_pDescriptor->bRecvFile)
 	{
@@ -2168,7 +2168,7 @@ KviDccThread * KviDccFileTransfer::getSlaveThread()
 }
 
 
-KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(QWidget * pParent,KviDccFileTransfer * t)
+DccFileTransferBandwidthDialog::DccFileTransferBandwidthDialog(QWidget * pParent,DccFileTransfer * t)
 : QDialog(pParent)
 {
 	QGridLayout * g = new QGridLayout(this);
@@ -2214,11 +2214,11 @@ KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(QWidget * p
 	g->setRowStretch(1,1);
 }
 
-KviDccFileTransferBandwidthDialog::~KviDccFileTransferBandwidthDialog()
+DccFileTransferBandwidthDialog::~DccFileTransferBandwidthDialog()
 {
 }
 
-void KviDccFileTransferBandwidthDialog::okClicked()
+void DccFileTransferBandwidthDialog::okClicked()
 {
 	int iVal = MAX_DCC_BANDWIDTH_LIMIT;
 	if(m_pEnableLimitCheck->isChecked())
@@ -2231,12 +2231,12 @@ void KviDccFileTransferBandwidthDialog::okClicked()
 	delete this;
 }
 
-void KviDccFileTransferBandwidthDialog::cancelClicked()
+void DccFileTransferBandwidthDialog::cancelClicked()
 {
 	delete this;
 }
 
-void KviDccFileTransferBandwidthDialog::closeEvent(QCloseEvent * e)
+void DccFileTransferBandwidthDialog::closeEvent(QCloseEvent * e)
 {
 	e->ignore();
 	delete this;
@@ -2244,5 +2244,5 @@ void KviDccFileTransferBandwidthDialog::closeEvent(QCloseEvent * e)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_send.moc"
+#include "m_DccFileTransfer.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/DccFileTransfer.h
index b4f5eb467..d55fb3673 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/DccFileTransfer.h
@@ -2,7 +2,7 @@
 #define _SEND_H_
 //=============================================================================
 //
-//   File : send.h
+//   File : DccFileTransfer.h
 //   Creation date : Tue Sep 24 09 2000 15:06:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,9 +24,9 @@
 //
 //=============================================================================
 
-#include "descriptor.h"
-#include "window.h"
-#include "thread.h"
+#include "DccDescriptor.h"
+#include "DccWindow.h"
+#include "DccThread.h"
 
 #include "KviWindow.h"
 #include "KviCString.h"
@@ -47,8 +47,8 @@
 class QSpinBox;
 class QTimer;
 class QPainter;
-class KviDccFileTransfer;
-class KviDccMarshal;
+class DccFileTransfer;
+class DccMarshal;
 class KviTalPopupMenu;
 
 typedef struct _KviDccSendThreadOptions
@@ -64,11 +64,11 @@ typedef struct _KviDccSendThreadOptions
 } KviDccSendThreadOptions;
 
 
-class KviDccSendThread : public KviDccThread
+class DccSendThread : public DccThread
 {
 public:
-	KviDccSendThread(QObject * par,kvi_socket_t fd,KviDccSendThreadOptions * opt);
-	~KviDccSendThread();
+	DccSendThread(QObject * par,kvi_socket_t fd,KviDccSendThreadOptions * opt);
+	~DccSendThread();
 private:
 	// stats: SHARED!!!
 	uint           m_uAverageSpeed;
@@ -110,11 +110,11 @@ typedef struct _KviDccRecvThreadOptions
 	unsigned int uMaxBandwidth;
 } KviDccRecvThreadOptions;
 
-class KviDccRecvThread : public KviDccThread
+class DccRecvThread : public DccThread
 {
 public:
-	KviDccRecvThread(QObject * par,kvi_socket_t fd,KviDccRecvThreadOptions * opt);
-	~KviDccRecvThread();
+	DccRecvThread(QObject * par,kvi_socket_t fd,KviDccRecvThreadOptions * opt);
+	~DccRecvThread();
 protected:
 	KviDccRecvThreadOptions * m_pOpt;
 
@@ -148,14 +148,14 @@ protected:
 };
 
 
-class KviDccFileTransferBandwidthDialog : public QDialog
+class DccFileTransferBandwidthDialog : public QDialog
 {
 	Q_OBJECT
 public:
-	KviDccFileTransferBandwidthDialog(QWidget * pParent,KviDccFileTransfer * t);
-	~KviDccFileTransferBandwidthDialog();
+	DccFileTransferBandwidthDialog(QWidget * pParent,DccFileTransfer * t);
+	~DccFileTransferBandwidthDialog();
 protected:
-	KviDccFileTransfer * m_pTransfer;
+	DccFileTransfer * m_pTransfer;
 	QCheckBox * m_pEnableLimitCheck;
 	QSpinBox * m_pLimitBox;
 protected:
@@ -166,18 +166,18 @@ protected slots:
 };
 
 
-class KviDccFileTransfer : public KviFileTransfer, public KviDccMarshalOutputContext
+class DccFileTransfer : public KviFileTransfer, public DccMarshalOutputContext
 {
 	enum GeneralStatus { Connecting, Transferring, Success, Failure };
 	Q_OBJECT
 public:
-	KviDccFileTransfer(KviDccDescriptor * dcc);
-	~KviDccFileTransfer();
+	DccFileTransfer(DccDescriptor * dcc);
+	~DccFileTransfer();
 private:
-	KviDccSendThread       * m_pSlaveSendThread;
-	KviDccRecvThread       * m_pSlaveRecvThread;
-	KviDccDescriptor       * m_pDescriptor;
-	KviDccMarshal          * m_pMarshal;
+	DccSendThread       * m_pSlaveSendThread;
+	DccRecvThread       * m_pSlaveRecvThread;
+	DccDescriptor       * m_pDescriptor;
+	DccMarshal          * m_pMarshal;
 
 	KviCString                   m_szTarget;
 	KviCString                   m_szDccType;
@@ -194,7 +194,7 @@ private:
 	quint64                  m_uTotalFileSize; // total file size to transfer
 
 	unsigned int             m_uMaxBandwidth;
-	KviDccFileTransferBandwidthDialog * m_pBandwidthDialog;
+	DccFileTransferBandwidthDialog * m_pBandwidthDialog;
 
 	QTimer                 * m_pResumeTimer; // used to signal resume timeout
 public:
@@ -204,7 +204,7 @@ public:
 	static void init();
 	static void done();
 	static unsigned int runningTransfersCount();
-	static KviDccFileTransfer * nonFailedTransferWithLocalFileName(const QString &szLocalFileName);
+	static DccFileTransfer * nonFailedTransferWithLocalFileName(const QString &szLocalFileName);
 	static unsigned int transferCount();
 	static bool handleResumeAccepted(const char * filename,const char * port,const char * szZeroPortTag);
 	static bool handleResumeRequest(const char * filename,const char * port,quint64 filePos);
@@ -229,7 +229,7 @@ public:
 
 	int bandwidthLimit();
 	void setBandwidthLimit(int iVal);
-	virtual KviDccThread * getSlaveThread();
+	virtual DccThread * getSlaveThread();
 protected:
 	void startConnection();
 	void listenOrConnect();
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/DccMarshal.cpp
index b2bbda32f..719ca33a8 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/DccMarshal.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : marshal.cpp
+//   File : DccMarshal.cpp
 //   Creation date : Sun Sep 17 2000 15:59:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "marshal.h"
+#include "DccMarshal.h"
 
 #include "kvi_settings.h"
 #include "KviNetUtils.h"
@@ -36,7 +36,7 @@
 
 #include <QTimer>
 
-KviDccMarshal::KviDccMarshal(KviDccMarshalOutputContext * ctx)
+DccMarshal::DccMarshal(DccMarshalOutputContext * ctx)
 : QObject(0)
 {
 	setObjectName("dcc_marshal");
@@ -54,12 +54,12 @@ KviDccMarshal::KviDccMarshal(KviDccMarshalOutputContext * ctx)
 	m_szSecondaryPort = "";
 }
 
-KviDccMarshal::~KviDccMarshal()
+DccMarshal::~DccMarshal()
 {
 	reset();
 }
 
-kvi_socket_t KviDccMarshal::releaseSocket()
+kvi_socket_t DccMarshal::releaseSocket()
 {
 	kvi_socket_t aux_fd = m_fd;
 	m_fd = KVI_INVALID_SOCKET;
@@ -67,7 +67,7 @@ kvi_socket_t KviDccMarshal::releaseSocket()
 }
 
 #ifdef COMPILE_SSL_SUPPORT
-KviSSL * KviDccMarshal::releaseSSL()
+KviSSL * DccMarshal::releaseSSL()
 {
 	KviSSL * theSSL = m_pSSL;
 	m_pSSL = 0;
@@ -75,7 +75,7 @@ KviSSL * KviDccMarshal::releaseSSL()
 }
 #endif
 
-void KviDccMarshal::reset()
+void DccMarshal::reset()
 {
 	if(m_pSn)
 	{
@@ -104,7 +104,7 @@ void KviDccMarshal::reset()
 	m_bIPv6 = false;
 }
 
-KviError::Code KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTimeout,bool bUseSSL)
+KviError::Code DccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTimeout,bool bUseSSL)
 {
 	if(m_fd != KVI_INVALID_SOCKET)
 		return KviError::AnotherConnectionInProgress;
@@ -133,7 +133,7 @@ KviError::Code KviDccMarshal::dccListen(const QString &ip,const QString &port,bo
 	return KviError::Success;
 }
 
-void KviDccMarshal::doListen()
+void DccMarshal::doListen()
 {
 	// Check the address type
 	if(!KviNetUtils::isValidStringIp(m_szIp))
@@ -300,7 +300,7 @@ void KviDccMarshal::doListen()
 	emit inProgress();
 }
 
-KviError::Code KviDccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout,bool bUseSSL)
+KviError::Code DccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout,bool bUseSSL)
 {
 	if(m_fd != KVI_INVALID_SOCKET)
 		return KviError::AnotherConnectionInProgress;
@@ -321,7 +321,7 @@ KviError::Code KviDccMarshal::dccConnect(const char * ip,const char * port,bool
 	return KviError::Success;
 }
 
-void KviDccMarshal::doConnect()
+void DccMarshal::doConnect()
 {
 	if(m_pTimeoutTimer)
 	{
@@ -444,7 +444,7 @@ void KviDccMarshal::doConnect()
 }
 
 
-void KviDccMarshal::snActivated(int)
+void DccMarshal::snActivated(int)
 {
 	if(m_pTimeoutTimer)
 	{
@@ -565,7 +565,7 @@ void KviDccMarshal::snActivated(int)
 	emit connected();
 }
 
-void KviDccMarshal::doSSLHandshake(int)
+void DccMarshal::doSSLHandshake(int)
 {
 #ifdef COMPILE_SSL_SUPPORT
 //	qDebug("DO SSL HANDSHAKE");
@@ -640,12 +640,12 @@ void KviDccMarshal::doSSLHandshake(int)
 #endif //!COMPILE_SSL_SUPPORT
 }
 
-void KviDccMarshal::abort()
+void DccMarshal::abort()
 {
 	reset();
 }
 
-void KviDccMarshal::connectionTimedOut()
+void DccMarshal::connectionTimedOut()
 {
 	reset();
 	emit error(KviError::ConnectionTimedOut);
@@ -653,5 +653,5 @@ void KviDccMarshal::connectionTimedOut()
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_marshal.moc"
+#include "m_DccMarshal.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/marshal.h b/src/modules/dcc/DccMarshal.h
index aec02107e..228905224 100644
--- a/src/modules/dcc/marshal.h
+++ b/src/modules/dcc/DccMarshal.h
@@ -2,7 +2,7 @@
 #define _MARSHAL_H_
 //=============================================================================
 //
-//   File marshal.h
+//   File DccMarshal.h
 //   Creation date : Sun Sep 17 2000 10:44:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -34,30 +34,30 @@
 #include <QTimer>
 
 class KviWindow;
-class KviDccMarshal;
+class DccMarshal;
 
 #ifdef COMPILE_SSL_SUPPORT
 	#include "KviSSLMaster.h"
 #endif
 
 
-class KviDccMarshalOutputContext
+class DccMarshalOutputContext
 {
-	friend class KviDccMarshal;
+	friend class DccMarshal;
 public:
-	KviDccMarshalOutputContext(){};
-	virtual ~KviDccMarshalOutputContext(){};
+	DccMarshalOutputContext(){};
+	virtual ~DccMarshalOutputContext(){};
 protected:
 	virtual KviWindow * dccMarshalOutputWindow() = 0;
 	virtual const char * dccMarshalOutputContextString() = 0;
 };
 
-class KviDccMarshal : public QObject
+class DccMarshal : public QObject
 {
 	Q_OBJECT
 public:
-	KviDccMarshal(KviDccMarshalOutputContext * ctx);
-	~KviDccMarshal();
+	DccMarshal(DccMarshalOutputContext * ctx);
+	~DccMarshal();
 protected:
 	// DCC DESCRIPTOR
 	QString                      m_szIp;                    // Dcc initiator ip address (the one that listens)
@@ -77,7 +77,7 @@ protected:
 	KviSSL                     * m_pSSL;
 	bool                         m_bUseSSL;
 #endif
-	KviDccMarshalOutputContext * m_pOutputContext;
+	DccMarshalOutputContext * m_pOutputContext;
 public:
 	const QString & dccIp() const { return m_szIp; };
 	const QString & dccPort() const { return m_szPort; };
diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/DccThread.cpp
index 9930866df..adc8dc1c2 100644
--- a/src/modules/dcc/thread.cpp
+++ b/src/modules/dcc/DccThread.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : thread.cpp
+//   File : DccThread.cpp
 //   Creation date : Tue Sep 20 09 2000 18:29:51 CEST Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "thread.h"
+#include "DccThread.h"
 
 #include "kvi_debug.h"
 #include "KviWindow.h"
@@ -36,19 +36,19 @@
 	#include "KviSSLMaster.h"
 #endif
 
-KviDccThread::KviDccThread(QObject * par,kvi_socket_t fd)
+DccThread::DccThread(QObject * par,kvi_socket_t fd)
 : KviSensitiveThread()
 {
 	m_pParent     = par;
 	m_fd          = fd;
 	m_pMutex      = new KviMutex();
 #ifdef COMPILE_SSL_SUPPORT
-//	qDebug("CLEARING SSL IN KviDccThread constructor");
+//	qDebug("CLEARING SSL IN DccThread constructor");
 	m_pSSL        = 0;
 #endif
 }
 
-KviDccThread::~KviDccThread()
+DccThread::~DccThread()
 {
 #ifdef COMPILE_SSL_SUPPORT
 	if(m_pSSL)KviSSLMaster::freeSSL(m_pSSL);
@@ -60,14 +60,14 @@ KviDccThread::~KviDccThread()
 }
 
 #ifdef COMPILE_SSL_SUPPORT
-void KviDccThread::setSSL(KviSSL * s)
+void DccThread::setSSL(KviSSL * s)
 {
 	if(m_pSSL)KviSSLMaster::freeSSL(m_pSSL);
 	m_pSSL = s;
 }
 #endif
 
-bool KviDccThread::handleInvalidSocketRead(int readLen)
+bool DccThread::handleInvalidSocketRead(int readLen)
 {
 	KVI_ASSERT(readLen < 1);
 	if(readLen == 0)
@@ -88,7 +88,7 @@ bool KviDccThread::handleInvalidSocketRead(int readLen)
 }
 
 #ifdef COMPILE_SSL_SUPPORT
-void KviDccThread::raiseSSLError()
+void DccThread::raiseSSLError()
 {
 	KviCString buffer;
 	while(m_pSSL->getLastErrorString(buffer))
@@ -99,14 +99,14 @@ void KviDccThread::raiseSSLError()
 }
 #endif
 
-void KviDccThread::postErrorEvent(int err)
+void DccThread::postErrorEvent(int err)
 {
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ERROR);
 	e->setData(new int(err));
 	postEvent(m_pParent,e);
 }
 
-void KviDccThread::postMessageEvent(const char * message)
+void DccThread::postMessageEvent(const char * message)
 {
 	KviThreadDataEvent<KviCString> * e = new KviThreadDataEvent<KviCString>(KVI_DCC_THREAD_EVENT_MESSAGE);
 	e->setData(new KviCString(message));
diff --git a/src/modules/dcc/thread.h b/src/modules/dcc/DccThread.h
index 03a981b55..0fc8f366b 100644
--- a/src/modules/dcc/thread.h
+++ b/src/modules/dcc/DccThread.h
@@ -2,7 +2,7 @@
 #define _THREAD_H_
 //=============================================================================
 //
-//   File : thread.h
+//   File : DccThread.h
 //   Creation date : Tue Sep 20 09 2000 18:28:44 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -52,11 +52,11 @@ typedef struct _KviDccThreadIncomingData
 	char * buffer;
 } KviDccThreadIncomingData;
 
-class KviDccThread : public KviSensitiveThread
+class DccThread : public KviSensitiveThread
 {
 public:
-	KviDccThread(QObject * par,kvi_socket_t fd);
-	~KviDccThread();
+	DccThread(QObject * par,kvi_socket_t fd);
+	~DccThread();
 protected:
 	KviMutex              * m_pMutex;     // OWNED! PROTECTS m_pOutBuffers
 	kvi_socket_t            m_fd;
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/DccUtils.cpp
index 8817bc0fa..6d794a9de 100644
--- a/src/modules/dcc/utils.cpp
+++ b/src/modules/dcc/DccUtils.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : utils.cpp
+//   File : DccUtils.cpp
 //   Creation date : Tue Jul 23 02:54:44 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 
 #define _UTILS_CPP_
 
-#include "utils.h"
+#include "DccUtils.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
diff --git a/src/modules/dcc/utils.h b/src/modules/dcc/DccUtils.h
index b201a7142..1937adb15 100644
--- a/src/modules/dcc/utils.h
+++ b/src/modules/dcc/DccUtils.h
@@ -2,7 +2,7 @@
 #define _UTILS_H_
 //=============================================================================
 //
-//   File : utils.h
+//   File : DccUtils.h
 //   Creation date : Tue Jul 23 02:54:45 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/DccVideoWindow.cpp
index 987ba5cd1..f9464158f 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : video.cpp
+//   File : DccVideoWindow.cpp
 //   Creation date : Tue Nov 10 18:08:09 2009 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,9 +24,9 @@
 
 #include "kvi_settings.h"
 
-#include "video.h"
-#include "marshal.h"
-#include "broker.h"
+#include "DccVideoWindow.h"
+#include "DccMarshal.h"
+#include "DccBroker.h"
 
 #include "KviIconManager.h"
 #include "KviIrcView.h"
@@ -60,7 +60,7 @@
 
 #define FRAME_DURATION 200 // 1 / 5fps = 200msec
 
-extern KviDccBroker * g_pDccBroker;
+extern DccBroker * g_pDccBroker;
 
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	Kopete::AV::VideoDevicePool *g_pVideoDevicePool=0;
@@ -76,17 +76,17 @@ bool kvi_dcc_video_is_valid_codec(const char * codecName)
 	return false;
 }
 
-static KviDccVideoCodec * kvi_dcc_video_get_codec(const char *codecName)
+static DccVideoCodec * kvi_dcc_video_get_codec(const char *codecName)
 {
 #ifndef COMPILE_DISABLE_OGG_THEORA
-	if(kvi_strEqualCI("theora",codecName))return new KviDccVideoTheoraCodec();
+	if(kvi_strEqualCI("theora",codecName))return new DccVideoTheoraCodec();
 #endif
-	return new KviDccVideoSJpegCodec();
+	return new DccVideoSJpegCodec();
 }
 
 
-KviDccVideoThread::KviDccVideoThread(KviWindow * wnd,kvi_socket_t fd,KviDccVideoThreadOptions * opt)
-: KviDccThread(wnd,fd)
+DccVideoThread::DccVideoThread(KviWindow * wnd,kvi_socket_t fd,KviDccVideoThreadOptions * opt)
+: DccThread(wnd,fd)
 {
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	m_pOpt = opt;
@@ -109,7 +109,7 @@ KviDccVideoThread::KviDccVideoThread(KviWindow * wnd,kvi_socket_t fd,KviDccVideo
 
 }
 
-KviDccVideoThread::~KviDccVideoThread()
+DccVideoThread::~DccVideoThread()
 {
 	stopRecording();
 #ifndef COMPILE_DISABLE_DCC_VIDEO
@@ -122,9 +122,9 @@ KviDccVideoThread::~KviDccVideoThread()
 #endif
 }
 
-bool KviDccVideoThread::readWriteStep()
+bool DccVideoThread::readWriteStep()
 {
-//	qDebug("KviDccVideoThread::readWriteStep()");
+//	qDebug("DccVideoThread::readWriteStep()");
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	// Socket management
 	bool bCanRead;
@@ -167,9 +167,9 @@ bool KviDccVideoThread::readWriteStep()
 	return true;
 }
 
-bool KviDccVideoThread::videoStep()
+bool DccVideoThread::videoStep()
 {
-//	qDebug("KviDccVideoThread::videoStep()");
+//	qDebug("DccVideoThread::videoStep()");
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	// Are we playing ?
 	if(m_bPlaying)
@@ -200,9 +200,9 @@ bool KviDccVideoThread::videoStep()
 	return true;
 }
 
-bool KviDccVideoThread::textStep()
+bool DccVideoThread::textStep()
 {
-//	qDebug("KviDccVideoThread::textStep()");
+//	qDebug("DccVideoThread::textStep()");
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	// Are we playing ?
 	if(m_bPlaying)
@@ -222,10 +222,10 @@ bool KviDccVideoThread::textStep()
 	// Are we recording ?
 	if(m_bRecording)
 	{
-		if(((KviDccVideo*)parent())->m_tmpTextDataOut.size())
+		if(((DccVideoWindow*)parent())->m_tmpTextDataOut.size())
 		{
-			m_textOutSignalBuffer.append((const unsigned char*) ((KviDccVideo*)parent())->m_tmpTextDataOut.constData(), ((KviDccVideo*)parent())->m_tmpTextDataOut.size());
-			((KviDccVideo*)parent())->m_tmpTextDataOut.clear();
+			m_textOutSignalBuffer.append((const unsigned char*) ((DccVideoWindow*)parent())->m_tmpTextDataOut.constData(), ((DccVideoWindow*)parent())->m_tmpTextDataOut.size());
+			((DccVideoWindow*)parent())->m_tmpTextDataOut.clear();
 		}
 
 		if(m_textOutSignalBuffer.size())
@@ -236,9 +236,9 @@ bool KviDccVideoThread::textStep()
 	return true;
 }
 
-bool KviDccVideoThread::handleIncomingData(KviDccThreadIncomingData * data,bool bCritical)
+bool DccVideoThread::handleIncomingData(KviDccThreadIncomingData * data,bool bCritical)
 {
-//	qDebug("KviDccVideoThread::handleIncomingData");
+//	qDebug("DccVideoThread::handleIncomingData");
 	KVI_ASSERT(data->iLen);
 	KVI_ASSERT(data->buffer);
 	char * aux = data->buffer;
@@ -299,7 +299,7 @@ bool KviDccVideoThread::handleIncomingData(KviDccThreadIncomingData * data,bool
 	return true;
 }
 
-void KviDccVideoThread::restartRecording(int iDevice, int iInput, int)
+void DccVideoThread::restartRecording(int iDevice, int iInput, int)
 {
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	m_bRecording=false;
@@ -317,7 +317,7 @@ void KviDccVideoThread::restartRecording(int iDevice, int iInput, int)
 #endif
 }
 
-void KviDccVideoThread::startRecording()
+void DccVideoThread::startRecording()
 {
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	//qDebug("Start recording");
@@ -326,13 +326,13 @@ void KviDccVideoThread::startRecording()
 //	qDebug("Posting event");
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(KVI_DCC_VIDEO_THREAD_ACTION_START_RECORDING));
-	postEvent(KviDccThread::parent(),e);
+	postEvent(DccThread::parent(),e);
 
 	m_bRecording = true;
 #endif
 }
 
-void KviDccVideoThread::stopRecording()
+void DccVideoThread::stopRecording()
 {
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	//qDebug("Stop recording");
@@ -340,13 +340,13 @@ void KviDccVideoThread::stopRecording()
 
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(KVI_DCC_VIDEO_THREAD_ACTION_STOP_RECORDING));
-	postEvent(KviDccThread::parent(),e);
+	postEvent(DccThread::parent(),e);
 
 	m_bRecording = false;
 #endif
 }
 
-void KviDccVideoThread::startPlaying()
+void DccVideoThread::startPlaying()
 {
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	//qDebug("Start playing");
@@ -354,13 +354,13 @@ void KviDccVideoThread::startPlaying()
 
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(KVI_DCC_VIDEO_THREAD_ACTION_START_PLAYING));
-	postEvent(KviDccThread::parent(),e);
+	postEvent(DccThread::parent(),e);
 	m_bPlaying = true;
 
 #endif
 }
 
-void KviDccVideoThread::stopPlaying()
+void DccVideoThread::stopPlaying()
 {
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	//qDebug("Stop playing");
@@ -368,14 +368,14 @@ void KviDccVideoThread::stopPlaying()
 
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(KVI_DCC_VIDEO_THREAD_ACTION_STOP_PLAYING));
-	postEvent(KviDccThread::parent(),e);
+	postEvent(DccThread::parent(),e);
 	m_bPlaying = false;
 #endif
 }
 
-void KviDccVideoThread::run()
+void DccVideoThread::run()
 {
-// qDebug("KviDccVideoThread::run()");
+// qDebug("DccVideoThread::run()");
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	for(;;)
 	{
@@ -415,8 +415,8 @@ exit_dcc:
 	m_fd = KVI_INVALID_SOCKET;
 }
 
-KviDccVideo::KviDccVideo(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name)
-: KviDccWindow(KVI_WINDOW_TYPE_DCCVIDEO,pFrm,name,dcc)
+DccVideoWindow::DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
+: DccWindow(KVI_WINDOW_TYPE_DCCVIDEO,pFrm,name,dcc)
 {
 	m_pDescriptor = dcc;
 	m_pSlaveThread = 0;
@@ -494,7 +494,7 @@ KviDccVideo::KviDccVideo(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char *
 
 	m_Timer.start(FRAME_DURATION);
 
-	m_pMarshal = new KviDccMarshal(this);
+	m_pMarshal = new DccMarshal(this);
 	connect(m_pMarshal,SIGNAL(error(int)),this,SLOT(handleMarshalError(int)));
 	connect(m_pMarshal,SIGNAL(connected()),this,SLOT(connected()));
 	connect(m_pMarshal,SIGNAL(inProgress()),this,SLOT(connectionInProgress()));
@@ -506,7 +506,7 @@ KviDccVideo::KviDccVideo(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char *
 	startConnection();
 }
 
-KviDccVideo::~KviDccVideo()
+DccVideoWindow::~DccVideoWindow()
 {
 	if(m_pInVideoLabel)
 	{
@@ -566,22 +566,22 @@ KviDccVideo::~KviDccVideo()
 	}
 }
 
-void KviDccVideo::textViewRightClicked()
+void DccVideoWindow::textViewRightClicked()
 {
 	KVS_TRIGGER_EVENT_1(KviEvent_OnDCCChatPopupRequest,this,m_pDescriptor->idString());
 }
 
-void KviDccVideo::triggerCreationEvents()
+void DccVideoWindow::triggerCreationEvents()
 {
 	KVS_TRIGGER_EVENT_1(KviEvent_OnDCCChatWindowCreated,this,m_pDescriptor->idString());
 }
 
-void KviDccVideo::triggerDestructionEvents()
+void DccVideoWindow::triggerDestructionEvents()
 {
 	KVS_TRIGGER_EVENT_1(KviEvent_OnDCCChatWindowClosing,this,m_pDescriptor->idString());
 }
 
-void KviDccVideo::startConnection()
+void DccVideoWindow::startConnection()
 {
 	if(!(m_pDescriptor->bActive))
 	{
@@ -599,7 +599,7 @@ void KviDccVideo::startConnection()
 	}
 }
 
-void KviDccVideo::connectionInProgress()
+void DccVideoWindow::connectionInProgress()
 {
 	if(m_pDescriptor->bActive)
 	{
@@ -629,7 +629,7 @@ void KviDccVideo::connectionInProgress()
 	}
 }
 
-const QString & KviDccVideo::target()
+const QString & DccVideoWindow::target()
 {
 	// This may change on the fly...
 	if(!m_pszTarget)
@@ -639,12 +639,12 @@ const QString & KviDccVideo::target()
 	return *m_pszTarget;
 }
 
-void KviDccVideo::getBaseLogFileName(QString &buffer)
+void DccVideoWindow::getBaseLogFileName(QString &buffer)
 {
 	buffer.sprintf("dccvideo_%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szLocalFileName.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 }
 
-void KviDccVideo::fillCaptionBuffers()
+void DccVideoWindow::fillCaptionBuffers()
 {
 	KviCString tmp(KviCString::Format,"DCC Video %s@%s:%s %s",
 		m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),
@@ -653,12 +653,12 @@ void KviDccVideo::fillCaptionBuffers()
 	m_szPlainTextCaption = tmp;
 }
 
-QPixmap * KviDccVideo::myIconPtr()
+QPixmap * DccVideoWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCVOICE);
 }
 
-void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
+void DccVideoWindow::ownMessage(const QString &text, bool bUserFeedback)
 {
 	if(!m_pSlaveThread)
 	{
@@ -738,14 +738,14 @@ void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
 			m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsoleWindow::NoNotifications);
 }
 
-const QString & KviDccVideo::localNick()
+const QString & DccVideoWindow::localNick()
 {
 	// FIXME: This is just a complete HACK
 	m_szLocalNick = m_pDescriptor->szLocalNick;
 	return m_szLocalNick;
 }
 
-void KviDccVideo::ownAction(const QString &text)
+void DccVideoWindow::ownAction(const QString &text)
 {
 	if(m_pSlaveThread)
 	{
@@ -769,7 +769,7 @@ void KviDccVideo::ownAction(const QString &text)
 	}
 }
 
-bool KviDccVideo::event(QEvent *e)
+bool DccVideoWindow::event(QEvent *e)
 {
 	if(e->type() == KVI_THREAD_EVENT)
 	{
@@ -915,13 +915,13 @@ bool KviDccVideo::event(QEvent *e)
 	return KviWindow::event(e);
 }
 
-void KviDccVideo::handleMarshalError(KviError::Code eError)
+void DccVideoWindow::handleMarshalError(KviError::Code eError)
 {
 	QString ssss = KviError::getDescription(eError);
 	output(KVI_OUT_DCCERROR,__tr2qs_ctx("DCC Failed: %Q","dcc"),&ssss);
 }
 
-void KviDccVideo::connected()
+void DccVideoWindow::connected()
 {
 	output(KVI_OUT_DCCMSG,__tr2qs_ctx("Connected to %Q:%Q","dcc"),
 		&(m_pMarshal->remoteIp()),&(m_pMarshal->remotePort()));
@@ -941,7 +941,7 @@ void KviDccVideo::connected()
 
 	output(KVI_OUT_DCCMSG,__tr2qs_ctx("Actual codec used is '%s'","dcc"),opt->pCodec->name());
 
-	m_pSlaveThread = new KviDccVideoThread(this,m_pMarshal->releaseSocket(),opt);
+	m_pSlaveThread = new DccVideoThread(this,m_pMarshal->releaseSocket(),opt);
 
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	if(g_pVideoDevicePool)
@@ -958,27 +958,27 @@ void KviDccVideo::connected()
 	m_pSlaveThread->start();
 }
 
-void KviDccVideo::stopTalking()
+void DccVideoWindow::stopTalking()
 {
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(0));
 	m_pSlaveThread->enqueueEvent(e);
 }
 
-void KviDccVideo::startTalking()
+void DccVideoWindow::startTalking()
 {
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(1));
 	m_pSlaveThread->enqueueEvent(e);
 }
 
-void KviDccVideo::startOrStopTalking(bool bStart)
+void DccVideoWindow::startOrStopTalking(bool bStart)
 {
 	if(bStart)startTalking();
 	else stopTalking();
 }
 
-void KviDccVideo::slotUpdateImage()
+void DccVideoWindow::slotUpdateImage()
 {
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	if(m_pSlaveThread && isVisible())
@@ -989,7 +989,7 @@ void KviDccVideo::slotUpdateImage()
 #endif
 }
 
-void KviDccVideo::deviceRegistered(const QString &)
+void DccVideoWindow::deviceRegistered(const QString &)
 {
 
 #ifndef COMPILE_DISABLE_DCC_VIDEO
@@ -1012,7 +1012,7 @@ void KviDccVideo::deviceRegistered(const QString &)
 }
 
 
-void KviDccVideo::deviceUnregistered(const QString & )
+void DccVideoWindow::deviceUnregistered(const QString & )
 {
 #ifndef COMPILE_DISABLE_DCC_VIDEO
 	g_pVideoDevicePool->fillDeviceQComboBox(m_pCDevices);
@@ -1021,12 +1021,12 @@ void KviDccVideo::deviceUnregistered(const QString & )
 #endif
 }
 
-void KviDccVideo::videoInputChanged(int )
+void DccVideoWindow::videoInputChanged(int )
 {
 	if(m_pSlaveThread)
 		m_pSlaveThread->restartRecording(m_pCDevices->currentIndex(), m_pCInputs->currentIndex(), m_pCStandards->currentIndex());
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_video.moc"
+#include "m_DccVideoWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/video.h b/src/modules/dcc/DccVideoWindow.h
index 5f09d8fc1..b0cc2c7f4 100644
--- a/src/modules/dcc/video.h
+++ b/src/modules/dcc/DccVideoWindow.h
@@ -2,7 +2,7 @@
 #define _VIDEO_H_
 //=============================================================================
 //
-//   File : video.h
+//   File : DccVideoWindow.h
 //   Creation date : Tue Nov 10 18:08:09 2009 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,10 +24,10 @@
 //
 //=============================================================================
 
-#include "codec.h"
-#include "descriptor.h"
-#include "thread.h"
-#include "window.h"
+#include "DccVoiceCodec.h"
+#include "DccDescriptor.h"
+#include "DccThread.h"
+#include "DccWindow.h"
 
 #include "KviWindow.h"
 #include "KviDataBuffer.h"
@@ -53,7 +53,7 @@
 #endif
 
 class QSlider;
-class KviDccMarshal;
+class DccMarshal;
 
 #ifndef _DCC_VIDEO_CPP_
 	extern bool kvi_dcc_video_is_valid_codec(const char * codecName);
@@ -67,15 +67,15 @@ class KviDccMarshal;
 typedef struct _KviDccVideoThreadOptions
 {
 	QString            szVideoDevice;
-	KviDccVideoCodec * pCodec;
+	DccVideoCodec * pCodec;
 } KviDccVideoThreadOptions;
 
-class KviDccVideoThread : public KviDccThread
+class DccVideoThread : public DccThread
 {
-	friend class KviDccVideo;
+	friend class DccVideoWindow;
 public:
-	KviDccVideoThread(KviWindow * wnd,kvi_socket_t fd,KviDccVideoThreadOptions * opt);
-	~KviDccVideoThread();
+	DccVideoThread(KviWindow * wnd,kvi_socket_t fd,KviDccVideoThreadOptions * opt);
+	~DccVideoThread();
 protected:
 	KviDccVideoThreadOptions * m_pOpt;
 	KviDataBuffer              m_outFrameBuffer;
@@ -104,13 +104,13 @@ protected:
 };
 
 
-class KviDccVideo : public KviDccWindow
+class DccVideoWindow : public DccWindow
 {
 	Q_OBJECT
-	friend class KviDccVideoThread;
+	friend class DccVideoThread;
 public:
-	KviDccVideo(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name);
-	~KviDccVideo();
+	DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name);
+	~DccVideoWindow();
 protected:
 	KviThemedLabel         * m_pLabel;
 	KviTalHBox             * m_pButtonBox;
@@ -125,7 +125,7 @@ protected:
 	QTimer                   m_Timer;
 	QLabel                 * m_pVideoLabel[2];
 	QString                * m_pszTarget;
-	KviDccVideoThread      * m_pSlaveThread;
+	DccVideoThread      * m_pSlaveThread;
 	QByteArray               m_tmpTextDataOut;
 	QString                  m_szLocalNick;
 protected:
diff --git a/src/modules/dcc/adpcmcodec.cpp b/src/modules/dcc/DccVoiceAdpcmCodec.cpp
index 4e9f45f13..043797359 100644
--- a/src/modules/dcc/adpcmcodec.cpp
+++ b/src/modules/dcc/DccVoiceAdpcmCodec.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : adpcmcodec.h
+//   File : DccVoiceAdpcmCodec.h
 //   Creation date : Wed Aug 22 19:12:46 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -51,7 +51,7 @@
 //
 
 #define _ADPCMCODEC_CPP_
-#include "adpcmcodec.h"
+#include "DccVoiceAdpcmCodec.h"
 
 #include <stdio.h> /*DBG*/
 
@@ -232,8 +232,8 @@ void ADPCM_uncompress(char indata[],short outdata[],int len,ADPCM_state *state)
 }
 
 
-KviDccVoiceAdpcmCodec::KviDccVoiceAdpcmCodec()
-: KviDccVoiceCodec()
+DccVoiceAdpcmCodec::DccVoiceAdpcmCodec()
+: DccVoiceCodec()
 {
 	m_pEncodeState = new ADPCM_state;
 	m_pEncodeState->index = 0;
@@ -244,13 +244,13 @@ KviDccVoiceAdpcmCodec::KviDccVoiceAdpcmCodec()
 	m_szName = "adpcm (compression 1:4)";
 }
 
-KviDccVoiceAdpcmCodec::~KviDccVoiceAdpcmCodec()
+DccVoiceAdpcmCodec::~DccVoiceAdpcmCodec()
 {
 	delete m_pEncodeState;
 	delete m_pDecodeState;
 }
 
-void KviDccVoiceAdpcmCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream)
+void DccVoiceAdpcmCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream)
 {
 	if(signal->size() < ADPCM_UNPACKED_FRAME_SIZE_IN_BYTES)return; // nothing to encode
 
@@ -272,7 +272,7 @@ void KviDccVoiceAdpcmCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream
 	signal->remove(uTotalDataCompressed);
 }
 
-void KviDccVoiceAdpcmCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal)
+void DccVoiceAdpcmCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal)
 {
 	if(stream->size() < ADPCM_PACKED_FRAME_SIZE_IN_BYTES)return; // nothing to decode
 
@@ -295,12 +295,12 @@ void KviDccVoiceAdpcmCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal
 	stream->remove(uTotalDataDecompressed);
 }
 
-int KviDccVoiceAdpcmCodec::encodedFrameSize()
+int DccVoiceAdpcmCodec::encodedFrameSize()
 {
 	return ADPCM_PACKED_FRAME_SIZE_IN_BYTES;
 }
 
-int KviDccVoiceAdpcmCodec::decodedFrameSize()
+int DccVoiceAdpcmCodec::decodedFrameSize()
 {
 	return ADPCM_UNPACKED_FRAME_SIZE_IN_BYTES;
 }
diff --git a/src/modules/dcc/adpcmcodec.h b/src/modules/dcc/DccVoiceAdpcmCodec.h
index 8843ee893..d993ecb68 100644
--- a/src/modules/dcc/adpcmcodec.h
+++ b/src/modules/dcc/DccVoiceAdpcmCodec.h
@@ -2,7 +2,7 @@
 #define _ADPCMCODEC_H_
 //=============================================================================
 //
-//   File : adpcmcodec.h
+//   File : DccVoiceAdpcmCodec.h
 //   Creation date : Wed Aug 22 19:12:46 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -45,20 +45,20 @@
 
 #include <QString> // fix for qtextstream.h
 
-#include "codec.h"
+#include "DccVoiceCodec.h"
 
 typedef struct adpcm_state
 {
 	short valprev; /* Previous output value */
-	char  index;   /* Index into stepsize table */
+	char  index;   /* HelpIndex into stepsize table */
 } ADPCM_state;
 
 
-class KviDccVoiceAdpcmCodec : public KviDccVoiceCodec
+class DccVoiceAdpcmCodec : public DccVoiceCodec
 {
 public:
-	KviDccVoiceAdpcmCodec();
-	virtual ~KviDccVoiceAdpcmCodec();
+	DccVoiceAdpcmCodec();
+	virtual ~DccVoiceAdpcmCodec();
 private:
 	ADPCM_state * m_pEncodeState;
 	ADPCM_state * m_pDecodeState;
diff --git a/src/modules/dcc/codec.cpp b/src/modules/dcc/DccVoiceCodec.cpp
index 39ab5d98b..76491d14c 100644
--- a/src/modules/dcc/codec.cpp
+++ b/src/modules/dcc/DccVoiceCodec.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : codec.cpp
+//   File : DccVoiceCodec.cpp
 //   Creation date : Sun Aug 26 04:19:36 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,62 +22,62 @@
 //
 //=============================================================================
 
-#include "codec.h"
+#include "DccVoiceCodec.h"
 
 
 #include <QImage>
 #include <QByteArray>
 #include <QBuffer>
 
-KviDccVoiceCodec::KviDccVoiceCodec()
+DccVoiceCodec::DccVoiceCodec()
 {
 }
 
-KviDccVoiceCodec::~KviDccVoiceCodec()
+DccVoiceCodec::~DccVoiceCodec()
 {
 }
 
-void KviDccVoiceCodec::encode(KviDataBuffer *,KviDataBuffer *)
+void DccVoiceCodec::encode(KviDataBuffer *,KviDataBuffer *)
 {
 }
 
-void KviDccVoiceCodec::decode(KviDataBuffer *,KviDataBuffer *)
+void DccVoiceCodec::decode(KviDataBuffer *,KviDataBuffer *)
 {
 }
 
-int KviDccVoiceCodec::encodedFrameSize()
+int DccVoiceCodec::encodedFrameSize()
 {
 	return 0;
 }
 
-int KviDccVoiceCodec::decodedFrameSize()
+int DccVoiceCodec::decodedFrameSize()
 {
 	return 0;
 }
 
-const char * KviDccVoiceCodec::name()
+const char * DccVoiceCodec::name()
 {
 	return m_szName.ptr();
 }
 
-KviDccVoiceNullCodec::KviDccVoiceNullCodec()
-: KviDccVoiceCodec()
+DccVoiceNullCodec::DccVoiceNullCodec()
+: DccVoiceCodec()
 {
 	m_szName = "null (no compression)";
 }
 
-KviDccVoiceNullCodec::~KviDccVoiceNullCodec()
+DccVoiceNullCodec::~DccVoiceNullCodec()
 {
 }
 
-void KviDccVoiceNullCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream)
+void DccVoiceNullCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream)
 {
 	if(signal->size() < 1)return;
 	stream->append(signal->data(),signal->size());
 	signal->resize(0);
 }
 
-void KviDccVoiceNullCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal)
+void DccVoiceNullCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal)
 {
 	if(stream->size() < 1)return;
 	signal->append(stream->data(),stream->size());
@@ -85,64 +85,64 @@ void KviDccVoiceNullCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal)
 	stream->resize(0);
 }
 
-int KviDccVoiceNullCodec::encodedFrameSize()
+int DccVoiceNullCodec::encodedFrameSize()
 {
 	return 1024;
 }
 
-int KviDccVoiceNullCodec::decodedFrameSize()
+int DccVoiceNullCodec::decodedFrameSize()
 {
 	return 1024;
 }
 
 //--------------------------
 
-KviDccVideoCodec::KviDccVideoCodec()
+DccVideoCodec::DccVideoCodec()
 {
 }
 
-KviDccVideoCodec::~KviDccVideoCodec()
+DccVideoCodec::~DccVideoCodec()
 {
 }
 
-void KviDccVideoCodec::encodeVideo(KviDataBuffer *,KviDataBuffer *)
+void DccVideoCodec::encodeVideo(KviDataBuffer *,KviDataBuffer *)
 {
 }
 
-void KviDccVideoCodec::encodeText(KviDataBuffer *,KviDataBuffer *)
+void DccVideoCodec::encodeText(KviDataBuffer *,KviDataBuffer *)
 {
 }
 
-void KviDccVideoCodec::decode(KviDataBuffer *,KviDataBuffer *,KviDataBuffer *)
+void DccVideoCodec::decode(KviDataBuffer *,KviDataBuffer *,KviDataBuffer *)
 {
 }
 
-int KviDccVideoCodec::encodedFrameSize()
+int DccVideoCodec::encodedFrameSize()
 {
 	return 0;
 }
 
-int KviDccVideoCodec::decodedFrameSize()
+int DccVideoCodec::decodedFrameSize()
 {
 	return 0;
 }
 
-const char * KviDccVideoCodec::name()
+const char * DccVideoCodec::name()
 {
 	return m_szName.ptr();
 }
 
-KviDccVideoSJpegCodec::KviDccVideoSJpegCodec()
-: KviDccVideoCodec()
+DccVideoSJpegCodec::DccVideoSJpegCodec()
+: DccVideoCodec()
 {
 	m_szName = "sjpeg";
 }
 
-KviDccVideoSJpegCodec::~KviDccVideoSJpegCodec()
+DccVideoSJpegCodec::~DccVideoSJpegCodec()
 {
 }
 
-void KviDccVideoSJpegCodec::encodeVideo(KviDataBuffer * videoSignal,KviDataBuffer * stream)
+void DccVideoSJpegCodec::encodeVideo(KviDataBuffer * videoSignal,KviDataBuffer * stream)
 {
 
 	if(videoSignal->size() < 1) return;
@@ -162,7 +162,7 @@ void KviDccVideoSJpegCodec::encodeVideo(KviDataBuffer * videoSignal,KviDataBuffe
 	videoSignal->clear();
 }
 
-void KviDccVideoSJpegCodec::encodeText(KviDataBuffer * textSignal, KviDataBuffer * stream)
+void DccVideoSJpegCodec::encodeText(KviDataBuffer * textSignal, KviDataBuffer * stream)
 {
 	static unsigned const char *irct_magic_init = (unsigned const char*) "\0<text>\0";
 	static unsigned const char *irct_magic_end = (unsigned const char*) "\0</text>\0";
@@ -176,7 +176,7 @@ void KviDccVideoSJpegCodec::encodeText(KviDataBuffer * textSignal, KviDataBuffer
 	return;
 }
 
-void KviDccVideoSJpegCodec::decode(KviDataBuffer * stream,KviDataBuffer * videoSignal,KviDataBuffer * textSignal)
+void DccVideoSJpegCodec::decode(KviDataBuffer * stream,KviDataBuffer * videoSignal,KviDataBuffer * textSignal)
 {
 	static unsigned const char jpg_magic_init[4] = { 0xFF, 0xD8, 0xFF, 0xE0}; //SOI + APP0
 	static unsigned const char jpg_magic_end[2] = { 0xFF, 0xD9}; //EOI
@@ -252,27 +252,27 @@ void KviDccVideoSJpegCodec::decode(KviDataBuffer * stream,KviDataBuffer * videoS
 	}
 }
 
-int KviDccVideoSJpegCodec::encodedFrameSize()
+int DccVideoSJpegCodec::encodedFrameSize()
 {
 	return 0;
 }
 
-int KviDccVideoSJpegCodec::decodedFrameSize()
+int DccVideoSJpegCodec::decodedFrameSize()
 {
 	return 0;
 }
 
 
 #ifndef COMPILE_DISABLE_OGG_THEORA
-KviDccVideoTheoraCodec::KviDccVideoTheoraCodec()
-: KviDccVideoCodec()
+DccVideoTheoraCodec::DccVideoTheoraCodec()
+: DccVideoCodec()
 {
 	m_szName = "theora";
 	m_pEncoder = 0;
 	m_pDecoder = 0;
 }
 
-KviDccVideoTheoraCodec::~KviDccVideoTheoraCodec()
+DccVideoTheoraCodec::~DccVideoTheoraCodec()
 {
 	if(m_pEncoder)
 		delete m_pEncoder;
@@ -283,7 +283,7 @@ KviDccVideoTheoraCodec::~KviDccVideoTheoraCodec()
 	m_pDecoder=0;
 }
 
-void KviDccVideoTheoraCodec::encodeVideo(KviDataBuffer * videoSignal,KviDataBuffer * stream)
+void DccVideoTheoraCodec::encodeVideo(KviDataBuffer * videoSignal,KviDataBuffer * stream)
 {
 	if(videoSignal->size() < 1) return;
 
@@ -294,7 +294,7 @@ void KviDccVideoTheoraCodec::encodeVideo(KviDataBuffer * videoSignal,KviDataBuff
 	videoSignal->clear();
 }
 
-void KviDccVideoTheoraCodec::encodeText(KviDataBuffer * textSignal, KviDataBuffer * stream)
+void DccVideoTheoraCodec::encodeText(KviDataBuffer * textSignal, KviDataBuffer * stream)
 {
 	if(textSignal->size() < 1) return;
 
@@ -305,7 +305,7 @@ void KviDccVideoTheoraCodec::encodeText(KviDataBuffer * textSignal, KviDataBuffe
 	textSignal->clear();
 }
 
-void KviDccVideoTheoraCodec::decode(KviDataBuffer * stream,KviDataBuffer * videoSignal,KviDataBuffer * textSignal)
+void DccVideoTheoraCodec::decode(KviDataBuffer * stream,KviDataBuffer * videoSignal,KviDataBuffer * textSignal)
 {
 	if(stream->size() < 1)return;
 
@@ -315,12 +315,12 @@ void KviDccVideoTheoraCodec::decode(KviDataBuffer * stream,KviDataBuffer * video
 	m_pDecoder->addData(stream);
 }
 
-int KviDccVideoTheoraCodec::encodedFrameSize()
+int DccVideoTheoraCodec::encodedFrameSize()
 {
 	return 0;
 }
 
-int KviDccVideoTheoraCodec::decodedFrameSize()
+int DccVideoTheoraCodec::decodedFrameSize()
 {
 	return 0;
 }
diff --git a/src/modules/dcc/codec.h b/src/modules/dcc/DccVoiceCodec.h
index 16897304c..b8438c328 100644
--- a/src/modules/dcc/codec.h
+++ b/src/modules/dcc/DccVoiceCodec.h
@@ -2,7 +2,7 @@
 #define _CODEC_H_
 //=============================================================================
 //
-//   File : codec.h
+//   File : DccVoiceCodec.h
 //   Creation date : Sun Aug 26 04:19:34 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -32,11 +32,11 @@
 	#include "KviOggTheoraEncoder.h"
 #endif
 
-class KviDccVoiceCodec
+class DccVoiceCodec
 {
 public:
-	KviDccVoiceCodec();
-	virtual ~KviDccVoiceCodec();
+	DccVoiceCodec();
+	virtual ~DccVoiceCodec();
 protected:
 	KviCString m_szName;
 public:
@@ -47,11 +47,11 @@ public:
 	virtual int decodedFrameSize();
 };
 
-class KviDccVoiceNullCodec : public KviDccVoiceCodec
+class DccVoiceNullCodec : public DccVoiceCodec
 {
 public:
-	KviDccVoiceNullCodec();
-	virtual ~KviDccVoiceNullCodec();
+	DccVoiceNullCodec();
+	virtual ~DccVoiceNullCodec();
 public:
 	virtual void encode(KviDataBuffer * signal,KviDataBuffer * stream);
 	virtual void decode(KviDataBuffer * stream,KviDataBuffer * signal);
@@ -59,11 +59,11 @@ public:
 	virtual int decodedFrameSize();
 };
 
-class KviDccVideoCodec
+class DccVideoCodec
 {
 public:
-	KviDccVideoCodec();
-	virtual ~KviDccVideoCodec();
+	DccVideoCodec();
+	virtual ~DccVideoCodec();
 protected:
 	KviCString m_szName;
 public:
@@ -75,11 +75,11 @@ public:
 	virtual int decodedFrameSize();
 };
 
-class KviDccVideoSJpegCodec : public KviDccVideoCodec
+class DccVideoSJpegCodec : public DccVideoCodec
 {
 public:
-	KviDccVideoSJpegCodec();
-	virtual ~KviDccVideoSJpegCodec();
+	DccVideoSJpegCodec();
+	virtual ~DccVideoSJpegCodec();
 public:
 	virtual void encodeVideo(KviDataBuffer * videoSignal, KviDataBuffer * stream);
 	virtual void encodeText(KviDataBuffer * textSignal, KviDataBuffer * stream);
@@ -89,11 +89,11 @@ public:
 };
 
 #ifndef COMPILE_DISABLE_OGG_THEORA
-class KviDccVideoTheoraCodec : public KviDccVideoCodec
+class DccVideoTheoraCodec : public DccVideoCodec
 {
 public:
-	KviDccVideoTheoraCodec();
-	virtual ~KviDccVideoTheoraCodec();
+	DccVideoTheoraCodec();
+	virtual ~DccVideoTheoraCodec();
 public:
 	virtual void encodeVideo(KviDataBuffer * videoSignal, KviDataBuffer * stream);
 	virtual void encodeText(KviDataBuffer * textSignal, KviDataBuffer * stream);
diff --git a/src/modules/dcc/gsmcodec.cpp b/src/modules/dcc/DccVoiceGsmCodec.cpp
index 21635ebd9..61961fd63 100644
--- a/src/modules/dcc/gsmcodec.cpp
+++ b/src/modules/dcc/DccVoiceGsmCodec.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : gsmcodec.cpp
+//   File : DccVoiceGsmCodec.cpp
 //   Creation date : Wed Aug 22 19:12:55 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 
 #define _GSMCODEC_CPP_
 
-#include "gsmcodec.h"
+#include "DccVoiceGsmCodec.h"
 
 #ifdef COMPILE_USE_GSM
 	#include <dlfcn.h>
@@ -71,21 +71,21 @@
 	}
 
 
-	KviDccVoiceGsmCodec::KviDccVoiceGsmCodec()
-	: KviDccVoiceCodec()
+	DccVoiceGsmCodec::DccVoiceGsmCodec()
+	: DccVoiceCodec()
 	{
 		m_pEncodeState = gsm_session_create();
 		m_pDecodeState = gsm_session_create();
 		m_szName = "gsm (compression 33:320)";
 	}
 
-	KviDccVoiceGsmCodec::~KviDccVoiceGsmCodec()
+	DccVoiceGsmCodec::~DccVoiceGsmCodec()
 	{
 		gsm_session_destroy(m_pEncodeState);
 		gsm_session_destroy(m_pDecodeState);
 	}
 
-	void KviDccVoiceGsmCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream)
+	void DccVoiceGsmCodec::encode(KviDataBuffer * signal,KviDataBuffer * stream)
 	{
 		if(signal->size() < GSM_UNPACKED_FRAME_SIZE_IN_BYTES)return; // nothing to encode
 
@@ -107,7 +107,7 @@
 		signal->remove(uTotalDataCompressed);
 	}
 
-	void KviDccVoiceGsmCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal)
+	void DccVoiceGsmCodec::decode(KviDataBuffer * stream,KviDataBuffer * signal)
 	{
 		if(stream->size() < GSM_PACKED_FRAME_SIZE_IN_BYTES)return; // nothing to decode
 
@@ -135,12 +135,12 @@
 		stream->remove(uTotalDataDecompressed);
 	}
 
-	int KviDccVoiceGsmCodec::encodedFrameSize()
+	int DccVoiceGsmCodec::encodedFrameSize()
 	{
 		return GSM_PACKED_FRAME_SIZE_IN_BYTES;
 	}
 
-	int KviDccVoiceGsmCodec::decodedFrameSize()
+	int DccVoiceGsmCodec::decodedFrameSize()
 	{
 		return GSM_UNPACKED_FRAME_SIZE_IN_BYTES;
 	}
diff --git a/src/modules/dcc/gsmcodec.h b/src/modules/dcc/DccVoiceGsmCodec.h
index 27971f87c..cd820e7d6 100644
--- a/src/modules/dcc/gsmcodec.h
+++ b/src/modules/dcc/DccVoiceGsmCodec.h
@@ -2,7 +2,7 @@
 #define _GSMCODEC_H_
 //=============================================================================
 //
-//   File : gsmcodec.h
+//   File : DccVoiceGsmCodec.h
 //   Creation date : Wed Aug 22 19:12:54 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -29,18 +29,18 @@
 
 #ifdef COMPILE_USE_GSM
 
-	#include "codec.h"
+	#include "DccVoiceCodec.h"
 
 	#ifndef _GSMCODEC_CPP_
 		extern bool kvi_gsm_codec_init();
 		extern void kvi_gsm_codec_done();
 	#endif //_GSMCODEC_CPP_
 
-	class KviDccVoiceGsmCodec : public KviDccVoiceCodec
+	class DccVoiceGsmCodec : public DccVoiceCodec
 	{
 	public:
-		KviDccVoiceGsmCodec();
-		virtual ~KviDccVoiceGsmCodec();
+		DccVoiceGsmCodec();
+		virtual ~DccVoiceGsmCodec();
 	private:
 		void * m_pEncodeState;
 		void * m_pDecodeState;
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/DccVoiceWindow.cpp
index d78cdfa0a..f1ede8af7 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/DccVoiceWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : voice.cpp
+//   File : DccVoiceWindow.cpp
 //   Creation date : Thu Aug 23 04:08:09 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "voice.h"
-#include "marshal.h"
-#include "broker.h"
-#include "adpcmcodec.h"
-#include "gsmcodec.h"
+#include "DccVoiceWindow.h"
+#include "DccMarshal.h"
+#include "DccBroker.h"
+#include "DccVoiceAdpcmCodec.h"
+#include "DccVoiceGsmCodec.h"
 
 #include "kvi_settings.h"
 #include "KviIconManager.h"
@@ -56,7 +56,7 @@
 	#include <sys/ioctl.h>  // for ioctl()
 #endif
 
-extern KviDccBroker * g_pDccBroker;
+extern DccBroker * g_pDccBroker;
 
 //Check for the *SS Api....we don't want to fail here...
 
@@ -102,22 +102,22 @@ bool kvi_dcc_voice_is_valid_codec(const char * codecName)
 	return false;
 }
 
-static KviDccVoiceCodec * kvi_dcc_voice_get_codec(const char * codecName)
+static DccVoiceCodec * kvi_dcc_voice_get_codec(const char * codecName)
 {
 #ifdef COMPILE_USE_GSM
 	if(kvi_strEqualCI("gsm",codecName))
 	{
-		if(kvi_gsm_codec_init())return new KviDccVoiceGsmCodec();
+		if(kvi_gsm_codec_init())return new DccVoiceGsmCodec();
 	}
 #endif
-	if(kvi_strEqualCI("adpcm",codecName))return new KviDccVoiceAdpcmCodec();
-	if(kvi_strEqualCI("null",codecName))return new KviDccVoiceNullCodec();
-	return new KviDccVoiceAdpcmCodec();
+	if(kvi_strEqualCI("adpcm",codecName))return new DccVoiceAdpcmCodec();
+	if(kvi_strEqualCI("null",codecName))return new DccVoiceNullCodec();
+	return new DccVoiceAdpcmCodec();
 }
 
 
-KviDccVoiceThread::KviDccVoiceThread(KviWindow * wnd,kvi_socket_t fd,KviDccVoiceThreadOptions * opt)
-: KviDccThread(wnd,fd)
+DccVoiceThread::DccVoiceThread(KviWindow * wnd,kvi_socket_t fd,KviDccVoiceThreadOptions * opt)
+: DccThread(wnd,fd)
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	m_pOpt = opt;
@@ -131,7 +131,7 @@ KviDccVoiceThread::KviDccVoiceThread(KviWindow * wnd,kvi_socket_t fd,KviDccVoice
 #endif
 }
 
-KviDccVoiceThread::~KviDccVoiceThread()
+DccVoiceThread::~DccVoiceThread()
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	delete m_pOpt->pCodec;
@@ -140,7 +140,7 @@ KviDccVoiceThread::~KviDccVoiceThread()
 #endif
 }
 
-bool KviDccVoiceThread::checkSoundcard()
+bool DccVoiceThread::checkSoundcard()
 {
 #ifdef COMPILE_DISABLE_DCC_VOICE
 	return false;
@@ -176,7 +176,7 @@ bool KviDccVoiceThread::checkSoundcard()
 }
 
 
-bool KviDccVoiceThread::openSoundcard(int mode)
+bool DccVoiceThread::openSoundcard(int mode)
 {
 #ifdef COMPILE_DISABLE_DCC_VOICE
 	return false;
@@ -225,7 +225,7 @@ exit_false:
 #endif
 }
 
-bool KviDccVoiceThread::openSoundcardForWriting()
+bool DccVoiceThread::openSoundcardForWriting()
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	return openSoundcardWithDuplexOption(O_WRONLY,O_RDONLY);
@@ -234,7 +234,7 @@ bool KviDccVoiceThread::openSoundcardForWriting()
 #endif
 }
 
-bool KviDccVoiceThread::openSoundcardForReading()
+bool DccVoiceThread::openSoundcardForReading()
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	return openSoundcardWithDuplexOption(O_RDONLY,O_WRONLY);
@@ -243,7 +243,7 @@ bool KviDccVoiceThread::openSoundcardForReading()
 #endif
 }
 
-bool KviDccVoiceThread::openSoundcardWithDuplexOption(int openMode,int failMode)
+bool DccVoiceThread::openSoundcardWithDuplexOption(int openMode,int failMode)
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	if(m_soundFd == -1)
@@ -283,7 +283,7 @@ bool KviDccVoiceThread::openSoundcardWithDuplexOption(int openMode,int failMode)
 #endif
 }
 
-void KviDccVoiceThread::closeSoundcard()
+void DccVoiceThread::closeSoundcard()
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	if(m_soundFd != -1)
@@ -295,7 +295,7 @@ void KviDccVoiceThread::closeSoundcard()
 #endif
 }
 
-bool KviDccVoiceThread::readWriteStep()
+bool DccVoiceThread::readWriteStep()
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	// Socket management
@@ -355,7 +355,7 @@ bool KviDccVoiceThread::readWriteStep()
 	return true;
 }
 
-bool KviDccVoiceThread::soundStep()
+bool DccVoiceThread::soundStep()
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	// Are we playing ?
@@ -516,7 +516,7 @@ bool KviDccVoiceThread::soundStep()
 	return true;
 }
 
-void KviDccVoiceThread::startRecording()
+void DccVoiceThread::startRecording()
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	//qDebug("Start recording");
@@ -536,7 +536,7 @@ void KviDccVoiceThread::startRecording()
 #endif
 }
 
-void KviDccVoiceThread::stopRecording()
+void DccVoiceThread::stopRecording()
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	//qDebug("Stop recording");
@@ -552,7 +552,7 @@ void KviDccVoiceThread::stopRecording()
 #endif
 }
 
-void KviDccVoiceThread::startPlaying()
+void DccVoiceThread::startPlaying()
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	//qDebug("Start playing");
@@ -568,7 +568,7 @@ void KviDccVoiceThread::startPlaying()
 #endif
 }
 
-void KviDccVoiceThread::stopPlaying()
+void DccVoiceThread::stopPlaying()
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	//qDebug("Stop playing");
@@ -583,7 +583,7 @@ void KviDccVoiceThread::stopPlaying()
 #endif
 }
 
-void KviDccVoiceThread::run()
+void DccVoiceThread::run()
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	for(;;)
@@ -637,8 +637,8 @@ exit_dcc:
 }
 
 
-KviDccVoice::KviDccVoice(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name)
-: KviDccWindow(KVI_WINDOW_TYPE_DCCVOICE,pFrm,name,dcc)
+DccVoiceWindow::DccVoiceWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
+: DccWindow(KVI_WINDOW_TYPE_DCCVOICE,pFrm,name,dcc)
 {
 	m_pDescriptor = dcc;
 	m_pSlaveThread = 0;
@@ -703,7 +703,7 @@ KviDccVoice::KviDccVoice(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char *
 
 	//setFocusHandler(m_pIrcView,this);
 
-	m_pMarshal = new KviDccMarshal(this);
+	m_pMarshal = new DccMarshal(this);
 	connect(m_pMarshal,SIGNAL(error(int)),this,SLOT(handleMarshalError(int)));
 	connect(m_pMarshal,SIGNAL(connected()),this,SLOT(connected()));
 	connect(m_pMarshal,SIGNAL(inProgress()),this,SLOT(connectionInProgress()));
@@ -713,7 +713,7 @@ KviDccVoice::KviDccVoice(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char *
 	startConnection();
 }
 
-KviDccVoice::~KviDccVoice()
+DccVoiceWindow::~DccVoiceWindow()
 {
 	g_pDccBroker->unregisterDccWindow(this);
 	if(m_pSlaveThread)
@@ -731,7 +731,7 @@ KviDccVoice::~KviDccVoice()
 }
 
 
-void KviDccVoice::startConnection()
+void DccVoiceWindow::startConnection()
 {
 	if(!(m_pDescriptor->bActive))
 	{
@@ -749,7 +749,7 @@ void KviDccVoice::startConnection()
 	}
 }
 
-void KviDccVoice::connectionInProgress()
+void DccVoiceWindow::connectionInProgress()
 {
 	if(m_pDescriptor->bActive)
 	{
@@ -779,7 +779,7 @@ void KviDccVoice::connectionInProgress()
 	}
 }
 
-const QString & KviDccVoice::target()
+const QString & DccVoiceWindow::target()
 {
 	// This may change on the fly...
 	m_szTarget.sprintf("%s@%s:%s",
@@ -787,12 +787,12 @@ const QString & KviDccVoice::target()
 	return m_szTarget;
 }
 
-void KviDccVoice::getBaseLogFileName(QString &buffer)
+void DccVoiceWindow::getBaseLogFileName(QString &buffer)
 {
 	buffer.sprintf("dccvoice_%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szLocalFileName.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
 }
 
-void KviDccVoice::fillCaptionBuffers()
+void DccVoiceWindow::fillCaptionBuffers()
 {
 	KviCString tmp(KviCString::Format,"DCC Voice %s@%s:%s %s",
 		m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data(),
@@ -801,12 +801,12 @@ void KviDccVoice::fillCaptionBuffers()
 	m_szPlainTextCaption = tmp;
 }
 
-QPixmap * KviDccVoice::myIconPtr()
+QPixmap * DccVoiceWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCVOICE);
 }
 
-bool KviDccVoice::event(QEvent *e)
+bool DccVoiceWindow::event(QEvent *e)
 {
 	if(e->type() == KVI_THREAD_EVENT)
 	{
@@ -866,7 +866,7 @@ bool KviDccVoice::event(QEvent *e)
 	return KviWindow::event(e);
 }
 
-void KviDccVoice::updateInfo()
+void DccVoiceWindow::updateInfo()
 {
 	if(m_pSlaveThread)
 	{
@@ -881,14 +881,14 @@ void KviDccVoice::updateInfo()
 	}
 }
 
-void KviDccVoice::resizeEvent(QResizeEvent *)
+void DccVoiceWindow::resizeEvent(QResizeEvent *)
 {
 	int hght2 = m_pHBox->sizeHint().height();
 	m_pHBox->setGeometry(0,0,width(),hght2);
 	m_pSplitter->setGeometry(0,hght2,width(),height() - hght2);
 }
 
-QSize KviDccVoice::sizeHint() const
+QSize DccVoiceWindow::sizeHint() const
 {
 	int w = m_pIrcView->sizeHint().width();
 	int w2 = m_pHBox->sizeHint().width();
@@ -896,7 +896,7 @@ QSize KviDccVoice::sizeHint() const
 	return ret;
 }
 
-void KviDccVoice::handleMarshalError(KviError::Code eError)
+void DccVoiceWindow::handleMarshalError(KviError::Code eError)
 {
 	QString ssss = KviError::getDescription(eError);
 	output(KVI_OUT_DCCERROR,__tr2qs_ctx("DCC Failed: %Q","dcc"),&ssss);
@@ -906,7 +906,7 @@ void KviDccVoice::handleMarshalError(KviError::Code eError)
 	m_pPlayingLabel->setEnabled(false);
 }
 
-void KviDccVoice::connected()
+void DccVoiceWindow::connected()
 {
 	output(KVI_OUT_DCCMSG,__tr2qs_ctx("Connected to %Q:%Q","dcc"),
 		&(m_pMarshal->remoteIp()),&(m_pMarshal->remotePort()));
@@ -936,34 +936,34 @@ void KviDccVoice::connected()
 	opt->szSoundDevice = KVI_OPTION_STRING(KviOption_stringDccVoiceSoundDevice).toUtf8().data();
 	opt->iSampleRate = m_pDescriptor->iSampleRate;
 
-	m_pSlaveThread = new KviDccVoiceThread(this,m_pMarshal->releaseSocket(),opt);
+	m_pSlaveThread = new DccVoiceThread(this,m_pMarshal->releaseSocket(),opt);
 	connect(m_pUpdateTimer,SIGNAL(timeout()),this,SLOT(updateInfo()));
 	m_pSlaveThread->start();
 
 	m_pTalkButton->setEnabled(true);
 }
 
-void KviDccVoice::stopTalking()
+void DccVoiceWindow::stopTalking()
 {
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(0));
 	m_pSlaveThread->enqueueEvent(e);
 }
 
-void KviDccVoice::startTalking()
+void DccVoiceWindow::startTalking()
 {
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(1));
 	m_pSlaveThread->enqueueEvent(e);
 }
 
-void KviDccVoice::startOrStopTalking(bool bStart)
+void DccVoiceWindow::startOrStopTalking(bool bStart)
 {
 	if(bStart)startTalking();
 	else stopTalking();
 }
 
-int KviDccVoice::getMixerVolume(void) const
+int DccVoiceWindow::getMixerVolume(void) const
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	int fd;
@@ -995,7 +995,7 @@ int KviDccVoice::getMixerVolume(void) const
 #endif
 }
 
-void KviDccVoice::setMixerVolume(int vol)
+void DccVoiceWindow::setMixerVolume(int vol)
 {
 #ifndef COMPILE_DISABLE_DCC_VOICE
 	int fd;
@@ -1019,7 +1019,7 @@ void KviDccVoice::setMixerVolume(int vol)
 /* The code below doesn't work. Guess I have to catch some other widget's focusInEvent. Which one ? */
 /* The point is to move the volume slider to correct position if for example user switched to
  * another KVirc window, fired up xmms, changed the volume, and returned to our dcc voice window */
-void KviDccVoice::focusInEvent(QFocusEvent *e)
+void DccVoiceWindow::focusInEvent(QFocusEvent *e)
 {
 //	qDebug("focusInEvent()");
 	m_pVolumeSlider->setValue(getMixerVolume());
@@ -1029,5 +1029,5 @@ void KviDccVoice::focusInEvent(QFocusEvent *e)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_voice.moc"
+#include "m_DccVoiceWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/DccVoiceWindow.h
index 5f6ec6bff..73af363c0 100644
--- a/src/modules/dcc/voice.h
+++ b/src/modules/dcc/DccVoiceWindow.h
@@ -2,7 +2,7 @@
 #define _VOICE_H_
 //=============================================================================
 //
-//   File : voice.h
+//   File : DccVoiceWindow.h
 //   Creation date : Thu Aug 23 04:08:10 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,10 +24,10 @@
 //
 //=============================================================================
 
-#include "codec.h"
-#include "descriptor.h"
-#include "thread.h"
-#include "window.h"
+#include "DccVoiceCodec.h"
+#include "DccDescriptor.h"
+#include "DccThread.h"
+#include "DccWindow.h"
 
 #include "KviWindow.h"
 #include "KviDataBuffer.h"
@@ -40,7 +40,7 @@
 #include <QTimer>
 
 class QSlider;
-class KviDccMarshal;
+class DccMarshal;
 
 #ifndef _DCC_VOICE_CPP_
 	extern bool kvi_dcc_voice_is_valid_codec(const char * codecName);
@@ -57,15 +57,15 @@ typedef struct _KviDccVoiceThreadOptions
 	int                iPreBufferSize;
 	int                iSampleRate;
 	KviCString             szSoundDevice;
-	KviDccVoiceCodec * pCodec;
+	DccVoiceCodec * pCodec;
 } KviDccVoiceThreadOptions;
 
-class KviDccVoiceThread : public KviDccThread
+class DccVoiceThread : public DccThread
 {
-	friend class KviDccVoice;
+	friend class DccVoiceWindow;
 public:
-	KviDccVoiceThread(KviWindow * wnd,kvi_socket_t fd,KviDccVoiceThreadOptions * opt);
-	~KviDccVoiceThread();
+	DccVoiceThread(KviWindow * wnd,kvi_socket_t fd,KviDccVoiceThreadOptions * opt);
+	~DccVoiceThread();
 protected:
 //	bool                       m_bUseGsm;
 	KviDccVoiceThreadOptions * m_pOpt;
@@ -103,12 +103,12 @@ protected:
 };
 
 
-class KviDccVoice : public KviDccWindow
+class DccVoiceWindow : public DccWindow
 {
 	Q_OBJECT
 public:
-	KviDccVoice(KviMainWindow *pFrm,KviDccDescriptor * dcc,const char * name);
-	~KviDccVoice();
+	DccVoiceWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name);
+	~DccVoiceWindow();
 protected:
 	KviTalHBox                  * m_pHBox;
 	QSlider                * m_pVolumeSlider;
@@ -119,7 +119,7 @@ protected:
 	QToolButton            * m_pTalkButton;
 	QTimer                 * m_pUpdateTimer;
 	QString                  m_szTarget;
-	KviDccVoiceThread      * m_pSlaveThread;
+	DccVoiceThread      * m_pSlaveThread;
 protected:
 	virtual void focusInEvent(QFocusEvent *);
 	virtual const QString & target();
diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/DccWindow.cpp
index 43d06e728..e6da3fa12 100644
--- a/src/modules/dcc/window.cpp
+++ b/src/modules/dcc/DccWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : window.cpp
+//   File : DccWindow.cpp
 //   Creation date : Fri Jul 26 02:04:40 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "window.h"
+#include "DccWindow.h"
 
 #include "KviTalHBox.h"
 
-KviDccWindow::KviDccWindow(int type,KviMainWindow * lpFrm,const char * name,KviDccDescriptor * d)
+DccWindow::DccWindow(int type,KviMainWindow * lpFrm,const char * name,DccDescriptor * d)
 : KviWindow(type,lpFrm,name, d->console())
 {
 	m_pDescriptor = d;
@@ -36,23 +36,23 @@ KviDccWindow::KviDccWindow(int type,KviMainWindow * lpFrm,const char * name,KviD
 	createTextEncodingButton(m_pButtonBox);
 }
 
-KviDccWindow::~KviDccWindow()
+DccWindow::~DccWindow()
 {
 	if(m_pMarshal)delete m_pMarshal;
 	if(m_pDescriptor)delete m_pDescriptor;
 }
 
-KviWindow * KviDccWindow::dccMarshalOutputWindow()
+KviWindow * DccWindow::dccMarshalOutputWindow()
 {
 	return this;
 }
 
-const char * KviDccWindow::dccMarshalOutputContextString()
+const char * DccWindow::dccMarshalOutputContextString()
 {
 	static const char * static_context = "DCC";
 	return static_context;
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_window.moc"
+#include "m_DccWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/window.h b/src/modules/dcc/DccWindow.h
index 601ab88b0..544b17e10 100644
--- a/src/modules/dcc/window.h
+++ b/src/modules/dcc/DccWindow.h
@@ -2,7 +2,7 @@
 #define _WINDOW_H_
 //=============================================================================
 //
-//   File : window.h
+//   File : DccWindow.h
 //   Creation date : Fri Jul 26 02:04:39 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,25 +24,25 @@
 //
 //=============================================================================
 
-#include "descriptor.h"
-#include "marshal.h"
+#include "DccDescriptor.h"
+#include "DccMarshal.h"
 
 #include "KviWindow.h"
-class KviDccThread;
+class DccThread;
 
-class KviDccWindow : public KviWindow, public KviDccMarshalOutputContext
+class DccWindow : public KviWindow, public DccMarshalOutputContext
 {
 	Q_OBJECT
 public:
-	KviDccWindow(int type,KviMainWindow * lpFrm,const char * name,KviDccDescriptor * d);
-	~KviDccWindow();
+	DccWindow(int type,KviMainWindow * lpFrm,const char * name,DccDescriptor * d);
+	~DccWindow();
 protected:
-	KviDccDescriptor       * m_pDescriptor;
-	KviDccMarshal          * m_pMarshal;
+	DccDescriptor       * m_pDescriptor;
+	DccMarshal          * m_pMarshal;
 public:
-	KviDccDescriptor       * descriptor() { return m_pDescriptor; };
-	const KviDccMarshal    * marshal() { return m_pMarshal; };
-	virtual KviDccThread   * getSlaveThread() { return 0; };
+	DccDescriptor       * descriptor() { return m_pDescriptor; };
+	const DccMarshal    * marshal() { return m_pMarshal; };
+	virtual DccThread   * getSlaveThread() { return 0; };
 	virtual KviWindow      * dccMarshalOutputWindow();
 	virtual const char     * dccMarshalOutputContextString();
 };
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 765d78a1d..18cb9badd 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -457,7 +457,7 @@
 	//
 	// KviCanvasView
 	//
-	KviCanvasView::KviCanvasView(QCanvas * c,KviCanvasWidget * cw,QWidget * par)
+	KviCanvasView::KviCanvasView(QCanvas * c,DccCanvasWidget * cw,QWidget * par)
 	: QCanvasView(c,par)
 	{
 		m_pCanvasWidget = cw;
@@ -1451,9 +1451,9 @@
 
 	//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	//
-	// KviCanvasWidget
+	// DccCanvasWidget
 	//
-	KviCanvasWidget::KviCanvasWidget(QWidget * par)
+	DccCanvasWidget::DccCanvasWidget(QWidget * par)
 	: QWidget(par,"canvas_widget")
 	{
 		m_pCanvas = new QCanvas(this);
@@ -1495,11 +1495,11 @@
 		m_pMenuBar->insertItem(__tr2qs_ctx("&Insert","dcc"),add);
 	}
 
-	KviCanvasWidget::~KviCanvasWidget()
+	DccCanvasWidget::~DccCanvasWidget()
 	{
 	}
 
-	void KviCanvasWidget::resizeEvent(QResizeEvent *)
+	void DccCanvasWidget::resizeEvent(QResizeEvent *)
 	{
 		int h = m_pMenuBar->sizeHint().height();
 		m_pMenuBar->setGeometry(0,0,width(),h);
diff --git a/src/modules/dcc/canvaswidget.h b/src/modules/dcc/canvaswidget.h
index ac994bf28..41a14d628 100644
--- a/src/modules/dcc/canvaswidget.h
+++ b/src/modules/dcc/canvaswidget.h
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "broker.h"
+#include "DccBroker.h"
 
 #ifdef COMPILE_DCC_CANVAS
 	#include <QCanvas>
@@ -35,7 +35,7 @@
 	#include <QTable>
 	#include <QSplitter>
 
-	class KviCanvasWidget;
+	class DccCanvasWidget;
 
 	#define KVI_CANVAS_RTTI_CONTROL_TYPE_RECTANGLE 1
 	#define KVI_CANVAS_RTTI_CONTROL_TYPE_LINE 2
@@ -191,7 +191,7 @@
 	{
 		Q_OBJECT
 	public:
-		KviCanvasView(QCanvas * c,KviCanvasWidget * cw,QWidget * par);
+		KviCanvasView(QCanvas * c,DccCanvasWidget * cw,QWidget * par);
 		~KviCanvasView();
 	public:
 		enum State { Idle, SelectOrigin };
@@ -205,7 +205,7 @@
 			LeftBottom, RightBottom, Scale, SinglePoint, Rotate
 		};
 	protected:
-		KviCanvasWidget * m_pCanvasWidget;
+		DccCanvasWidget * m_pCanvasWidget;
 
 		// Insertion of objects
 		State             m_state;
@@ -280,13 +280,13 @@
 	};
 
 
-	class KviCanvasWidget : public QWidget
+	class DccCanvasWidget : public QWidget
 	{
 		friend class KviCanvasView;
 		Q_OBJECT
 	public:
-		KviCanvasWidget(QWidget * par);
-		~KviCanvasWidget();
+		DccCanvasWidget(QWidget * par);
+		~DccCanvasWidget();
 	protected:
 		QSplitter     * m_pSplitter;
 		QCanvas       * m_pCanvas;
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 596802962..54b60de54 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "gsmcodec.h"
-#include "broker.h"
-#include "voice.h"
-#include "video.h"
-#include "utils.h"
-#include "send.h"
-#include "window.h"
+#include "DccVoiceGsmCodec.h"
+#include "DccBroker.h"
+#include "DccVoiceWindow.h"
+#include "DccVideoWindow.h"
+#include "DccUtils.h"
+#include "DccFileTransfer.h"
+#include "DccWindow.h"
 
 #include "kvi_debug.h"
 #include "kvi_settings.h"
@@ -53,17 +53,17 @@
 
 #ifdef COMPILE_ON_WINDOWS
 	// Ugly Windoze compiler...
-	#include "dialogs.h"
+	#include "DccDialog.h"
 #endif
 
 //#warning "KviOption_boolIgnoreDccChat and other types too"
 
 //extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 
-KviDccBroker * g_pDccBroker = 0;
+DccBroker * g_pDccBroker = 0;
 
 
-static void dcc_module_set_dcc_type(KviDccDescriptor * d,const char * szBaseType)
+static void dcc_module_set_dcc_type(DccDescriptor * d,const char * szBaseType)
 {
 	d->szType = szBaseType;
 #ifdef COMPILE_SSL_SUPPORT
@@ -72,7 +72,7 @@ static void dcc_module_set_dcc_type(KviDccDescriptor * d,const char * szBaseType
 	if(d->bIsTdcc)d->szType.prepend('T');
 }
 
-static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCommandCall *c)
+static bool dcc_kvs_parse_default_parameters(DccDescriptor * d,KviKvsModuleCommandCall *c)
 {
 	d->bIsTdcc = c->switches()->find('t',"tdcc");
 
@@ -401,7 +401,7 @@ static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("target",KVS_PT_NONEMPTYSTRING,0,szTarget)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * d = new KviDccDescriptor(c->window()->console());
+	DccDescriptor * d = new DccDescriptor(c->window()->console());
 
 	d->szNick       = szTarget;    // we always specify the nickname
 	d->szUser       = __tr2qs_ctx("unknown","dcc"); // username is always unknown
@@ -610,7 +610,7 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("file name",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szFileName)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * d = new KviDccDescriptor(c->window()->console());
+	DccDescriptor * d = new DccDescriptor(c->window()->console());
 
 	d->szNick            = szTarget;    // we always specify the nickname
 
@@ -797,7 +797,7 @@ static bool dcc_kvs_cmd_recv(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("size",KVS_PT_UINT,0,uSize)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * d = new KviDccDescriptor(c->window()->console());
+	DccDescriptor * d = new DccDescriptor(c->window()->console());
 	d->szNick            = szTarget;
 	d->szUser            = __tr2qs_ctx("unknown","dcc");
 	d->szHost            = d->szUser;
@@ -879,7 +879,7 @@ static bool dcc_kvs_cmd_rsend(KviKvsModuleCommandCall * c)
 
 	KVSM_REQUIRE_CONNECTION(c)
 
-	KviDccDescriptor * d = new KviDccDescriptor(c->window()->console());
+	DccDescriptor * d = new DccDescriptor(c->window()->console());
 	d->szNick            = szTarget;
 	d->szLocalFileName   = szFileName;
 	d->bIsTdcc           = c->switches()->find('t',"tdcc");
@@ -1114,7 +1114,7 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 	return true;
 #endif
 
-	KviDccDescriptor * d = new KviDccDescriptor(c->window()->console());
+	DccDescriptor * d = new DccDescriptor(c->window()->console());
 
 	d->szNick       = szTarget;              // we always specify the nickname
 	d->szUser       = __tr2qs_ctx("unknown","dcc"); // username is always unknown
@@ -1192,7 +1192,7 @@ static bool dcc_kvs_cmd_video(KviKvsModuleCommandCall * c)
 	return true;
 #else
 
-	KviDccDescriptor * d = new KviDccDescriptor(c->window()->console());
+	DccDescriptor * d = new DccDescriptor(c->window()->console());
 
 	d->szNick       = szTarget;              // we always specify the nickname
 	d->szUser       = __tr2qs_ctx("unknown","dcc"); // username is always unknown
@@ -1258,7 +1258,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 
 	if(target.isEmpty())return c->error(KviError_notEnoughParameters,"%s",__tr_ctx("Missing target nickname","dcc"));
 
-	KviDccDescriptor * d = new KviDccDescriptor(c->window()->console());
+	DccDescriptor * d = new DccDescriptor(c->window()->console());
 
 	d->szNick       = target.ptr();              // we always specify the nickname
 	d->szUser       = __tr2qs_ctx("unknown","dcc"); // username is always unknown
@@ -1628,20 +1628,20 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 		"XDCC" has exactly the same meaning as "DCC" (at least in KVIrc).[br]
 */
 
-static KviDccDescriptor * dcc_kvs_find_dcc_descriptor(const kvs_uint_t &uId,KviKvsModuleRunTimeCall * c,bool bWarn = true)
+static DccDescriptor * dcc_kvs_find_dcc_descriptor(const kvs_uint_t &uId,KviKvsModuleRunTimeCall * c,bool bWarn = true)
 {
-	KviDccDescriptor * dcc = 0;
+	DccDescriptor * dcc = 0;
 	if(uId == 0)
 	{
-		if(c->window()->inherits("KviDccWindow"))
+		if(c->window()->inherits("DccWindow"))
 		{
-			dcc = ((KviDccWindow *)(c->window()))->descriptor();
+			dcc = ((DccWindow *)(c->window()))->descriptor();
 		}
 		if((!dcc) && bWarn)
 			c->warning(__tr2qs_ctx("The current window has no associated DCC session","dcc"));
 		return dcc;
 	}
-	dcc = KviDccDescriptor::find(uId);
+	dcc = DccDescriptor::find(uId);
 	if((!dcc) && bWarn)
 		c->warning(__tr2qs_ctx("The specified parameter is not a valid DCC identifier","dcc"));
 	return dcc;
@@ -1679,7 +1679,7 @@ static bool dcc_kvs_cmd_abort(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->find('q',"quiet"));
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->find('q',"quiet"));
 
 	if(dcc)
 	{
@@ -1719,7 +1719,7 @@ static bool dcc_kvs_cmd_setBandwidthLimit(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->find('q',"quiet"));
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->find('q',"quiet"));
 	if(dcc)
 	{
 		if (dcc->transfer())dcc->transfer()->setBandwidthLimit(uVal);
@@ -1757,7 +1757,7 @@ static bool dcc_kvs_fnc_protocol(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->protocol());
 	return true;
@@ -1794,7 +1794,7 @@ static bool dcc_kvs_fnc_connectionType(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->isActive() ? "ACTIVE" : "PASSIVE");
 	return true;
@@ -1830,7 +1830,7 @@ static bool dcc_kvs_fnc_isFileTransfer(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,false);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,false);
 
 	if(dcc)c->returnValue()->setBoolean(dcc->isFileTransfer());
 	return true;
@@ -1866,7 +1866,7 @@ static bool dcc_kvs_fnc_isFileUpload(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setBoolean(dcc->isFileUpload());
 	return true;
@@ -1902,7 +1902,7 @@ static bool dcc_kvs_fnc_isFileDownload(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setBoolean(dcc->isFileDownload());
 	return true;
@@ -1937,7 +1937,7 @@ static bool dcc_kvs_fnc_localNick(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->localNick());
 	return true;
@@ -1972,7 +1972,7 @@ static bool dcc_kvs_fnc_localUser(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->localUser());
 	return true;
@@ -2006,7 +2006,7 @@ static bool dcc_kvs_fnc_localHost(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->localHost());
 	return true;
@@ -2041,7 +2041,7 @@ static bool dcc_kvs_fnc_localIp(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->localIp());
 	return true;
@@ -2075,7 +2075,7 @@ static bool dcc_kvs_fnc_localPort(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->localPort());
 	return true;
@@ -2107,7 +2107,7 @@ static bool dcc_kvs_fnc_localFileName(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->localFileName());
 	return true;
@@ -2144,7 +2144,7 @@ static bool dcc_kvs_fnc_localFileSize(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->localFileSize().isEmpty() ? QString("0") : dcc->localFileSize());
 	return true;
@@ -2179,7 +2179,7 @@ static bool dcc_kvs_fnc_remoteNick(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->remoteNick());
 	return true;
@@ -2214,7 +2214,7 @@ static bool dcc_kvs_fnc_remoteUser(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->remoteUser());
 	return true;
@@ -2248,7 +2248,7 @@ static bool dcc_kvs_fnc_remoteHost(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->remoteHost());
 	return true;
@@ -2282,7 +2282,7 @@ static bool dcc_kvs_fnc_remoteIp(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->remoteIp());
 	return true;
@@ -2317,7 +2317,7 @@ static bool dcc_kvs_fnc_remotePort(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->remotePort());
 	return true;
@@ -2349,7 +2349,7 @@ static bool dcc_kvs_fnc_remoteFileName(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->remoteFileName());
 	return true;
@@ -2386,7 +2386,7 @@ static bool dcc_kvs_fnc_remoteFileSize(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setString(dcc->remoteFileSize().isEmpty() ? QString("0") : dcc->remoteFileSize());
 	return true;
@@ -2424,7 +2424,7 @@ static bool dcc_kvs_fnc_ircContext(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)c->returnValue()->setInteger(dcc->console()->context()->id());
 	return true;
@@ -2464,7 +2464,7 @@ static bool dcc_kvs_fnc_transferStatus(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)
 	{
@@ -2509,7 +2509,7 @@ static bool dcc_kvs_fnc_transferredBytes(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)
 	{
@@ -2555,7 +2555,7 @@ static bool dcc_kvs_fnc_averageSpeed(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)
 	{
@@ -2596,11 +2596,11 @@ static bool dcc_kvs_fnc_session(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("window_id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = 0;
+	DccDescriptor * dcc = 0;
 	if(szWinId.isEmpty())
 	{
-		if(c->window()->inherits("KviDccWindow"))
-			dcc = ((KviDccWindow *)(c->window()))->descriptor();
+		if(c->window()->inherits("DccWindow"))
+			dcc = ((DccWindow *)(c->window()))->descriptor();
 		if(!dcc)
 		{
 			c->warning(__tr2qs_ctx("The current window has no associated DCC session","dcc"));
@@ -2619,8 +2619,8 @@ static bool dcc_kvs_fnc_session(KviKvsModuleFunctionCall * c)
 		return true;
 	}
 
-	if(pWnd->inherits("KviDccWindow"))
-		dcc = ((KviDccWindow *)pWnd)->descriptor();
+	if(pWnd->inherits("DccWindow"))
+		dcc = ((DccWindow *)pWnd)->descriptor();
 	if(!dcc)
 	{
 		c->warning(__tr2qs_ctx("The current window has no associated DCC session","dcc"));
@@ -2662,17 +2662,17 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 	KviKvsArray * a = new KviKvsArray();
 	c->returnValue()->setArray(a);
 
-	KviPointerHashTable<int,KviDccDescriptor> * dict = KviDccDescriptor::descriptorDict();
+	KviPointerHashTable<int,DccDescriptor> * dict = DccDescriptor::descriptorDict();
 	if(!dict)return true;
 
-	KviPointerHashTableIterator<int,KviDccDescriptor> it(*dict);
+	KviPointerHashTableIterator<int,DccDescriptor> it(*dict);
 
 	int idx = 0;
 
 	if(szFlags.isEmpty())
 	{
 		// all
-		while(KviDccDescriptor * dcc = it.current())
+		while(DccDescriptor * dcc = it.current())
 		{
 			a->set(idx++,new KviKvsVariant((kvs_int_t)(dcc->id())));
 			++it;
@@ -2682,7 +2682,7 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 		bool bWantFileDownloads = szFlags.contains('d',Qt::CaseInsensitive) != -1;
 		bool bWantChats = szFlags.contains('c',Qt::CaseInsensitive) != -1;
 
-		while(KviDccDescriptor * dcc = it.current())
+		while(DccDescriptor * dcc = it.current())
 		{
 			if((dcc->isFileUpload() && bWantFileUploads) ||
 				(dcc->isFileDownload() && bWantFileDownloads) ||
@@ -2787,7 +2787,7 @@ static bool dcc_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c)
 			return true;
 		}
 	}
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
+	DccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c);
 
 	if(dcc)
 	{
@@ -2798,7 +2798,7 @@ static bool dcc_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c)
 			return true;
 		}
 
-		KviDccThread * pSlaveThread = 0;
+		DccThread * pSlaveThread = 0;
 		if(dcc->window())
 			pSlaveThread = dcc->window()->getSlaveThread();
 		else if(dcc->transfer())
@@ -2901,7 +2901,7 @@ static bool dcc_kvs_fnc_getSSLCertInfo(KviKvsModuleFunctionCall * c)
 
 static bool dcc_module_init(KviModule * m)
 {
-	g_pDccBroker = new KviDccBroker();
+	g_pDccBroker = new DccBroker();
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"send",dcc_kvs_cmd_send);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"chat",dcc_kvs_cmd_chat);
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 5dbe4cea5..232c7a441 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -24,16 +24,16 @@
 
 #define _KVI_DEBUG_CHECK_RANGE_
 
-#include "gsmcodec.h"
-#include "broker.h"
+#include "DccVoiceGsmCodec.h"
+#include "DccBroker.h"
 
 #ifndef COMPILE_DISABLE_DCC_VIDEO
-	#include "video.h"
+	#include "DccVideoWindow.h"
 #endif
 
-#include "voice.h"
-#include "utils.h"
-#include "send.h"
+#include "DccVoiceWindow.h"
+#include "DccUtils.h"
+#include "DccFileTransfer.h"
 
 #include "kvi_debug.h"
 #include "kvi_settings.h"
@@ -59,13 +59,13 @@
 
 #ifdef COMPILE_ON_WINDOWS
 	// Ugly Windoze compiler...
-	#include "dialogs.h"
+	#include "DccDialog.h"
 #endif
 
 //#warning "KviOption_boolIgnoreDccChat and other types too"
 
 extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
-extern KviDccBroker * g_pDccBroker;
+extern DccBroker * g_pDccBroker;
 
 static void dcc_module_reply_errmsg(KviDccRequest * dcc,const QString& errText)
 {
@@ -95,7 +95,7 @@ static bool dcc_module_check_concurrent_transfers_limit(KviDccRequest * dcc)
 {
 	if(KVI_OPTION_UINT(KviOption_uintMaxDccSendTransfers) > 0)
 	{
-		unsigned int uTransfers = KviDccFileTransfer::runningTransfersCount();
+		unsigned int uTransfers = DccFileTransfer::runningTransfersCount();
 		if(uTransfers >= KVI_OPTION_UINT(KviOption_uintMaxDccSendTransfers))
 		{
 			QString szError;
@@ -131,7 +131,7 @@ static bool dcc_module_check_limits(KviDccRequest * dcc)
 	return true;
 }
 
-static void dcc_fill_local_nick_user_host(KviDccDescriptor * d,KviDccRequest * dcc)
+static void dcc_fill_local_nick_user_host(DccDescriptor * d,KviDccRequest * dcc)
 {
 	if(dcc->pConsole->connection())
 	{
@@ -145,7 +145,7 @@ static void dcc_fill_local_nick_user_host(KviDccDescriptor * d,KviDccRequest * d
 	}
 }
 
-static void dcc_module_set_dcc_type(KviDccDescriptor * d,const char * szBaseType)
+static void dcc_module_set_dcc_type(DccDescriptor * d,const char * szBaseType)
 {
 	d->szType = szBaseType;
 #ifdef COMPILE_SSL_SUPPORT
@@ -283,7 +283,7 @@ static void dccModuleParseDccChat(KviDccRequest *dcc)
 	}
 #endif //!COMPILE_SSL_SUPPORT
 
-	KviDccDescriptor * d = new KviDccDescriptor(dcc->pConsole);
+	DccDescriptor * d = new DccDescriptor(dcc->pConsole);
 
 	d->szNick            = dcc->ctcpMsg->pSource->nick();
 	d->szUser            = dcc->ctcpMsg->pSource->user();
@@ -489,7 +489,7 @@ static void dccModuleParseDccSend(KviDccRequest *dcc)
 	}
 #endif //!COMPILE_SSL_SUPPORT
 
-	KviDccDescriptor * d = new KviDccDescriptor(dcc->pConsole);
+	DccDescriptor * d = new DccDescriptor(dcc->pConsole);
 	d->szNick            = dcc->ctcpMsg->pSource->nick();
 	d->szUser            = dcc->ctcpMsg->pSource->user();
 	d->szHost            = dcc->ctcpMsg->pSource->host();
@@ -658,7 +658,7 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
 
 		// ok...we have requested this send
 //		#warning "Maybe remove this file offer now ?"
-		KviDccDescriptor * d = new KviDccDescriptor(dcc->pConsole);
+		DccDescriptor * d = new DccDescriptor(dcc->pConsole);
 
 		d->szNick            = dcc->ctcpMsg->pSource->nick();
 		d->szUser            = dcc->ctcpMsg->pSource->user();
@@ -781,7 +781,7 @@ static void dccModuleParseDccRSend(KviDccRequest *dcc)
 
 	//#warning "When behind a firewall, we should reply an error message and avoid setting up the listening connection"
 
-	KviDccDescriptor * d = new KviDccDescriptor(dcc->pConsole);
+	DccDescriptor * d = new DccDescriptor(dcc->pConsole);
 	d->szNick            = dcc->ctcpMsg->pSource->nick();
 	d->szUser            = dcc->ctcpMsg->pSource->user();
 	d->szHost            = dcc->ctcpMsg->pSource->host();
@@ -929,7 +929,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
 	}
 
 
-	KviDccDescriptor * d = new KviDccDescriptor(dcc->pConsole);
+	DccDescriptor * d = new DccDescriptor(dcc->pConsole);
 	d->szNick            = dcc->ctcpMsg->pSource->nick();
 	d->szLocalFileName   = o->absFilePath();
 	d->szUser            = dcc->ctcpMsg->pSource->user();
@@ -1034,7 +1034,7 @@ static void dccModuleParseDccVoice(KviDccRequest *dcc)
 	}
 
 
-	KviDccDescriptor * d = new KviDccDescriptor(dcc->pConsole);
+	DccDescriptor * d = new DccDescriptor(dcc->pConsole);
 	d->szNick            = dcc->ctcpMsg->pSource->nick();
 	d->szUser            = dcc->ctcpMsg->pSource->user();
 	d->szHost            = dcc->ctcpMsg->pSource->host();
@@ -1108,7 +1108,7 @@ static void dccModuleParseDccVideo(KviDccRequest *dcc)
 // 	}
 
 
-	KviDccDescriptor * d = new KviDccDescriptor(dcc->pConsole);
+	DccDescriptor * d = new DccDescriptor(dcc->pConsole);
 	d->szNick            = dcc->ctcpMsg->pSource->nick();
 	d->szUser            = dcc->ctcpMsg->pSource->user();
 	d->szHost            = dcc->ctcpMsg->pSource->host();
@@ -1158,7 +1158,7 @@ static void dccModuleParseDccCanvas(KviDccRequest *dcc)
 //		}
 //	}
 #ifdef COMPILE_DCC_CANVAS
-	KviDccDescriptor * d = new KviDccDescriptor(dcc->pConsole);
+	DccDescriptor * d = new DccDescriptor(dcc->pConsole);
 	d->szNick            = dcc->ctcpMsg->pSource->nick();
 	d->szUser            = dcc->ctcpMsg->pSource->username();
 	d->szHost            = dcc->ctcpMsg->pSource->host();