416 files changed, 7403 insertions, 7402 deletions

diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/AboutDialog.cpp
index 3e3d7d9a9..081ebecca 100644
--- a/src/modules/about/aboutdialog.cpp
+++ b/src/modules/about/AboutDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : aboutdialog.cpp
+//   File : AboutDialog.cpp
 //   Creation date : Sun Jun 23 17:59:12 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "aboutdialog.h"
+#include "AboutDialog.h"
 
 #include "kvi_defaults.h"
 #include "KviLocale.h"
@@ -42,7 +42,7 @@
 #include <QEvent>
 #include <QCloseEvent>
 
-extern KviAboutDialog * g_pAboutDialog;
+extern AboutDialog * g_pAboutDialog;
 /*
 "<font color=\"#FFFF00\"><b>KVIrc public releases :</b></font><br>\n" \
 "<br>\n" \
@@ -73,7 +73,7 @@ extern KviAboutDialog * g_pAboutDialog;
 
 #include "abouttext.inc"
 
-KviAboutDialog::KviAboutDialog()
+AboutDialog::AboutDialog()
 : KviTalTabDialog(0)
 {
 	setWindowTitle(__tr2qs_ctx("About KVIrc...","about"));
@@ -224,23 +224,23 @@ KviAboutDialog::KviAboutDialog()
 	connect(this,SIGNAL(applyButtonPressed()),this,SLOT(closeButtonPressed()));
 }
 
-KviAboutDialog::~KviAboutDialog()
+AboutDialog::~AboutDialog()
 {
 	g_pAboutDialog = 0;
 }
 
-void KviAboutDialog::closeEvent(QCloseEvent *e)
+void AboutDialog::closeEvent(QCloseEvent *e)
 {
 	e->ignore();
 	delete this;
 }
 
-void KviAboutDialog::closeButtonPressed()
+void AboutDialog::closeButtonPressed()
 {
 	delete this;
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "aboutdialog.moc"
+#include "AboutDialog.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/about/aboutdialog.h b/src/modules/about/AboutDialog.h
index 30cc6e730..ab0ea628b 100644
--- a/src/modules/about/aboutdialog.h
+++ b/src/modules/about/AboutDialog.h
@@ -2,7 +2,7 @@
 #define _ABOUTDIALOG_H_
 //=============================================================================
 //
-//   File : aboutdialog.h
+//   File : AboutDialog.h
 //   Creation date : Sun Jun 23 17:59:13 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -26,12 +26,12 @@
 
 #include "KviTalTabDialog.h"
 
-class KviAboutDialog : public KviTalTabDialog
+class AboutDialog : public KviTalTabDialog
 {
 	Q_OBJECT
 public:
-	KviAboutDialog();
-	~KviAboutDialog();
+	AboutDialog();
+	~AboutDialog();
 protected:
 	virtual void closeEvent(QCloseEvent *e);
 protected slots:
diff --git a/src/modules/about/CMakeLists.txt b/src/modules/about/CMakeLists.txt
index 700ba497d..752adbf40 100644
--- a/src/modules/about/CMakeLists.txt
+++ b/src/modules/about/CMakeLists.txt
@@ -1,10 +1,10 @@
 # CMakeLists for src/modules/about
 SET(kviabout_MOC_HDRS
-	aboutdialog.h
+	AboutDialog.h
 )
 
 SET(kviabout_SRCS
-	aboutdialog.cpp
+	AboutDialog.cpp
 	libkviabout.cpp
 )
 
diff --git a/src/modules/about/libkviabout.cpp b/src/modules/about/libkviabout.cpp
index cae11f43a..3239afc1b 100644
--- a/src/modules/about/libkviabout.cpp
+++ b/src/modules/about/libkviabout.cpp
@@ -25,12 +25,12 @@
 //
 //=============================================================================
 
-#include "aboutdialog.h"
+#include "AboutDialog.h"
 
 #include "KviModule.h"
 #include "KviLocale.h"
 
-KviAboutDialog * g_pAboutDialog = 0;
+AboutDialog * g_pAboutDialog = 0;
 
 /*
 	@doc: about.kvirc
@@ -52,7 +52,7 @@ static bool about_kvs_command_kvirc(KviKvsModuleCommandCall *)
 {
  	if(!g_pAboutDialog)
 	{
-		g_pAboutDialog = new KviAboutDialog();
+		g_pAboutDialog = new AboutDialog();
 		g_pAboutDialog->show();
 	} else {
 		g_pAboutDialog->raise();
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 0d80af6f2..c20b762e7 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : aliaseditor.cpp
+//   File : AliasEditorWindow.cpp
 //   Creation date : Tue 29 Dec 2004 02:45:59 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -21,7 +21,7 @@
 //   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 //=============================================================================
-#include "actioneditor.h"
+#include "ActionEditor.h"
 
 #include "KviIconManager.h"
 #include "KviOptions.h"
@@ -58,7 +58,7 @@
 #include <QLabel>
 
 
-extern KviActionEditorWindow * g_pActionEditorWindow;
+extern ActionEditorWindow * g_pActionEditorWindow;
 
 static QString g_szLastEditedAction;
 
@@ -67,7 +67,7 @@ static QString g_szLastEditedAction;
 #define LVI_SPACING 8
 #define LVI_MINIMUM_CELL_WIDTH (LVI_MINIMUM_TEXT_WIDTH + LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER)
 
-KviActionEditorTreeWidgetItem::KviActionEditorTreeWidgetItem(QTreeWidget * v,KviActionData * a)
+ActionEditorTreeWidgetItem::ActionEditorTreeWidgetItem(QTreeWidget * v,ActionData * a)
 : QTreeWidgetItem(v)
 {
 	m_pActionData = a;
@@ -81,18 +81,18 @@ KviActionEditorTreeWidgetItem::KviActionEditorTreeWidgetItem(QTreeWidget * v,Kvi
 	if(p)setIcon(0,*p);
 }
 
-KviActionEditorTreeWidgetItem::~KviActionEditorTreeWidgetItem()
+ActionEditorTreeWidgetItem::~ActionEditorTreeWidgetItem()
 {
 	delete m_pActionData;
 }
 
 
-QString KviActionEditorTreeWidgetItem::key(int,bool) const
+QString ActionEditorTreeWidgetItem::key(int,bool) const
 {
 	return m_szKey;
 }
 
-KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed)
+SingleActionEditor::SingleActionEditor(QWidget * par,ActionEditor * ed)
 : QWidget(par)
 {
 	m_pActionEditor = ed;
@@ -294,11 +294,11 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed)
 	}
 }
 
-KviSingleActionEditor::~KviSingleActionEditor()
+SingleActionEditor::~SingleActionEditor()
 {
 }
 
-void KviSingleActionEditor::channelQueryOrConsoleWindowCheckToggled(bool)
+void SingleActionEditor::channelQueryOrConsoleWindowCheckToggled(bool)
 {
 	m_pChannelOnlyIfUsersSelectedCheck->setEnabled(m_pWindowChannelCheck->isChecked());
 	m_pChannelOnlyIfUsersSelectedCheck->setChecked(false);
@@ -308,7 +308,7 @@ void KviSingleActionEditor::channelQueryOrConsoleWindowCheckToggled(bool)
 	m_pConsoleOnlyIfUsersSelectedCheck->setChecked(false);
 }
 
-void KviSingleActionEditor::needsContextCheckToggled(bool)
+void SingleActionEditor::needsContextCheckToggled(bool)
 {
 	m_pEnableAtLoginCheck->setChecked(false);
 	m_pEnableAtLoginCheck->setEnabled(false);
@@ -316,13 +316,13 @@ void KviSingleActionEditor::needsContextCheckToggled(bool)
 	m_pNeedsConnectionCheck->setEnabled(m_pNeedsContextCheck->isChecked());
 }
 
-void KviSingleActionEditor::needsConnectionCheckToggled(bool)
+void SingleActionEditor::needsConnectionCheckToggled(bool)
 {
 	m_pEnableAtLoginCheck->setChecked(false);
 	m_pEnableAtLoginCheck->setEnabled(m_pNeedsConnectionCheck->isChecked());
 }
 
-void KviSingleActionEditor::specificWindowsCheckToggled(bool)
+void SingleActionEditor::specificWindowsCheckToggled(bool)
 {
 	m_pWindowConsoleCheck->setChecked(false);
 	m_pWindowChannelCheck->setChecked(false);
@@ -341,7 +341,7 @@ void KviSingleActionEditor::specificWindowsCheckToggled(bool)
 	m_pWindowDccChatCheck->setEnabled(b);
 }
 
-void KviSingleActionEditor::displaySmallIcon(const QString &szIconId)
+void SingleActionEditor::displaySmallIcon(const QString &szIconId)
 {
 	QPixmap * pix = g_pIconManager->getImage(szIconId);
 
@@ -356,7 +356,7 @@ void KviSingleActionEditor::displaySmallIcon(const QString &szIconId)
 	
 }
 
-void KviSingleActionEditor::displayBigIcon(const QString &szIconId)
+void SingleActionEditor::displayBigIcon(const QString &szIconId)
 {
 	QPixmap * pix = g_pIconManager->getImage(szIconId);
 
@@ -370,7 +370,7 @@ void KviSingleActionEditor::displayBigIcon(const QString &szIconId)
 	}
 }
 
-void KviSingleActionEditor::chooseSmallIcon()
+void SingleActionEditor::chooseSmallIcon()
 {
 	if(!m_pActionData)return;
 	KviImageDialog * d = new KviImageDialog(this);
@@ -383,7 +383,7 @@ void KviSingleActionEditor::chooseSmallIcon()
 	displaySmallIcon(s);
 }
 
-void KviSingleActionEditor::chooseBigIcon()
+void SingleActionEditor::chooseBigIcon()
 {
 	if(!m_pActionData)return;
 	KviImageDialog * d = new KviImageDialog(this,QString(),KID_TYPE_ALL,KID_TYPE_FULL_PATH);
@@ -396,7 +396,7 @@ void KviSingleActionEditor::chooseBigIcon()
 	displayBigIcon(s);
 }
 
-void KviSingleActionEditor::setActionData(KviActionData * d)
+void SingleActionEditor::setActionData(ActionData * d)
 {
 	m_pActionData = d;
 
@@ -405,7 +405,7 @@ void KviSingleActionEditor::setActionData(KviActionData * d)
 		unsigned int uOldFlags = d->m_uFlags;
 		d->m_uFlags = KviAction::validateFlags(d->m_uFlags);
 		if(d->m_uFlags != uOldFlags)
-			qDebug("invalid action flags in KviSingleActionEditor::setActionData(): %d fixed to %d",uOldFlags,d->m_uFlags);
+			qDebug("invalid action flags in SingleActionEditor::setActionData(): %d fixed to %d",uOldFlags,d->m_uFlags);
 
 		m_pNameEdit->setText(d->m_szName);
 		m_pNameEdit->setEnabled(true);
@@ -519,7 +519,7 @@ void KviSingleActionEditor::setActionData(KviActionData * d)
 	}
 }
 
-void KviSingleActionEditor::commit()
+void SingleActionEditor::commit()
 {
 	if(!m_pActionData)return;
 
@@ -581,11 +581,11 @@ void KviSingleActionEditor::commit()
 	unsigned int uOldFlags = m_pActionData->m_uFlags;
 	m_pActionData->m_uFlags = KviAction::validateFlags(m_pActionData->m_uFlags);
 	if(m_pActionData->m_uFlags != uOldFlags)
-		qDebug("invalid action flags in KviSingleActionEditor::commit(): %d fixed to %d",uOldFlags,m_pActionData->m_uFlags);
+		qDebug("invalid action flags in SingleActionEditor::commit(): %d fixed to %d",uOldFlags,m_pActionData->m_uFlags);
 }
 
 
-KviActionEditorTreeView::KviActionEditorTreeView(QWidget * pParent)
+ActionEditorTreeView::ActionEditorTreeView(QWidget * pParent)
 : QTreeWidget(pParent)
 {
 	setColumnCount (1);
@@ -599,11 +599,11 @@ KviActionEditorTreeView::KviActionEditorTreeView(QWidget * pParent)
 
 }
 
-KviActionEditorTreeView::~KviActionEditorTreeView()
+ActionEditorTreeView::~ActionEditorTreeView()
 {
 }
 
-void KviActionEditorTreeView::resizeEvent(QResizeEvent * e)
+void ActionEditorTreeView::resizeEvent(QResizeEvent * e)
 {
 	QTreeWidget::resizeEvent(e);
 	int iWidth = viewport()->width();
@@ -612,7 +612,7 @@ void KviActionEditorTreeView::resizeEvent(QResizeEvent * e)
 }
 
 
-KviActionEditor::KviActionEditor(QWidget * par)
+ActionEditor::ActionEditor(QWidget * par)
 : QWidget(par)
 {
 
@@ -623,7 +623,7 @@ KviActionEditor::KviActionEditor(QWidget * par)
 
 
 	KviTalVBox * box = new KviTalVBox(m_pSplitter);
-	m_pTreeWidget = new KviActionEditorTreeView(box);
+	m_pTreeWidget = new ActionEditorTreeView(box);
 	KviTalIconAndRichTextItemDelegate *itemDelegate=new KviTalIconAndRichTextItemDelegate(m_pTreeWidget);
 	m_pTreeWidget->setItemDelegate(itemDelegate);
 	//m_pTreeWidget->setShowSortIndicator(true);
@@ -641,17 +641,17 @@ KviActionEditor::KviActionEditor(QWidget * par)
 
 	box->setSpacing(1);
 
-	m_pSingleActionEditor = new KviSingleActionEditor(m_pSplitter,this);
+	m_pSingleActionEditor = new SingleActionEditor(m_pSplitter,this);
 
-	KviActionEditorTreeWidgetItem * last = 0;
-	KviActionEditorTreeWidgetItem * first = 0;
+	ActionEditorTreeWidgetItem * last = 0;
+	ActionEditorTreeWidgetItem * first = 0;
 
 	KviPointerHashTableIterator<QString,KviAction> it(*(KviActionManager::instance()->actions()));
 	while(KviAction * a = it.current())
 	{
 		if(a->isKviUserActionNeverOverrideThis())
 		{
-			KviActionData * ad = new KviActionData(
+			ActionData * ad = new ActionData(
 					a->name(),
 					((KviKvsUserAction *)a)->scriptCode(),
 					((KviKvsUserAction *)a)->visibleNameCode(),
@@ -663,7 +663,7 @@ KviActionEditor::KviActionEditor(QWidget * par)
 					a->keySequence(),
 					0
 				);
-			KviActionEditorTreeWidgetItem * lvi = new KviActionEditorTreeWidgetItem(m_pTreeWidget,ad);
+			ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget,ad);
 			ad->m_pItem = lvi;
 			if(ad->m_szName == g_szLastEditedAction)
 				last = lvi;
@@ -685,11 +685,11 @@ KviActionEditor::KviActionEditor(QWidget * par)
 
 }
 
-KviActionEditor::~KviActionEditor()
+ActionEditor::~ActionEditor()
 {
 }
 
-void KviActionEditor::exportActions()
+void ActionEditor::exportActions()
 {
 	QString szName = QDir::homePath();
 	if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
@@ -705,7 +705,7 @@ void KviActionEditor::exportActions()
 	{
 		if(m_pTreeWidget->topLevelItem(i)->isSelected())
 		{
-			KviActionData * a = ((KviActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData();
+			ActionData * a = ((ActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData();
 
 			KviKvsUserAction::exportToKvs(
 					szCode,
@@ -728,15 +728,15 @@ void KviActionEditor::exportActions()
 	}
 }
 
-void KviActionEditor::deleteActions()
+void ActionEditor::deleteActions()
 {
-	KviPointerList<KviActionEditorTreeWidgetItem> l;
+	KviPointerList<ActionEditorTreeWidgetItem> l;
 	l.setAutoDelete(false);
 
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
 		if(m_pTreeWidget->topLevelItem(i)->isSelected())
-		l.append((KviActionEditorTreeWidgetItem * )m_pTreeWidget->topLevelItem(i));
+		l.append((ActionEditorTreeWidgetItem * )m_pTreeWidget->topLevelItem(i));
 	}
 
 	if(l.isEmpty())return;
@@ -744,7 +744,7 @@ void KviActionEditor::deleteActions()
 	//if(QMessageBox::question(this,__tr2qs_ctx("Confirm Deletion","editor"),__tr2qs_ctx("Do you really want to delete the selected actions ?","editor"),__tr2qs_ctx("Yes","editor"),__tr2qs_ctx("No","editor")) != 0)
 	//	return;
 
-	for(KviActionEditorTreeWidgetItem * i = l.first();i;i = l.next())
+	for(ActionEditorTreeWidgetItem * i = l.first();i;i = l.next())
 	{
 		if(m_pSingleActionEditor->actionData() == i->actionData())
 			m_pSingleActionEditor->setActionData(0);
@@ -753,7 +753,7 @@ void KviActionEditor::deleteActions()
 }
 
 
-QString KviActionEditor::nameForAutomaticAction(const QString &szTemplate)
+QString ActionEditor::nameForAutomaticAction(const QString &szTemplate)
 {
 	QString ret;
 	QString szT = szTemplate;
@@ -769,7 +769,7 @@ QString KviActionEditor::nameForAutomaticAction(const QString &szTemplate)
 	return ret;
 }
 
-void KviActionEditor::newAction()
+void ActionEditor::newAction()
 {
 	QString szName = nameForAutomaticAction(__tr2qs_ctx("My Action","editor"));
 	QString szVis = __tr2qs_ctx("My Action","editor");
@@ -780,7 +780,7 @@ void KviActionEditor::newAction()
 	szDes.prepend("$tr(\"");
 	szDes.append("\")");
 
-	KviActionData * ad = new KviActionData(szName,
+	ActionData * ad = new ActionData(szName,
 			QString(),
 			szVis,
 			szDes,
@@ -791,29 +791,29 @@ void KviActionEditor::newAction()
 			QString(),
 			0);
 
-	KviActionEditorTreeWidgetItem * lvi = new KviActionEditorTreeWidgetItem(m_pTreeWidget,ad);
+	ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget,ad);
 	ad->m_pItem = lvi;
 	m_pTreeWidget->setCurrentItem(lvi);
 	currentItemChanged(lvi,lvi);
 }
 
-bool KviActionEditor::actionExists(const QString &szName)
+bool ActionEditor::actionExists(const QString &szName)
 {
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		if(((KviActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData()->m_szName == szName)return true;
+		if(((ActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->actionData()->m_szName == szName)return true;
 	}
 	return false;
 }
 
-void KviActionEditor::currentItemChanged(QTreeWidgetItem * i,QTreeWidgetItem *)
+void ActionEditor::currentItemChanged(QTreeWidgetItem * i,QTreeWidgetItem *)
 {
 	if(m_pSingleActionEditor->actionData())
 		m_pSingleActionEditor->commit();
 
 	m_pTreeWidget->update();
 
-	KviActionEditorTreeWidgetItem * it = (KviActionEditorTreeWidgetItem *)i;
+	ActionEditorTreeWidgetItem * it = (ActionEditorTreeWidgetItem *)i;
 	if(!it)
 	{
 		m_pSingleActionEditor->setActionData(0);
@@ -830,7 +830,7 @@ void KviActionEditor::currentItemChanged(QTreeWidgetItem * i,QTreeWidgetItem *)
 	g_szLastEditedAction = it->actionData()->m_szName;
 }
 
-void KviActionEditor::commit()
+void ActionEditor::commit()
 {
 	m_pSingleActionEditor->commit();
 
@@ -840,7 +840,7 @@ void KviActionEditor::commit()
 
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		KviActionEditorTreeWidgetItem * it = (KviActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		ActionEditorTreeWidgetItem * it = (ActionEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		KviKvsUserAction * a = KviKvsUserAction::createInstance( // msvc workaround
 			KviActionManager::instance(),
 			it->actionData()->m_szName,
@@ -860,7 +860,7 @@ void KviActionEditor::commit()
 }
 
 
-KviActionEditorWindow::KviActionEditorWindow(KviMainWindow * lpFrm)
+ActionEditorWindow::ActionEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"actioneditor",0)
 {
 	g_pActionEditorWindow = this;
@@ -868,7 +868,7 @@ KviActionEditorWindow::KviActionEditorWindow(KviMainWindow * lpFrm)
 
 	QGridLayout * g = new QGridLayout();
 
-	m_pEditor = new KviActionEditor(this);
+	m_pEditor = new ActionEditor(this);
 	g->addWidget(m_pEditor,0,0,1,4);
 
 	QPushButton * btn = new QPushButton(__tr2qs_ctx("OK","editor"),this);
@@ -891,44 +891,44 @@ KviActionEditorWindow::KviActionEditorWindow(KviMainWindow * lpFrm)
 	setLayout(g);
 }
 
-KviActionEditorWindow::~KviActionEditorWindow()
+ActionEditorWindow::~ActionEditorWindow()
 {
 	g_pActionEditorWindow = 0;
 }
 
-void KviActionEditorWindow::okClicked()
+void ActionEditorWindow::okClicked()
 {
 	m_pEditor->commit();
 	close();
 }
 
-void KviActionEditorWindow::applyClicked()
+void ActionEditorWindow::applyClicked()
 {
 	m_pEditor->commit();
 }
 
-void KviActionEditorWindow::cancelClicked()
+void ActionEditorWindow::cancelClicked()
 {
 	close();
 }
 
-QPixmap * KviActionEditorWindow::myIconPtr()
+QPixmap * ActionEditorWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_SCRIPTACTION);
 }
 
-void KviActionEditorWindow::getConfigGroupName(QString &szName)
+void ActionEditorWindow::getConfigGroupName(QString &szName)
 {
 	szName = "actioneditor";
 }
 
-void KviActionEditorWindow::saveProperties(KviConfigurationFile *cfg)
+void ActionEditorWindow::saveProperties(KviConfigurationFile *cfg)
 {
 	KviWindow::saveProperties(cfg);
 	cfg->writeEntry("Splitter",m_pEditor->m_pSplitter->sizes());
 }
 
-void KviActionEditorWindow::loadProperties(KviConfigurationFile *cfg)
+void ActionEditorWindow::loadProperties(KviConfigurationFile *cfg)
 {
 	int w = width();
 	KviWindow::loadProperties(cfg);
diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/ActionEditor.h
index 0de966c1b..ac05ec216 100644
--- a/src/modules/actioneditor/actioneditor.h
+++ b/src/modules/actioneditor/ActionEditor.h
@@ -2,7 +2,7 @@
 #define _ACTIONEDITOR_H_
 //=============================================================================
 //
-//   File : actioneditor.h
+//   File : ActionEditor.h
 //   Creation date : Tue Dec 29 2004 02:40:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -38,12 +38,12 @@ class QComboBox;
 class QSimpleRichText;
 class QPushButton;
 class QSplitter;
-class KviActionEditorTreeWidgetItem;
+class ActionEditorTreeWidgetItem;
 class KviScriptEditor;
-class KviActionEditor;
+class ActionEditor;
 
 
-class KviActionData
+class ActionData
 {
 public:
 	QString m_szName;
@@ -55,9 +55,9 @@ public:
 	QString m_szSmallIcon;
 	QString m_szKeySequence;
 	unsigned int m_uFlags;
-	KviActionEditorTreeWidgetItem * m_pItem; // ummigarba tanto...
+	ActionEditorTreeWidgetItem * m_pItem; // ummigarba tanto...
 public:
-	KviActionData(const QString &szName,
+	ActionData(const QString &szName,
 		const QString &szScriptCode,
 		const QString &szVisibleName,
 		const QString &szDescription,
@@ -66,7 +66,7 @@ public:
 		const QString &szSmallIcon,
 		unsigned int uFlags,
 		const QString &szKeySequence,
-		KviActionEditorTreeWidgetItem * pItem)
+		ActionEditorTreeWidgetItem * pItem)
 	: m_szName(szName), m_szScriptCode(szScriptCode), m_szVisibleName(szVisibleName),
 		m_szDescription(szDescription), m_szCategory(szCategory), m_szBigIcon(szBigIcon),
 		m_szSmallIcon(szSmallIcon), m_szKeySequence(szKeySequence), m_uFlags(uFlags),
@@ -75,20 +75,20 @@ public:
 };
 
 
-class KviActionEditorTreeWidgetItem : public QTreeWidgetItem
+class ActionEditorTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviActionEditorTreeWidgetItem(QTreeWidget * v,KviActionData * a);
-	~KviActionEditorTreeWidgetItem();
+	ActionEditorTreeWidgetItem(QTreeWidget * v,ActionData * a);
+	~ActionEditorTreeWidgetItem();
 protected:
-	KviActionData * m_pActionData;
+	ActionData * m_pActionData;
 	//QSimpleRichText * m_pText;
 	QTextDocument * m_pText;
 	QPixmap * m_pIcon;
 	QTreeWidget * m_pTreeWidget;
 	QString m_szKey;
 public:
-	KviActionData * actionData(){ return m_pActionData; };
+	ActionData * actionData(){ return m_pActionData; };
 	//void setupForActionData();
 public:
 	//virtual void paintCell(QPainter * p,const QColorGroup & cg,int column,int width,int align);
@@ -97,26 +97,26 @@ public:
 };
 
 
-class KviActionEditorTreeView : public QTreeWidget
+class ActionEditorTreeView : public QTreeWidget
 {
 	Q_OBJECT
 public:
-	KviActionEditorTreeView(QWidget * pParent);
-	~KviActionEditorTreeView();
+	ActionEditorTreeView(QWidget * pParent);
+	~ActionEditorTreeView();
 protected:
 	virtual void resizeEvent(QResizeEvent * e);
 };
 
 
-class KviSingleActionEditor : public QWidget
+class SingleActionEditor : public QWidget
 {
 	Q_OBJECT
 public:
-	KviSingleActionEditor(QWidget * par,KviActionEditor * ed);
-	~KviSingleActionEditor();
+	SingleActionEditor(QWidget * par,ActionEditor * ed);
+	~SingleActionEditor();
 protected:
-	KviActionEditor * m_pActionEditor;
-	KviActionData * m_pActionData;
+	ActionEditor * m_pActionEditor;
+	ActionData * m_pActionData;
 	QLineEdit * m_pNameEdit;
 	QLineEdit * m_pVisibleNameEdit;
 	QComboBox * m_pCategoryCombo;
@@ -139,8 +139,8 @@ protected:
 	QCheckBox * m_pChannelOnlyIfUsersSelectedCheck;
 	QCheckBox * m_pQueryOnlyIfUsersSelectedCheck;
 public:
-	KviActionData * actionData(){ return m_pActionData; };
-	void setActionData(KviActionData * d);
+	ActionData * actionData(){ return m_pActionData; };
+	void setActionData(ActionData * d);
 	void commit();
 protected slots:
 	void chooseSmallIcon();
@@ -154,16 +154,16 @@ protected slots:
 };
 
 
-class KviActionEditor : public QWidget
+class ActionEditor : public QWidget
 {
-	friend class KviActionEditorWindow;
+	friend class ActionEditorWindow;
 	Q_OBJECT
 public:
-	KviActionEditor(QWidget * par);
-	~KviActionEditor();
+	ActionEditor(QWidget * par);
+	~ActionEditor();
 protected:
-	KviActionEditorTreeView * m_pTreeWidget;
-	KviSingleActionEditor * m_pSingleActionEditor;
+	ActionEditorTreeView * m_pTreeWidget;
+	SingleActionEditor * m_pSingleActionEditor;
 	QSplitter * m_pSplitter;
 	QPushButton * m_pNewActionButton;
 	QPushButton * m_pDeleteActionsButton;
@@ -182,14 +182,14 @@ protected slots:
 };
 
 
-class KviActionEditorWindow : public KviWindow
+class ActionEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviActionEditorWindow(KviMainWindow * lpFrm);
-	~KviActionEditorWindow();
+	ActionEditorWindow(KviMainWindow * lpFrm);
+	~ActionEditorWindow();
 protected:
-	KviActionEditor * m_pEditor;
+	ActionEditor * m_pEditor;
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void getConfigGroupName(QString &szName);
diff --git a/src/modules/actioneditor/CMakeLists.txt b/src/modules/actioneditor/CMakeLists.txt
index a3fb5c56c..15efd644d 100644
--- a/src/modules/actioneditor/CMakeLists.txt
+++ b/src/modules/actioneditor/CMakeLists.txt
@@ -1,11 +1,11 @@
 # CMakeLists for src/modules/actioneditor
 
 SET(kviactioneditor_MOC_HDRS
-	actioneditor.h
+	ActionEditor.h
 )
 
 SET(kviactioneditor_SRCS
-	actioneditor.cpp
+	ActionEditor.cpp
 	libkviactioneditor.cpp
 )
 
diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index 748a11217..aab1f7835 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "actioneditor.h"
+#include "ActionEditor.h"
 
 #include "KviModule.h"
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
-KviActionEditorWindow * g_pActionEditorWindow = 0;
+ActionEditorWindow * g_pActionEditorWindow = 0;
 
 
 /*
@@ -49,7 +49,7 @@ static bool actioneditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	if(!g_pActionEditorWindow)
 	{
-		g_pActionEditorWindow = new KviActionEditorWindow(c->window()->frame());
+		g_pActionEditorWindow = new ActionEditorWindow(c->window()->frame());
 		c->window()->frame()->addWindow(g_pActionEditorWindow);
 	}
 
diff --git a/src/modules/addon/addonfunctions.cpp b/src/modules/addon/AddonFunctions.cpp
index 590935319..83641d90e 100644
--- a/src/modules/addon/addonfunctions.cpp
+++ b/src/modules/addon/AddonFunctions.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : addonfunctions.cpp
+//   File : AddonFunctions.cpp
 //   Creation date : Fri 02 May 2008 17:36:07 by Elvio Basello
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "addonfunctions.h"
+#include "AddonFunctions.h"
 
 #include "KviPackageReader.h"
 #include "KviLocale.h"
@@ -40,7 +40,7 @@
 
 #include <stdlib.h>
 
-namespace KviAddonFunctions
+namespace AddonFunctions
 {
 	bool notAValidAddonPackage(QString &szError)
 	{
diff --git a/src/modules/addon/addonfunctions.h b/src/modules/addon/AddonFunctions.h
index c8b39e9b0..adcc455c2 100644
--- a/src/modules/addon/addonfunctions.h
+++ b/src/modules/addon/AddonFunctions.h
@@ -2,7 +2,7 @@
 #define _ADDONFUNCTIONS_H_
 //=============================================================================
 //
-//   File : addonfunctions.h
+//   File : AddonFunctions.h
 //   Creation date : Fri 02 May 2008 17:36:07 by Elvio Basello
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -32,7 +32,7 @@
 
 #define KVI_CURRENT_ADDONS_ENGINE_VERSION "2.0.0"
 
-namespace KviAddonFunctions
+namespace AddonFunctions
 {
 	bool notAValidAddonPackage(QString & szError);
 	bool installAddonPackage(const QString & szAddonPackageFileName, QString & szError, QWidget * pDialogParent = 0);
diff --git a/src/modules/addon/CMakeLists.txt b/src/modules/addon/CMakeLists.txt
index f52881251..53ee2e847 100644
--- a/src/modules/addon/CMakeLists.txt
+++ b/src/modules/addon/CMakeLists.txt
@@ -2,14 +2,14 @@
 
 SET(kviaddon_MOC_HDRS
 	managementdialog.h
-	packaddondialog.h
+	PackAddonDialog.h
 )
 
 SET(kviaddon_SRCS
 	libkviaddon.cpp
 	managementdialog.cpp
-	packaddondialog.cpp
-	addonfunctions.cpp
+	PackAddonDialog.cpp
+	AddonFunctions.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/addon/packaddondialog.cpp b/src/modules/addon/PackAddonDialog.cpp
index ce2c52890..0e36a1654 100644
--- a/src/modules/addon/packaddondialog.cpp
+++ b/src/modules/addon/PackAddonDialog.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //
-//   File : packaddondialog.cpp
+//   File : PackAddonDialog.cpp
 //   Creation date : Sat 03 May 2008 01:40:44 by Elvio Basello
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,8 +22,8 @@
 //
 //============================================================================
 
-#include "packaddondialog.h"
-#include "addonfunctions.h"
+#include "PackAddonDialog.h"
+#include "AddonFunctions.h"
 
 #include "KviLocale.h"
 #include "KviFileUtils.h"
@@ -44,7 +44,7 @@
 #include <QBuffer>
 
 
-KviPackAddonDialog::KviPackAddonDialog(QWidget * pParent)
+PackAddonDialog::PackAddonDialog(QWidget * pParent)
 : QWizard(pParent)
 {
 	setMinimumSize(400,350);
@@ -105,35 +105,35 @@ KviPackAddonDialog::KviPackAddonDialog(QWidget * pParent)
 	addPage(pPage);
 
 	// Packager information
-	m_pPackAddonInfoPackageWidget = new KviPackAddonInfoPackageWidget(this);
+	m_pPackAddonInfoPackageWidget = new PackAddonInfoPackageWidget(this);
 	addPage(m_pPackAddonInfoPackageWidget);
 
 	// File selection
-	m_pPackAddonFileSelectionWidget = new KviPackAddonFileSelectionWidget(this);
+	m_pPackAddonFileSelectionWidget = new PackAddonFileSelectionWidget(this);
 	addPage(m_pPackAddonFileSelectionWidget);
 
 	// Save selection
-	m_pPackAddonSaveSelectionWidget = new KviPackAddonSaveSelectionWidget(this);
+	m_pPackAddonSaveSelectionWidget = new PackAddonSaveSelectionWidget(this);
 	addPage(m_pPackAddonSaveSelectionWidget);
 
 	// Summary info
-	m_pPackAddonSummaryInfoWidget = new KviPackAddonSummaryInfoWidget(this);
+	m_pPackAddonSummaryInfoWidget = new PackAddonSummaryInfoWidget(this);
 	addPage(m_pPackAddonSummaryInfoWidget);
 
 }
 
-KviPackAddonDialog::~KviPackAddonDialog()
+PackAddonDialog::~PackAddonDialog()
 {
 }
 
-void KviPackAddonDialog::accept()
+void PackAddonDialog::accept()
 {
 	if(!packAddon())
 		return;
 	QWizard::accept();
 }
 
-bool KviPackAddonDialog::checkDirTree(QString * pszError, QString * pszWarning)
+bool PackAddonDialog::checkDirTree(QString * pszError, QString * pszWarning)
 {
 	if(pszError) *pszError = "";
 	if(pszWarning) *pszWarning = "";
@@ -156,7 +156,7 @@ bool KviPackAddonDialog::checkDirTree(QString * pszError, QString * pszWarning)
 }
 
 #if 0
-bool KviPackAddonDialog::createInstaller(QString * pszError)
+bool PackAddonDialog::createInstaller(QString * pszError)
 {
 	if(pszError)
 		*pszError = "";
@@ -259,7 +259,7 @@ bool KviPackAddonDialog::createInstaller(QString * pszError)
 #endif
 
 
-bool KviPackAddonDialog::packAddon()
+bool PackAddonDialog::packAddon()
 {
 	// Get data from registered fields
 	m_szAuthor = field("packageAuthor").toString();
@@ -292,7 +292,7 @@ bool KviPackAddonDialog::packAddon()
 	}
 	
 	// Raise the files summary dialog
-	m_pPackAddonSummaryFilesWidget = new KviPackAddonSummaryFilesWidget(this);
+	m_pPackAddonSummaryFilesWidget = new PackAddonSummaryFilesWidget(this);
 	m_pPackAddonSummaryFilesWidget->setPath(m_szDirPath);
 	if(m_pPackAddonSummaryFilesWidget->exec() == QDialog::Rejected)
 	{
@@ -395,7 +395,7 @@ bool KviPackAddonDialog::packAddon()
 }
 
 
-KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog * pParent)
+PackAddonInfoPackageWidget::PackAddonInfoPackageWidget(PackAddonDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("addon_package_info_page");
@@ -457,12 +457,12 @@ KviPackAddonInfoPackageWidget::KviPackAddonInfoPackageWidget(KviPackAddonDialog
 	registerField("packageMinVersion",m_pPackageMinVersionEdit);
 }
 
-KviPackAddonInfoPackageWidget::~KviPackAddonInfoPackageWidget()
+PackAddonInfoPackageWidget::~PackAddonInfoPackageWidget()
 {
 }
 
 
-KviPackAddonFileSelectionWidget::KviPackAddonFileSelectionWidget(KviPackAddonDialog * pParent)
+PackAddonFileSelectionWidget::PackAddonFileSelectionWidget(PackAddonDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("addon_package_file_page");
@@ -484,12 +484,12 @@ KviPackAddonFileSelectionWidget::KviPackAddonFileSelectionWidget(KviPackAddonDia
 	registerField("packageIcon*",m_pPackageIconEdit);
 }
 
-KviPackAddonFileSelectionWidget::~KviPackAddonFileSelectionWidget()
+PackAddonFileSelectionWidget::~PackAddonFileSelectionWidget()
 {
 }
 
 
-KviPackAddonSaveSelectionWidget::KviPackAddonSaveSelectionWidget(KviPackAddonDialog * pParent)
+PackAddonSaveSelectionWidget::PackAddonSaveSelectionWidget(PackAddonDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("addon_package_save_page");
@@ -513,11 +513,11 @@ KviPackAddonSaveSelectionWidget::KviPackAddonSaveSelectionWidget(KviPackAddonDia
 	registerField("packageSavePath*",m_pSavePathSelector);
 }
 
-KviPackAddonSaveSelectionWidget::~KviPackAddonSaveSelectionWidget()
+PackAddonSaveSelectionWidget::~PackAddonSaveSelectionWidget()
 {
 }
 
-void KviPackAddonSaveSelectionWidget::initializePage()
+void PackAddonSaveSelectionWidget::initializePage()
 {
 	// Get data from registered fields
 	QString szName = field("packageName").toString();
@@ -534,7 +534,7 @@ void KviPackAddonSaveSelectionWidget::initializePage()
 }
 
 
-KviPackAddonSummaryInfoWidget::KviPackAddonSummaryInfoWidget(KviPackAddonDialog * pParent)
+PackAddonSummaryInfoWidget::PackAddonSummaryInfoWidget(PackAddonDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("addon_package_summary_info_page");
@@ -546,11 +546,11 @@ KviPackAddonSummaryInfoWidget::KviPackAddonSummaryInfoWidget(KviPackAddonDialog
 	pLayout->addWidget(m_pLabelInfo);
 }
 
-KviPackAddonSummaryInfoWidget::~KviPackAddonSummaryInfoWidget()
+PackAddonSummaryInfoWidget::~PackAddonSummaryInfoWidget()
 {
 }
 
-void KviPackAddonSummaryInfoWidget::initializePage()
+void PackAddonSummaryInfoWidget::initializePage()
 {
 	// Get data from registered fields
 	QString szAuthor = field("packageAuthor").toString();
@@ -600,7 +600,7 @@ void KviPackAddonSummaryInfoWidget::initializePage()
 }
 
 
-KviPackAddonSummaryFilesWidget::KviPackAddonSummaryFilesWidget(KviPackAddonDialog * pParent)
+PackAddonSummaryFilesWidget::PackAddonSummaryFilesWidget(PackAddonDialog * pParent)
 : QDialog(pParent)
 {
 	setObjectName("addon_package_summary_file_dialog");
@@ -629,21 +629,21 @@ KviPackAddonSummaryFilesWidget::KviPackAddonSummaryFilesWidget(KviPackAddonDialo
 	pLayout->addWidget(pBox);
 }
 
-KviPackAddonSummaryFilesWidget::~KviPackAddonSummaryFilesWidget()
+PackAddonSummaryFilesWidget::~PackAddonSummaryFilesWidget()
 {
 }
 
-void KviPackAddonSummaryFilesWidget::accept()
+void PackAddonSummaryFilesWidget::accept()
 {
 	QDialog::accept();
 }
 
-void KviPackAddonSummaryFilesWidget::reject()
+void PackAddonSummaryFilesWidget::reject()
 {
 	QDialog::reject();
 }
 
-void KviPackAddonSummaryFilesWidget::showEvent(QShowEvent *)
+void PackAddonSummaryFilesWidget::showEvent(QShowEvent *)
 {
 	QStringList list;
 
diff --git a/src/modules/addon/packaddondialog.h b/src/modules/addon/PackAddonDialog.h
index bf5dbf1ba..5819a8186 100644
--- a/src/modules/addon/packaddondialog.h
+++ b/src/modules/addon/PackAddonDialog.h
@@ -2,7 +2,7 @@
 #define _PACKADDONDIALOG_H_
 //=============================================================================
 //
-//   File : packaddondialog.h
+//   File : PackAddonDialog.h
 //   Creation date : Sat 03 May 2008 01:40:44 by Elvio Basello
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file packaddondialog.h
+* \file PackAddonDialog.h
 * \author Elvio Basello
 * \brief Addon package creator
 *
@@ -46,37 +46,37 @@ class QLabel;
 
 class KviPackageWriter;
 
-class KviPackAddonInfoPackageWidget;
-class KviPackAddonFileSelectionWidget;
-class KviPackAddonSaveSelectionWidget;
-class KviPackAddonSummaryInfoWidget;
-class KviPackAddonSummaryFilesWidget;
+class PackAddonInfoPackageWidget;
+class PackAddonFileSelectionWidget;
+class PackAddonSaveSelectionWidget;
+class PackAddonSummaryInfoWidget;
+class PackAddonSummaryFilesWidget;
 
 /**
-* \class KviPackAddonDialog
+* \class PackAddonDialog
 * \brief Wizard for addon creation
 */
-class KviPackAddonDialog : public QWizard
+class PackAddonDialog : public QWizard
 {
 	Q_OBJECT
 public:
 	/**
 	* \brief Creates the wizard object
 	* \param pParent The parent widget
-	* \return KviPackAddonDialog
+	* \return PackAddonDialog
 	*/
-	KviPackAddonDialog(QWidget * pParent);
+	PackAddonDialog(QWidget * pParent);
 
 	/**
 	* \brief Destroys the wizard object
 	*/
-	~KviPackAddonDialog();
+	~PackAddonDialog();
 protected:
-	KviPackAddonInfoPackageWidget   * m_pPackAddonInfoPackageWidget;
-	KviPackAddonFileSelectionWidget * m_pPackAddonFileSelectionWidget;
-	KviPackAddonSaveSelectionWidget * m_pPackAddonSaveSelectionWidget;
-	KviPackAddonSummaryInfoWidget   * m_pPackAddonSummaryInfoWidget;
-	KviPackAddonSummaryFilesWidget  * m_pPackAddonSummaryFilesWidget;
+	PackAddonInfoPackageWidget   * m_pPackAddonInfoPackageWidget;
+	PackAddonFileSelectionWidget * m_pPackAddonFileSelectionWidget;
+	PackAddonSaveSelectionWidget * m_pPackAddonSaveSelectionWidget;
+	PackAddonSummaryInfoWidget   * m_pPackAddonSummaryInfoWidget;
+	PackAddonSummaryFilesWidget  * m_pPackAddonSummaryFilesWidget;
 	QString                           m_szAuthor;
 	QString                           m_szName;
 	QString                           m_szVersion;
@@ -115,24 +115,24 @@ protected:
 };
 
 /**
-* \class KviPackAddonInfoPackageWidget
+* \class PackAddonInfoPackageWidget
 * \brief Wizard page for addon information
 */
-class KviPackAddonInfoPackageWidget : public QWizardPage
+class PackAddonInfoPackageWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
 	/**
 	* \brief Create the wizard package info page object
 	* \param pParent The parent widget
-	* \return KviPackAddonInfoPackageWidget
+	* \return PackAddonInfoPackageWidget
 	*/
-	KviPackAddonInfoPackageWidget(KviPackAddonDialog * pParent);
+	PackAddonInfoPackageWidget(PackAddonDialog * pParent);
 
 	/**
 	* \brief Destroys the wizard package info page object
 	*/
-	~KviPackAddonInfoPackageWidget();
+	~PackAddonInfoPackageWidget();
 protected:
 	QLineEdit * m_pPackageAuthorEdit;
 	QLineEdit * m_pPackageNameEdit;
@@ -142,24 +142,24 @@ protected:
 };
 
 /**
-* \class KviPackAddonFileSelectionWidget
+* \class PackAddonFileSelectionWidget
 * \brief Wizard page for directory source selection
 */
-class KviPackAddonFileSelectionWidget : public QWizardPage
+class PackAddonFileSelectionWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
 	/**
 	* \brief Create the wizard package source dir object
 	* \param pParent The parent widget
-	* \return KviPackAddonFileSelectionWidget
+	* \return PackAddonFileSelectionWidget
 	*/
-	KviPackAddonFileSelectionWidget(KviPackAddonDialog * pParent);
+	PackAddonFileSelectionWidget(PackAddonDialog * pParent);
 
 	/**
 	* \brief Destroys the wizard package source dir object
 	*/
-	~KviPackAddonFileSelectionWidget();
+	~PackAddonFileSelectionWidget();
 protected:
 	KviDirectorySelector * m_pDirPathSelector;
 	KviFileSelector      * m_pPackageIconEdit;
@@ -168,24 +168,24 @@ protected:
 };
 
 /**
-* \class KviPackAddonSaveSelectionWidget
+* \class PackAddonSaveSelectionWidget
 * \brief Wizard page for saving package
 */
-class KviPackAddonSaveSelectionWidget : public QWizardPage
+class PackAddonSaveSelectionWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
 	/**
 	* \brief Create the wizard save page object
 	* \param pParent The parent widget
-	* \return KviPackAddonSaveSelectionWidget
+	* \return PackAddonSaveSelectionWidget
 	*/
-	KviPackAddonSaveSelectionWidget(KviPackAddonDialog * pParent);
+	PackAddonSaveSelectionWidget(PackAddonDialog * pParent);
 
 	/**
 	* \brief Destroys the wizard save page object
 	*/
-	~KviPackAddonSaveSelectionWidget();
+	~PackAddonSaveSelectionWidget();
 protected:
 	KviFileSelector * m_pSavePathSelector;
 	QString m_szFilePath;
@@ -198,24 +198,24 @@ protected:
 };
 
 /**
-* \class KviPackAddonSummaryInfoWidget
+* \class PackAddonSummaryInfoWidget
 * \brief Wizard page for showing information inserted
 */
-class KviPackAddonSummaryInfoWidget : public QWizardPage
+class PackAddonSummaryInfoWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
 	/**
 	* \brief Create the wizard summary info page object
 	* \param pParent The parent widget
-	* \return KviPackAddonSummaryInfoWidget
+	* \return PackAddonSummaryInfoWidget
 	*/
-	KviPackAddonSummaryInfoWidget(KviPackAddonDialog * pParent);
+	PackAddonSummaryInfoWidget(PackAddonDialog * pParent);
 
 	/**
 	* \brief Destroys the wizard summary info page object
 	*/
-	~KviPackAddonSummaryInfoWidget();
+	~PackAddonSummaryInfoWidget();
 protected:
 	QLabel * m_pLabelInfo;
 	QLabel * m_pLabelAuthor;
@@ -231,12 +231,12 @@ protected:
 };
 
 
-class KviPackAddonSummaryFilesWidget : public QDialog
+class PackAddonSummaryFilesWidget : public QDialog
 {
 	Q_OBJECT
 public:
-	KviPackAddonSummaryFilesWidget(KviPackAddonDialog * pParent);
-	~KviPackAddonSummaryFilesWidget();
+	PackAddonSummaryFilesWidget(PackAddonDialog * pParent);
+	~PackAddonSummaryFilesWidget();
 protected:
 	QTextEdit * m_pFiles;
 	QString     m_szPath;
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 79f39a851..c852c5b13 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "managementdialog.h"
-#include "addonfunctions.h"
+#include "AddonFunctions.h"
 
 #include "KviModule.h"
 #include "KviKvsScriptAddonManager.h"
@@ -776,7 +776,7 @@ static bool addon_kvs_cmd_installfiles(KviKvsModuleCommandCall * c)
 static bool addon_kvs_cmd_dialog(KviKvsModuleCommandCall *c)
 {
 
-	KviScriptManagementDialog::display(c->hasSwitch('t',"toplevel"));
+	AddonManagementDialog::display(c->hasSwitch('t',"toplevel"));
 	return true;
 }
 
@@ -803,7 +803,7 @@ static bool addon_kvs_cmd_install(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 
 	QString szError;
-	if(!KviAddonFunctions::installAddonPackage(szAddonPackFile,szError))
+	if(!AddonFunctions::installAddonPackage(szAddonPackFile,szError))
 	{
 		c->error(__tr2qs_ctx("Error installing addon package: %Q","addon"),&szError);
 		return false;
@@ -839,7 +839,7 @@ static bool addon_module_init(KviModule *m)
 
 static bool addon_module_cleanup(KviModule *m)
 {
-	KviScriptManagementDialog::cleanup();
+	AddonManagementDialog::cleanup();
 
 	QString szBuf;
 	m->getDefaultConfigFileName(szBuf);
@@ -851,7 +851,7 @@ static bool addon_module_cleanup(KviModule *m)
 
 static bool addon_module_can_unload(KviModule *)
 {
-	return (!KviScriptManagementDialog::instance());
+	return (!AddonManagementDialog::instance());
 }
 
 
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index 846c5e112..d2f4d2ef9 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -23,8 +23,8 @@
 //=============================================================================
 
 #include "managementdialog.h"
-#include "packaddondialog.h"
-#include "addonfunctions.h"
+#include "PackAddonDialog.h"
+#include "AddonFunctions.h"
 
 #include "KviApplication.h"
 #include "KviLocale.h"
@@ -56,10 +56,10 @@
 #include <QAbstractTextDocumentLayout>
 
 
-KviScriptManagementDialog * KviScriptManagementDialog::m_pInstance = 0;
+AddonManagementDialog * AddonManagementDialog::m_pInstance = 0;
 extern QRect g_rectManagementDialogGeometry;
 
-KviScriptAddonListViewItem::KviScriptAddonListViewItem(KviTalListWidget *v,KviKvsScriptAddon * a)
+AddonListViewItem::AddonListViewItem(KviTalListWidget *v,KviKvsScriptAddon * a)
 : KviTalListWidgetItem(v)
 {
 	m_pAddon = new KviKvsScriptAddon(*a);
@@ -81,12 +81,12 @@ KviScriptAddonListViewItem::KviScriptAddonListViewItem(KviTalListWidget *v,KviKv
 	if (p) setIcon(*p);
 }
 
-KviScriptAddonListViewItem::~KviScriptAddonListViewItem()
+AddonListViewItem::~AddonListViewItem()
 {
 	delete m_pAddon;
 }
 
-KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
+AddonManagementDialog::AddonManagementDialog(QWidget * p)
 : QWidget(p)
 {
 	setWindowTitle(__tr2qs_ctx("Manage Script-Based Addons","addon"));
@@ -186,13 +186,13 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
 		g_rectManagementDialogGeometry.y());
 }
 
-KviScriptManagementDialog::~KviScriptManagementDialog()
+AddonManagementDialog::~AddonManagementDialog()
 {
 	g_rectManagementDialogGeometry = QRect(pos().x(),pos().y(),size().width(),size().height());
 	m_pInstance = 0;
 }
 
-void KviScriptManagementDialog::fillListView()
+void AddonManagementDialog::fillListView()
 {
 	m_pListWidget->clear();
 	KviPointerHashTable<QString,KviKvsScriptAddon> * d = KviKvsScriptAddonManager::instance()->addonDict();
@@ -201,14 +201,14 @@ void KviScriptManagementDialog::fillListView()
 
 	while(KviKvsScriptAddon * a = it.current())
 	{
-		new KviScriptAddonListViewItem(m_pListWidget,a);
+		new AddonListViewItem(m_pListWidget,a);
 		++it;
 	}
 }
 
-void KviScriptManagementDialog::currentChanged(QListWidgetItem *item,QListWidgetItem *)
+void AddonManagementDialog::currentChanged(QListWidgetItem *item,QListWidgetItem *)
 {
-	KviScriptAddonListViewItem * it = (KviScriptAddonListViewItem *)item;
+	AddonListViewItem * it = (AddonListViewItem *)item;
 	if(!it)
 	{
 		m_pConfigureButton->setEnabled(false);
@@ -221,32 +221,32 @@ void KviScriptManagementDialog::currentChanged(QListWidgetItem *item,QListWidget
 	}
 }
 
-void KviScriptManagementDialog::showScriptHelp()
+void AddonManagementDialog::showScriptHelp()
 {
-	KviScriptAddonListViewItem * it = (KviScriptAddonListViewItem *)m_pListWidget->currentItem();
+	AddonListViewItem * it = (AddonListViewItem *)m_pListWidget->currentItem();
 	if(!it)return;
 	if(it->addon()->helpCallbackCode().isEmpty())return;
 	it->addon()->executeHelpCallback(g_pActiveWindow);
 }
 
-void KviScriptManagementDialog::configureScript()
+void AddonManagementDialog::configureScript()
 {
-	KviScriptAddonListViewItem * it = (KviScriptAddonListViewItem *)m_pListWidget->currentItem();
+	AddonListViewItem * it = (AddonListViewItem *)m_pListWidget->currentItem();
 	if(!it)return;
 	if(it->addon()->configureCallbackCode().isEmpty())return;
 	it->addon()->executeConfigureCallback(g_pActiveWindow);
 }
 
-void KviScriptManagementDialog::packScript()
+void AddonManagementDialog::packScript()
 {
-	KviPackAddonDialog * pDialog = new KviPackAddonDialog(this);
+	PackAddonDialog * pDialog = new PackAddonDialog(this);
 	pDialog->exec();
 	delete pDialog;
 }
 
-void KviScriptManagementDialog::uninstallScript()
+void AddonManagementDialog::uninstallScript()
 {
-	KviScriptAddonListViewItem * it = (KviScriptAddonListViewItem *)m_pListWidget->currentItem();
+	AddonListViewItem * it = (AddonListViewItem *)m_pListWidget->currentItem();
 	if(!it)return;
 
 	QString txt = "<p>";
@@ -265,13 +265,13 @@ void KviScriptManagementDialog::uninstallScript()
 	currentChanged(0,0);
 }
 
-void KviScriptManagementDialog::getMoreScripts()
+void AddonManagementDialog::getMoreScripts()
 {
 	// If change this introducing not-fixed text, remember to escape this using KviQString::escapeKvs()!
 	KviKvsScript::run("openurl http://www.kvirc.net/?id=addons&version=" KVI_VERSION "." KVI_SOURCES_DATE,g_pActiveWindow);
 }
 
-void KviScriptManagementDialog::installScript()
+void AddonManagementDialog::installScript()
 {
 	QString szFileName, szError;
 
@@ -286,7 +286,7 @@ void KviScriptManagementDialog::installScript()
 	// Sanity check
 	if(szFileName.endsWith(".kva"))
 	{
-		if(!KviAddonFunctions::installAddonPackage(szFileName,szError,this))
+		if(!AddonFunctions::installAddonPackage(szFileName,szError,this))
 		{
 			QMessageBox::critical(
 				this,
@@ -301,7 +301,7 @@ void KviScriptManagementDialog::installScript()
 	} else {
 		// Just for sanity check. We should NEVER enter here
 		qDebug("Entered sanity check");
-		KviAddonFunctions::notAValidAddonPackage(szError);
+		AddonFunctions::notAValidAddonPackage(szError);
 		QMessageBox::critical(
 			this,
 			__tr2qs_ctx("Install Addon - KVIrc","addon"),
@@ -319,7 +319,7 @@ void KviScriptManagementDialog::installScript()
 	//m_pListWidget->triggerUpdate();
 }
 
-void KviScriptManagementDialog::showEvent(QShowEvent * e)
+void AddonManagementDialog::showEvent(QShowEvent * e)
 {
 	QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
 	move((rect.width() - width())/2,(rect.height() - height())/2);
@@ -327,19 +327,19 @@ void KviScriptManagementDialog::showEvent(QShowEvent * e)
 	QWidget::showEvent(e);
 }
 
-void KviScriptManagementDialog::closeClicked()
+void AddonManagementDialog::closeClicked()
 {
 	delete this;
 }
 
-void KviScriptManagementDialog::cleanup()
+void AddonManagementDialog::cleanup()
 {
 	if(!m_pInstance)return;
 	delete m_pInstance;
 	m_pInstance = 0;
 }
 
-void KviScriptManagementDialog::display(bool bTopLevel)
+void AddonManagementDialog::display(bool bTopLevel)
 {
 	if(m_pInstance)
 	{
@@ -358,9 +358,9 @@ void KviScriptManagementDialog::display(bool bTopLevel)
 	} else {
 		if(bTopLevel)
 		{
-			m_pInstance = new KviScriptManagementDialog(0);
+			m_pInstance = new AddonManagementDialog(0);
 		} else {
-			m_pInstance = new KviScriptManagementDialog(g_pFrame->splitter());
+			m_pInstance = new AddonManagementDialog(g_pFrame->splitter());
 		}
 	}
 	m_pInstance->show();
@@ -368,13 +368,13 @@ void KviScriptManagementDialog::display(bool bTopLevel)
 	m_pInstance->setFocus();
 }
 
-void KviScriptManagementDialog::closeEvent(QCloseEvent * e)
+void AddonManagementDialog::closeEvent(QCloseEvent * e)
 {
 	e->ignore();
 	delete this;
 }
 
-void KviScriptManagementDialog::reject()
+void AddonManagementDialog::reject()
 {
 	cleanup();
 }
diff --git a/src/modules/addon/managementdialog.h b/src/modules/addon/managementdialog.h
index 45a6b8656..dd9fe1780 100644
--- a/src/modules/addon/managementdialog.h
+++ b/src/modules/addon/managementdialog.h
@@ -38,11 +38,11 @@
 class QPixmap;
 class KviKvsScriptAddon;
 
-class KviScriptAddonListViewItem : public KviTalListWidgetItem
+class AddonListViewItem : public KviTalListWidgetItem
 {
 public:
-	KviScriptAddonListViewItem(KviTalListWidget * v,KviKvsScriptAddon * a);
-	~KviScriptAddonListViewItem();
+	AddonListViewItem(KviTalListWidget * v,KviKvsScriptAddon * a);
+	~AddonListViewItem();
 protected:
 	KviKvsScriptAddon * m_pAddon;
 	QTextDocument     * m_pText;
@@ -54,22 +54,22 @@ public:
 };
 
 
-class KviScriptManagementDialog : public QWidget
+class AddonManagementDialog : public QWidget
 {
 	Q_OBJECT
 protected:
-	KviScriptManagementDialog(QWidget * p);
+	AddonManagementDialog(QWidget * p);
 public:
-	~KviScriptManagementDialog();
+	~AddonManagementDialog();
 protected:
 	KviTalListWidget                 * m_pListWidget;
-	static KviScriptManagementDialog * m_pInstance;
+	static AddonManagementDialog * m_pInstance;
 	QToolButton                      * m_pConfigureButton;
 	QToolButton                      * m_pHelpButton;
 	QToolButton                      * m_pPackButton;
 	QToolButton                      * m_pUninstallButton;
 public:
-	static KviScriptManagementDialog * instance(){ return m_pInstance; };
+	static AddonManagementDialog * instance(){ return m_pInstance; };
 	static void display(bool bTopLevel);
 	static void cleanup();
 protected:
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp
index 3fe332576..e53272448 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/AliasEditorWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : aliaseditor.cpp
+//   File : AliasEditorWindow.cpp
 //   Creation date : Mon Dec 23 2002 14:36:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "aliaseditor.h"
+#include "AliasEditorWindow.h"
 
 #include "KviIconManager.h"
 #include "KviOptions.h"
@@ -58,42 +58,42 @@
 #include <QList>
 #include <QPainter>
 #include <QBrush>
-extern KviAliasEditorWindow * g_pAliasEditorWindow;
+extern AliasEditorWindow * g_pAliasEditorWindow;
 extern KviModule * g_pAliasEditorModule;
 
 
-KviAliasEditorTreeWidgetItem::KviAliasEditorTreeWidgetItem(QTreeWidget * pTreeWidget,Type eType,const QString &szName)
+AliasEditorTreeWidgetItem::AliasEditorTreeWidgetItem(QTreeWidget * pTreeWidget,Type eType,const QString &szName)
 : QTreeWidgetItem(pTreeWidget), KviHeapObject(), m_eType(eType), m_pParentItem(0)
 {
 	setName(szName);
 	m_cPos=0;
-	if(eType==KviAliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE))));
+	if(eType==AliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE))));
 	else setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS))));
 }
 
-KviAliasEditorTreeWidgetItem::KviAliasEditorTreeWidgetItem(KviAliasEditorTreeWidgetItem * pParentItem,Type eType,const QString &szName)
+AliasEditorTreeWidgetItem::AliasEditorTreeWidgetItem(AliasEditorTreeWidgetItem * pParentItem,Type eType,const QString &szName)
 : QTreeWidgetItem(pParentItem), m_eType(eType), m_pParentItem(pParentItem)
 {
 	setName(szName);
 	m_cPos=0;
 	setFlags(Qt::ItemIsEditable|Qt::ItemIsEnabled|Qt::ItemIsSelectable);
-	if(eType==KviAliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE))));
+	if(eType==AliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE))));
 	else setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS))));
 }
 
-void KviAliasEditorTreeWidgetItem::setName(const QString &szName)
+void AliasEditorTreeWidgetItem::setName(const QString &szName)
 {
 	m_szName = szName;
 	setText(0,m_szName);
 }
-void KviAliasEditorTreeWidgetItem::setType(Type t)
+void AliasEditorTreeWidgetItem::setType(Type t)
 {
 	m_eType=t;
-	if(t==KviAliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE))));
+	if(t==AliasEditorTreeWidgetItem::Namespace) setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE))));
 		else setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS))));
 }
 
-KviAliasEditorTreeWidget::KviAliasEditorTreeWidget(QWidget * par)
+AliasEditorTreeWidget::AliasEditorTreeWidget(QWidget * par)
 : QTreeWidget(par)
 {
 	setColumnCount (1);
@@ -104,17 +104,17 @@ KviAliasEditorTreeWidget::KviAliasEditorTreeWidget(QWidget * par)
 	setAnimated(true);
 }
 
-KviAliasEditorTreeWidget::~KviAliasEditorTreeWidget()
+AliasEditorTreeWidget::~AliasEditorTreeWidget()
 {
 	//remove and delete all items
 	clear();
 }
 
 
-KviAliasEditor::KviAliasEditor(QWidget * par)
+AliasEditorWidget::AliasEditorWidget(QWidget * par)
 : QWidget(par)
 {
-	m_pAliases=new KviPointerList<KviAliasEditorTreeWidgetItem>;
+	m_pAliases=new KviPointerList<AliasEditorTreeWidgetItem>;
 	m_pAliases->setAutoDelete(false);
 
 	m_bSaving = false;
@@ -132,7 +132,7 @@ KviAliasEditor::KviAliasEditor(QWidget * par)
 	box->setSpacing(0);
 	box->setMargin(0);
 
-	m_pTreeWidget = new KviAliasEditorTreeWidget(box);
+	m_pTreeWidget = new AliasEditorTreeWidget(box);
 
 	box = new KviTalVBox(m_pSplitter);
 	KviTalHBox * hbox = new KviTalHBox(box);
@@ -157,13 +157,13 @@ KviAliasEditor::KviAliasEditor(QWidget * par)
 	currentItemChanged(0,0);
 }
 
-KviAliasEditor::~KviAliasEditor()
+AliasEditorWidget::~AliasEditorWidget()
 {
 	KviScriptEditor::destroyInstance(m_pEditor);
 	delete m_pAliases;
 }
 
-void KviAliasEditor::buildFullItemPath(KviAliasEditorTreeWidgetItem * it,QString &szBuffer)
+void AliasEditorWidget::buildFullItemPath(AliasEditorTreeWidgetItem * it,QString &szBuffer)
 {
 	if (it->isAlias()) it=it->parentItem();
 	if (!it) return;
@@ -179,11 +179,11 @@ void KviAliasEditor::buildFullItemPath(KviAliasEditorTreeWidgetItem * it,QString
 	}
 }
 
-QString KviAliasEditor::buildFullItemName(KviAliasEditorTreeWidgetItem * it)
+QString AliasEditorWidget::buildFullItemName(AliasEditorTreeWidgetItem * it)
 {
 	if(!it) return QString();
 	QString szName = it->name();
-	KviAliasEditorTreeWidgetItem * nit = it->parentItem();
+	AliasEditorTreeWidgetItem * nit = it->parentItem();
 
 	while(nit)
 	{
@@ -199,23 +199,23 @@ QString KviAliasEditor::buildFullItemName(KviAliasEditorTreeWidgetItem * it)
 }
 
 //FIXME this should be called something like "findNamespace"
-KviAliasEditorTreeWidgetItem * KviAliasEditor::findTopLevelItem(const QString &szName)
+AliasEditorTreeWidgetItem * AliasEditorWidget::findTopLevelItem(const QString &szName)
 {
-	KviAliasEditorTreeWidgetItem *pItem =0;
+	AliasEditorTreeWidgetItem *pItem =0;
 	for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		pItem = (KviAliasEditorTreeWidgetItem*) m_pTreeWidget->topLevelItem(i);
+		pItem = (AliasEditorTreeWidgetItem*) m_pTreeWidget->topLevelItem(i);
 		if (pItem->text(0)==szName && pItem->isNamespace())
-			return (KviAliasEditorTreeWidgetItem*)m_pTreeWidget->topLevelItem(i);
+			return (AliasEditorTreeWidgetItem*)m_pTreeWidget->topLevelItem(i);
 	}
 	return 0;
 }
 
-KviAliasEditorTreeWidgetItem * KviAliasEditor::findItem(const QString &szFullName)
+AliasEditorTreeWidgetItem * AliasEditorWidget::findItem(const QString &szFullName)
 {
 	QStringList lNamespaces=szFullName.split("::");
 	if(!lNamespaces.count()) return 0;
-	KviAliasEditorTreeWidgetItem *pItem=findTopLevelItem(lNamespaces.at(0));
+	AliasEditorTreeWidgetItem *pItem=findTopLevelItem(lNamespaces.at(0));
 	if (!pItem) return 0;
 	bool bFound;
 	int i;
@@ -227,24 +227,24 @@ KviAliasEditorTreeWidgetItem * KviAliasEditor::findItem(const QString &szFullNam
 		{
 			if (KviQString::equalCI(pItem->child(j)->text(0),lNamespaces.at(i)))
 			{
-				pItem=( KviAliasEditorTreeWidgetItem *)pItem->child(j);
+				pItem=( AliasEditorTreeWidgetItem *)pItem->child(j);
 				bFound=true;
 				break;
 			}
 		}
 		if (!bFound) return 0;
 	}
-	return (KviAliasEditorTreeWidgetItem *)pItem;
+	return (AliasEditorTreeWidgetItem *)pItem;
 }
 
 
-KviAliasEditorTreeWidgetItem * KviAliasEditor::createFullItem(const QString &szFullName)
+AliasEditorTreeWidgetItem * AliasEditorWidget::createFullItem(const QString &szFullName)
 {
 	QStringList lNamespaces=szFullName.split("::");
 	if(!lNamespaces.count()) return 0;
-	if (lNamespaces.count()==1) return new KviAliasEditorTreeWidgetItem(m_pTreeWidget,KviAliasEditorTreeWidgetItem::Alias,lNamespaces.at(0));
-	KviAliasEditorTreeWidgetItem *pItem=findTopLevelItem(lNamespaces.at(0));
-	if (!pItem) pItem=new KviAliasEditorTreeWidgetItem(m_pTreeWidget,KviAliasEditorTreeWidgetItem::Namespace,lNamespaces.at(0));
+	if (lNamespaces.count()==1) return new AliasEditorTreeWidgetItem(m_pTreeWidget,AliasEditorTreeWidgetItem::Alias,lNamespaces.at(0));
+	AliasEditorTreeWidgetItem *pItem=findTopLevelItem(lNamespaces.at(0));
+	if (!pItem) pItem=new AliasEditorTreeWidgetItem(m_pTreeWidget,AliasEditorTreeWidgetItem::Namespace,lNamespaces.at(0));
 	bool bFound;
 	int i;
 	for(i=1;i<lNamespaces.count()-1;i++)
@@ -254,26 +254,26 @@ KviAliasEditorTreeWidgetItem * KviAliasEditor::createFullItem(const QString &szF
 		{
 			if (KviQString::equalCI(pItem->child(j)->text(0),lNamespaces.at(i)))
 			{
-				pItem=( KviAliasEditorTreeWidgetItem *)pItem->child(j);
+				pItem=( AliasEditorTreeWidgetItem *)pItem->child(j);
 				bFound=true;
 				break;
 			}
 		}
 		if (!bFound)
-			pItem=new KviAliasEditorTreeWidgetItem(pItem,KviAliasEditorTreeWidgetItem::Namespace,lNamespaces.at(i));
+			pItem=new AliasEditorTreeWidgetItem(pItem,AliasEditorTreeWidgetItem::Namespace,lNamespaces.at(i));
 	}
-	return new KviAliasEditorTreeWidgetItem(pItem,KviAliasEditorTreeWidgetItem::Alias,lNamespaces.at(i));
+	return new AliasEditorTreeWidgetItem(pItem,AliasEditorTreeWidgetItem::Alias,lNamespaces.at(i));
 }
 
 
-void KviAliasEditor::oneTimeSetup()
+void AliasEditorWidget::oneTimeSetup()
 {
 	KviPointerHashTable<QString,KviKvsScript> * a = KviKvsAliasManager::instance()->aliasDict();
 	if(!a)return;
 
 	KviPointerHashTableIterator<QString,KviKvsScript> it(*a);
 
-	KviAliasEditorTreeWidgetItem * item;
+	AliasEditorTreeWidgetItem * item;
 	while(it.current())
 	{
 		KviKvsScript * alias = it.current();
@@ -291,18 +291,18 @@ void KviAliasEditor::oneTimeSetup()
 	m_pTreeWidget->sortItems(0,Qt::AscendingOrder);
 }
 
-void KviAliasEditor::aliasRefresh(const QString &szName)
+void AliasEditorWidget::aliasRefresh(const QString &szName)
 {
 	if(m_bSaving)
 		return;
-	KviAliasEditorTreeWidgetItem * item=0;
+	AliasEditorTreeWidgetItem * item=0;
 	KviKvsScript * alias = KviKvsAliasManager::instance()->aliasDict()->find(szName);
 
 	// search for old alias with same name
-	KviPointerList<KviAliasEditorTreeWidgetItem> l;
+	KviPointerList<AliasEditorTreeWidgetItem> l;
 	l.setAutoDelete(false);
-	appendAllItems(&l,KviAliasEditorTreeWidgetItem::Alias);
-	for(KviAliasEditorTreeWidgetItem * it = l.first();it;it = l.next())
+	appendAllItems(&l,AliasEditorTreeWidgetItem::Alias);
+	for(AliasEditorTreeWidgetItem * it = l.first();it;it = l.next())
 	{
 		if (KviQString::equalCI(buildFullItemName(it),szName))
 		{
@@ -330,14 +330,14 @@ void KviAliasEditor::aliasRefresh(const QString &szName)
 	item->setBuffer(alias->code());
 	m_pEditor->setText(alias->code());
 }
-void KviAliasEditor::itemRenamed(QTreeWidgetItem *it,int col)
+void AliasEditorWidget::itemRenamed(QTreeWidgetItem *it,int col)
 {
 	if(it!=m_pLastEditedItem) return;
 	
-	((KviAliasEditorTreeWidgetItem *)it)->setName(it->text(col));
-	QString szNam = buildFullItemName((KviAliasEditorTreeWidgetItem *)it);
+	((AliasEditorTreeWidgetItem *)it)->setName(it->text(col));
+	QString szNam = buildFullItemName((AliasEditorTreeWidgetItem *)it);
 	QString szLabelText;
-	if(((KviAliasEditorTreeWidgetItem *)it)->isNamespace())
+	if(((AliasEditorTreeWidgetItem *)it)->isNamespace())
 		szLabelText = __tr2qs_ctx("Namespace","editor");
 	else
 		szLabelText = __tr2qs_ctx("Alias","editor");
@@ -349,50 +349,50 @@ void KviAliasEditor::itemRenamed(QTreeWidgetItem *it,int col)
 
 
 
-bool KviAliasEditor::hasSelectedItems()
+bool AliasEditorWidget::hasSelectedItems()
 	{
 	return m_pTreeWidget->selectedItems().count()?1:0;
 }
 
-bool KviAliasEditor::itemExists(QTreeWidgetItem *pSearchFor)
+bool AliasEditorWidget::itemExists(QTreeWidgetItem *pSearchFor)
 {
 	if(!pSearchFor)return false;
-	if (m_pAliases->findRef((KviAliasEditorTreeWidgetItem*) pSearchFor)!=-1) return true;
+	if (m_pAliases->findRef((AliasEditorTreeWidgetItem*) pSearchFor)!=-1) return true;
 	else return false;
 }
 
-void KviAliasEditor::appendAllItems(KviPointerList<KviAliasEditorTreeWidgetItem> * l,KviAliasEditorTreeWidgetItem::Type eType)
+void AliasEditorWidget::appendAllItems(KviPointerList<AliasEditorTreeWidgetItem> * l,AliasEditorTreeWidgetItem::Type eType)
 {
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		if (((KviAliasEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->type()==eType)
+		if (((AliasEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i))->type()==eType)
 		{
-			l->append(((KviAliasEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i)));
+			l->append(((AliasEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i)));
 		} else {
 			appendAllItemsRecursive(l,m_pTreeWidget->topLevelItem(i),eType);
 		}
 	}
 }
 
-void KviAliasEditor::appendAllItemsRecursive(KviPointerList<KviAliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom,KviAliasEditorTreeWidgetItem::Type eType)
+void AliasEditorWidget::appendAllItemsRecursive(KviPointerList<AliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom,AliasEditorTreeWidgetItem::Type eType)
 {
 	for (int i=0;i<pStartFrom->childCount();i++)
 	{
-		if (((KviAliasEditorTreeWidgetItem *)pStartFrom->child(i))->type()==eType)
+		if (((AliasEditorTreeWidgetItem *)pStartFrom->child(i))->type()==eType)
 		{
-			l->append((KviAliasEditorTreeWidgetItem *)pStartFrom->child(i));
+			l->append((AliasEditorTreeWidgetItem *)pStartFrom->child(i));
 		} else {
 			appendAllItemsRecursive(l,pStartFrom->child(i),eType);
 		}
 	}
 }
 
-bool KviAliasEditor::aliasExists(QString &szFullItemName)
+bool AliasEditorWidget::aliasExists(QString &szFullItemName)
 {
-	KviPointerList<KviAliasEditorTreeWidgetItem> l;
+	KviPointerList<AliasEditorTreeWidgetItem> l;
 	l.setAutoDelete(false);
-	appendAllItems(&l,KviAliasEditorTreeWidgetItem::Alias);
-	for(KviAliasEditorTreeWidgetItem * it = l.first();it;it = l.next())
+	appendAllItems(&l,AliasEditorTreeWidgetItem::Alias);
+	for(AliasEditorTreeWidgetItem * it = l.first();it;it = l.next())
 	{
 		if (KviQString::equalCI(buildFullItemName(it),szFullItemName))
 		{
@@ -402,13 +402,13 @@ bool KviAliasEditor::aliasExists(QString &szFullItemName)
 	return false;
 }
 
-bool KviAliasEditor::namespaceExists(QString &szFullItemName)
+bool AliasEditorWidget::namespaceExists(QString &szFullItemName)
 {
-	KviPointerList<KviAliasEditorTreeWidgetItem> l;
+	KviPointerList<AliasEditorTreeWidgetItem> l;
 	l.setAutoDelete(false);
 
-	appendAllItems(&l,KviAliasEditorTreeWidgetItem::Namespace);
-	for(KviAliasEditorTreeWidgetItem * it = l.first();it;it = l.next())
+	appendAllItems(&l,AliasEditorTreeWidgetItem::Namespace);
+	for(AliasEditorTreeWidgetItem * it = l.first();it;it = l.next())
 	{
 		if (KviQString::equalCI(buildFullItemName(it),szFullItemName))
 		{
@@ -417,7 +417,7 @@ bool KviAliasEditor::namespaceExists(QString &szFullItemName)
 	}
 	return false;
 }
-void KviAliasEditor::renameItem()
+void AliasEditorWidget::renameItem()
 {
 	if(!m_pLastEditedItem)return;
 	//if(itemExists(m_pLastEditedItem))return; // dead ?
@@ -474,7 +474,7 @@ void KviAliasEditor::renameItem()
 
 	m_pLastEditedItem = 0; // make sure it's true (but it already should be because of removeItem())
 	m_pLastClickedItem = 0; // make sure it's true (but it already should be because of removeItem())
-	KviAliasEditorTreeWidgetItem * pItem = createFullItem(szNewName);
+	AliasEditorTreeWidgetItem * pItem = createFullItem(szNewName);
 	if(bAlias)
 	{
 		pItem->setBuffer(szCode);
@@ -483,7 +483,7 @@ void KviAliasEditor::renameItem()
 	} else {
 		for(int i=0;i<lChildren.count();i++)
 		{
-			((KviAliasEditorTreeWidgetItem*)lChildren.at(i))->setParentItem(pItem);
+			((AliasEditorTreeWidgetItem*)lChildren.at(i))->setParentItem(pItem);
 			pItem->insertChild(pItem->childCount(),lChildren.at(i));
 		}
 
@@ -495,22 +495,22 @@ void KviAliasEditor::renameItem()
 // warning: this saves ONLY the body, not the name!
 //          the name is changed explicitly with renameItem(), when needed
 
-void KviAliasEditor::saveLastEditedItem()
+void AliasEditorWidget::saveLastEditedItem()
 {
 	if(!m_pLastEditedItem)
 		return;
 	if(!itemExists(m_pLastEditedItem) || !m_pEditor->isModified() || m_pLastEditedItem->isNamespace())
 		return;
-	((KviAliasEditorTreeWidgetItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor());
+	((AliasEditorTreeWidgetItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor());
 	QString newCode;
 	m_pEditor->getText(newCode);
-	((KviAliasEditorTreeWidgetItem *)m_pLastEditedItem)->setBuffer(newCode);
+	((AliasEditorTreeWidgetItem *)m_pLastEditedItem)->setBuffer(newCode);
 }
 
-void KviAliasEditor::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
+void AliasEditorWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
 {
 	saveLastEditedItem();
-	m_pLastEditedItem = (KviAliasEditorTreeWidgetItem *)it;
+	m_pLastEditedItem = (AliasEditorTreeWidgetItem *)it;
 
 	if(!m_pLastEditedItem)
 	{
@@ -542,18 +542,18 @@ void KviAliasEditor::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
 	szLabelText += "</b>";
 	m_pNameLabel->setText(szLabelText);
 	m_pRenameButton->setEnabled(true);
-	m_pEditor->setText(((KviAliasEditorTreeWidgetItem *)it)->buffer());
+	m_pEditor->setText(((AliasEditorTreeWidgetItem *)it)->buffer());
 
 	m_pEditor->setFocus();
-	m_pEditor->setCursorPosition(((KviAliasEditorTreeWidgetItem *)it)->cursorPosition());
+	m_pEditor->setCursorPosition(((AliasEditorTreeWidgetItem *)it)->cursorPosition());
 	m_pEditor->setEnabled(true);
 }
 
 
-void KviAliasEditor::customContextMenuRequested(const QPoint pnt)
+void AliasEditorWidget::customContextMenuRequested(const QPoint pnt)
 {
 	m_pContextPopup->clear();
-	m_pLastClickedItem = (KviAliasEditorTreeWidgetItem *)m_pTreeWidget->itemAt(pnt);
+	m_pLastClickedItem = (AliasEditorTreeWidgetItem *)m_pTreeWidget->itemAt(pnt);
 
 	int id;
 
@@ -616,11 +616,11 @@ void KviAliasEditor::customContextMenuRequested(const QPoint pnt)
 	m_pContextPopup->popup( m_pTreeWidget->mapToGlobal(pnt));
 }
 
-void KviAliasEditor::searchReplace(const QString &szSearch,bool bReplace,const QString &szReplace)
+void AliasEditorWidget::searchReplace(const QString &szSearch,bool bReplace,const QString &szReplace)
 {
 	for(unsigned int i=0;i<m_pAliases->count();i++)
 	{
-		KviAliasEditorTreeWidgetItem *pItem=m_pAliases->at(i);
+		AliasEditorTreeWidgetItem *pItem=m_pAliases->at(i);
 		if(pItem->buffer().indexOf(szSearch,0,Qt::CaseInsensitive) != -1)
 		{
 			pItem->setBackground(0, QColor(255,0,0,128));
@@ -632,7 +632,7 @@ void KviAliasEditor::searchReplace(const QString &szSearch,bool bReplace,const Q
 	}
 }
 
-void KviAliasEditor::slotFind()
+void AliasEditorWidget::slotFind()
 {
 
 	g_pAliasEditorModule->lock();
@@ -652,12 +652,12 @@ void KviAliasEditor::slotFind()
 	searchReplace(szSearch);
 }
 
-void KviAliasEditor::slotFindWord(const QString &szSearch)
+void AliasEditorWidget::slotFindWord(const QString &szSearch)
 {
 	m_pEditor->setFindText(szSearch);
 }
 
-void KviAliasEditor::recursiveCollapseNamespaces(KviAliasEditorTreeWidgetItem * it)
+void AliasEditorWidget::recursiveCollapseNamespaces(AliasEditorTreeWidgetItem * it)
 {
 	if(!it)return;
 	for (int i=0;i<it->childCount();i++)
@@ -665,29 +665,29 @@ void KviAliasEditor::recursiveCollapseNamespaces(KviAliasEditorTreeWidgetItem *
 		if(it->child(i)->childCount())
 		{
 			it->child(i)->setExpanded(false);
-			recursiveCollapseNamespaces((KviAliasEditorTreeWidgetItem *)it->child(i));
+			recursiveCollapseNamespaces((AliasEditorTreeWidgetItem *)it->child(i));
 		}
 	}
 }
 
-void KviAliasEditor::slotCollapseNamespaces()
+void AliasEditorWidget::slotCollapseNamespaces()
 {
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
 		if (m_pTreeWidget->topLevelItem(i)->childCount()){
 			m_pTreeWidget->topLevelItem(i)->setExpanded(false);
-			recursiveCollapseNamespaces((KviAliasEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i));
+			recursiveCollapseNamespaces((AliasEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i));
 		}
 	}
 }
 
-void KviAliasEditor::slotReplaceAll(const QString &szFind,const QString &szReplace)
+void AliasEditorWidget::slotReplaceAll(const QString &szFind,const QString &szReplace)
 {
 	m_pEditor->setFindText(szReplace);
 	searchReplace(szFind,true,szReplace);
 }
 
-void KviAliasEditor::getExportAliasBuffer(QString &buffer,KviAliasEditorTreeWidgetItem * it)
+void AliasEditorWidget::getExportAliasBuffer(QString &buffer,AliasEditorTreeWidgetItem * it)
 {
 	QString szBuf = it->buffer();
 	KviCommandFormatter::blockFromBuffer(szBuf);
@@ -700,22 +700,22 @@ void KviAliasEditor::getExportAliasBuffer(QString &buffer,KviAliasEditorTreeWidg
 	buffer += "\n";
 }
 
-void KviAliasEditor::exportAll()
+void AliasEditorWidget::exportAll()
 {
 	exportAliases(false);
 }
 
-void KviAliasEditor::exportSelectedSepFiles()
+void AliasEditorWidget::exportSelectedSepFiles()
 {
 	exportAliases (true,true);
 }
 
-void KviAliasEditor::exportSelected()
+void AliasEditorWidget::exportSelected()
 {
 	exportAliases(true);
 }
 
-void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasEditorTreeWidgetItem> *l)
+void AliasEditorWidget::exportSelectionInSinglesFiles(KviPointerList<AliasEditorTreeWidgetItem> *l)
 {
 	if(!m_szDir.endsWith(QString(KVI_PATH_SEPARATOR)))m_szDir += KVI_PATH_SEPARATOR;
 	if (!l->first())
@@ -736,7 +736,7 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasEditor
 
 	bool bReplaceAll=false;
 
-        for(KviAliasEditorTreeWidgetItem * it = l->first();it;it = l->next())
+        for(AliasEditorTreeWidgetItem * it = l->first();it;it = l->next())
 	{
 		QString tmp;
 		getExportAliasBuffer(tmp,it);
@@ -761,11 +761,11 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasEditor
 	g_pAliasEditorModule->unlock();
 }
 
-void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles)
+void AliasEditorWidget::exportAliases(bool bSelectedOnly,bool bSingleFiles)
 {
 	saveLastEditedItem();
 
-	KviPointerList<KviAliasEditorTreeWidgetItem> l;
+	KviPointerList<AliasEditorTreeWidgetItem> l;
 	l.setAutoDelete(false);
 
 	if (bSelectedOnly) appendSelectedAliasItems(&l);
@@ -824,9 +824,9 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles)
 		g_pAliasEditorModule->unlock();
 	}
 }
-void KviAliasEditor::buildAliasesFile(KviPointerList<KviAliasEditorTreeWidgetItem> *l, QString & szBuffer)
+void AliasEditorWidget::buildAliasesFile(KviPointerList<AliasEditorTreeWidgetItem> *l, QString & szBuffer)
 {
-	for(KviAliasEditorTreeWidgetItem * it = l->first();it;it = l->next())
+	for(AliasEditorTreeWidgetItem * it = l->first();it;it = l->next())
 	{
 		QString tmp;
 		getExportAliasBuffer(tmp,it);
@@ -835,7 +835,7 @@ void KviAliasEditor::buildAliasesFile(KviPointerList<KviAliasEditorTreeWidgetIte
 	}
 }
 
-void KviAliasEditor::saveProperties(KviConfigurationFile *cfg)
+void AliasEditorWidget::saveProperties(KviConfigurationFile *cfg)
 {
 	cfg->writeEntry("Sizes",m_pSplitter->sizes());
 	QString szName;
@@ -844,7 +844,7 @@ void KviAliasEditor::saveProperties(KviConfigurationFile *cfg)
 	cfg->writeEntry("LastAlias",szName);
 }
 
-void KviAliasEditor::loadProperties(KviConfigurationFile *cfg)
+void AliasEditorWidget::loadProperties(KviConfigurationFile *cfg)
 {
 	QList<int> def;
 	def.append(20);
@@ -852,61 +852,61 @@ void KviAliasEditor::loadProperties(KviConfigurationFile *cfg)
 	m_pSplitter->setSizes(cfg->readIntListEntry("Sizes",def));
 	QString tmp = cfg->readEntry("LastAlias",QString());
 
-	KviAliasEditorTreeWidgetItem * it = findItem(tmp);
+	AliasEditorTreeWidgetItem * it = findItem(tmp);
 	activateItem(it);
 }
 
-void KviAliasEditor::appendSelectedAliasItems(KviPointerList<KviAliasEditorTreeWidgetItem> * l)
+void AliasEditorWidget::appendSelectedAliasItems(KviPointerList<AliasEditorTreeWidgetItem> * l)
 {
 	QList<QTreeWidgetItem *> list=m_pTreeWidget->selectedItems();
 	for(int i=0;i<list.count();i++)
 	{
-		if (((KviAliasEditorTreeWidgetItem *)list.at(i))->isAlias())
+		if (((AliasEditorTreeWidgetItem *)list.at(i))->isAlias())
 		{
-			l->append((KviAliasEditorTreeWidgetItem *)list.at(i));
+			l->append((AliasEditorTreeWidgetItem *)list.at(i));
 		} else {
 			appendSelectedAliasItemsRecursive(l,list.at(i));
 		}
 	}
 }
-void KviAliasEditor::appendSelectedAliasItemsRecursive(KviPointerList<KviAliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom)
+void AliasEditorWidget::appendSelectedAliasItemsRecursive(KviPointerList<AliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom)
 {
 	for (int i=0;i<pStartFrom->childCount();i++)
 	{
-		if (((KviAliasEditorTreeWidgetItem *)pStartFrom->child(i))->isAlias())
-			l->append(((KviAliasEditorTreeWidgetItem *)pStartFrom->child(i)));
+		if (((AliasEditorTreeWidgetItem *)pStartFrom->child(i))->isAlias())
+			l->append(((AliasEditorTreeWidgetItem *)pStartFrom->child(i)));
 		else
 			appendSelectedAliasItemsRecursive(l,pStartFrom->child(i));
 	}
 }
 
 
-void KviAliasEditor::appendSelectedItems(KviPointerList<KviAliasEditorTreeWidgetItem> * l)
+void AliasEditorWidget::appendSelectedItems(KviPointerList<AliasEditorTreeWidgetItem> * l)
 {
 	QList<QTreeWidgetItem *> list=m_pTreeWidget->selectedItems();
 	for(int i=0;i<list.count();i++)
 	{
-		l->append((KviAliasEditorTreeWidgetItem *)list.at(i));
-		/* if (!((KviAliasEditorTreeWidgetItem *)list.at(i))->isAlias())
+		l->append((AliasEditorTreeWidgetItem *)list.at(i));
+		/* if (!((AliasEditorTreeWidgetItem *)list.at(i))->isAlias())
 			appendSelectedAliasItemsRecursive(l,list.at(i));*/
 	}
 
 }
-void KviAliasEditor::appendSelectedItemsRecursive(KviPointerList<KviAliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom)
+void AliasEditorWidget::appendSelectedItemsRecursive(KviPointerList<AliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom)
 {
 	for (int i=0;i<pStartFrom->childCount();i++)
 	{
-		l->append(((KviAliasEditorTreeWidgetItem *)pStartFrom->child(i)));
-		if (!((KviAliasEditorTreeWidgetItem *)pStartFrom->child(i))->isAlias())
+		l->append(((AliasEditorTreeWidgetItem *)pStartFrom->child(i)));
+		if (!((AliasEditorTreeWidgetItem *)pStartFrom->child(i))->isAlias())
 			appendSelectedAliasItemsRecursive(l,pStartFrom->child(i));
 	}
 }
 
-void KviAliasEditor::removeItemChildren(KviAliasEditorTreeWidgetItem *it)
+void AliasEditorWidget::removeItemChildren(AliasEditorTreeWidgetItem *it)
 {
 	while(it->childCount() > 0)
 	{
-		KviAliasEditorTreeWidgetItem * pChild = (KviAliasEditorTreeWidgetItem *)(it->child(0));
+		AliasEditorTreeWidgetItem * pChild = (AliasEditorTreeWidgetItem *)(it->child(0));
 		if(pChild->childCount())
 			removeItemChildren(pChild);
 		delete pChild;
@@ -914,7 +914,7 @@ void KviAliasEditor::removeItemChildren(KviAliasEditorTreeWidgetItem *it)
 	}
 }
 
-bool KviAliasEditor::removeItem(KviAliasEditorTreeWidgetItem *it,bool * pbYesToAll,bool)
+bool AliasEditorWidget::removeItem(AliasEditorTreeWidgetItem *it,bool * pbYesToAll,bool)
 {
 	if(!it)return true;
 	QString szMsg;
@@ -958,19 +958,19 @@ bool KviAliasEditor::removeItem(KviAliasEditorTreeWidgetItem *it,bool * pbYesToA
 	return true;
 }
 
-void KviAliasEditor::removeSelectedItems()
+void AliasEditorWidget::removeSelectedItems()
 {
-	KviPointerList<KviAliasEditorTreeWidgetItem> l;
+	KviPointerList<AliasEditorTreeWidgetItem> l;
 	l.setAutoDelete(false);
 	appendSelectedItems(&l);
 	bool bYesToAll = false;
-	for(KviAliasEditorTreeWidgetItem *it = l.first();it;it = l.next())
+	for(AliasEditorTreeWidgetItem *it = l.first();it;it = l.next())
 	{
 		if(!removeItem(it,&bYesToAll,false))return;
 	}
 }
 
-QString KviAliasEditor::askForAliasName(const QString &szAction,const QString &szText,const QString &szInitialText)
+QString AliasEditorWidget::askForAliasName(const QString &szAction,const QString &szText,const QString &szInitialText)
 {
 	bool bOk = false;
 	QString szNewName;
@@ -1038,7 +1038,7 @@ QString KviAliasEditor::askForAliasName(const QString &szAction,const QString &s
 	return szNewName;
 }
 
-QString KviAliasEditor::askForNamespaceName(const QString &szAction,const QString &szText,const QString &szInitialText)
+QString AliasEditorWidget::askForNamespaceName(const QString &szAction,const QString &szText,const QString &szInitialText)
 {
 	bool bOk = false;
 	QString szNewName;
@@ -1106,7 +1106,7 @@ QString KviAliasEditor::askForNamespaceName(const QString &szAction,const QStrin
 	return szNewName;
 }
 
-void KviAliasEditor::openParentItems(QTreeWidgetItem * it)
+void AliasEditorWidget::openParentItems(QTreeWidgetItem * it)
 {
 	if(it->parent())
 	{
@@ -1115,27 +1115,27 @@ void KviAliasEditor::openParentItems(QTreeWidgetItem * it)
 	}
 }
 
-void KviAliasEditor::activateItem(QTreeWidgetItem * it)
+void AliasEditorWidget::activateItem(QTreeWidgetItem * it)
 {
 	if (!it) return;
 	openParentItems(it);
 	m_pTreeWidget->setCurrentItem(it);
 }
-void KviAliasEditor::newAlias()
+void AliasEditorWidget::newAlias()
 {
 	QString szNewName = askForAliasName(__tr2qs_ctx("Add Alias","editor"),__tr2qs_ctx("Please enter the name for the new alias","editor"),"myfunction");
 	if(szNewName.isEmpty())return;
-	newItem(szNewName,KviAliasEditorTreeWidgetItem::Alias);
+	newItem(szNewName,AliasEditorTreeWidgetItem::Alias);
 }
 
-void KviAliasEditor::newNamespace()
+void AliasEditorWidget::newNamespace()
 {
 	QString szName = askForNamespaceName(__tr2qs_ctx("Add Namespace","editor"),__tr2qs_ctx("Please enter the name for the new namespace","editor"),"mynamespace");
 	if(szName.isEmpty())return;
-	newItem(szName,KviAliasEditorTreeWidgetItem::Namespace);
+	newItem(szName,AliasEditorTreeWidgetItem::Namespace);
 }
 
-void  KviAliasEditor::newItem(QString &szName,KviAliasEditorTreeWidgetItem::Type eType)
+void  AliasEditorWidget::newItem(QString &szName,AliasEditorTreeWidgetItem::Type eType)
 {
 	if(m_pLastClickedItem)
 		if(!itemExists(m_pLastClickedItem)) m_pLastClickedItem=0;
@@ -1150,14 +1150,14 @@ void  KviAliasEditor::newItem(QString &szName,KviAliasEditorTreeWidgetItem::Type
 		szName.append(szTmp);
 		idx++;
 	}
-	KviAliasEditorTreeWidgetItem * it;
+	AliasEditorTreeWidgetItem * it;
 	it=createFullItem(szName);
 	it->setType(eType);
 	m_pAliases->append(it);
 	activateItem(it);
 }
 
-void KviAliasEditor::commit()
+void AliasEditorWidget::commit()
 {
 	m_bSaving = true;
 	saveLastEditedItem();
@@ -1173,7 +1173,7 @@ void KviAliasEditor::commit()
 }
 
 
-KviAliasEditorWindow::KviAliasEditorWindow(KviMainWindow * lpFrm)
+AliasEditorWindow::AliasEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"aliaseditor",0)
 {
 	g_pAliasEditorWindow = this;
@@ -1182,7 +1182,7 @@ KviAliasEditorWindow::KviAliasEditorWindow(KviMainWindow * lpFrm)
 
 	QGridLayout * g = new QGridLayout();
 
-	m_pEditor = new KviAliasEditor(this);
+	m_pEditor = new AliasEditorWidget(this);
 	g->addWidget(m_pEditor,0,0,1,4);
 	
 	QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this);
@@ -1205,43 +1205,43 @@ KviAliasEditorWindow::KviAliasEditorWindow(KviMainWindow * lpFrm)
 	setLayout(g);
 }
 
-KviAliasEditorWindow::~KviAliasEditorWindow()
+AliasEditorWindow::~AliasEditorWindow()
 {
 	g_pAliasEditorWindow = 0;
 }
 
-void KviAliasEditorWindow::okClicked()
+void AliasEditorWindow::okClicked()
 {
 	m_pEditor->commit();
 	close();
 }
 
-void KviAliasEditorWindow::applyClicked()
+void AliasEditorWindow::applyClicked()
 {
 	m_pEditor->commit();
 }
 
-void KviAliasEditorWindow::cancelClicked()
+void AliasEditorWindow::cancelClicked()
 {
 	close();
 }
 
-QPixmap * KviAliasEditorWindow::myIconPtr()
+QPixmap * AliasEditorWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS);
 }
 
-void KviAliasEditorWindow::getConfigGroupName(QString &szName)
+void AliasEditorWindow::getConfigGroupName(QString &szName)
 {
 	szName = "aliaseditor";
 }
 
-void KviAliasEditorWindow::saveProperties(KviConfigurationFile *cfg)
+void AliasEditorWindow::saveProperties(KviConfigurationFile *cfg)
 {
 	m_pEditor->saveProperties(cfg);
 }
 
-void KviAliasEditorWindow::loadProperties(KviConfigurationFile *cfg)
+void AliasEditorWindow::loadProperties(KviConfigurationFile *cfg)
 {
 	m_pEditor->loadProperties(cfg);
 }
diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/AliasEditorWindow.h
index 34fefcb47..a571562f6 100644
--- a/src/modules/aliaseditor/aliaseditor.h
+++ b/src/modules/aliaseditor/AliasEditorWindow.h
@@ -2,7 +2,7 @@
 #define _ALIASEDITOR_H_
 //=============================================================================
 //
-//   File : aliaseditor.h
+//   File : AliasEditorWindow.h
 //   Creation date : Mon Dec 23 2002 14:35:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -43,17 +43,17 @@ class KviScriptEditor;
 
 
 
-class KviAliasEditorTreeWidgetItem : public QTreeWidgetItem, public KviHeapObject
+class AliasEditorTreeWidgetItem : public QTreeWidgetItem, public KviHeapObject
 {
 public:
 	enum Type { Alias, Namespace };
 public:
-	KviAliasEditorTreeWidgetItem(QTreeWidget * pTreeWidget,Type eType,const QString &szName);
-	KviAliasEditorTreeWidgetItem(KviAliasEditorTreeWidgetItem * pParentItem,Type eType,const QString &szName);
-	~KviAliasEditorTreeWidgetItem(){};
+	AliasEditorTreeWidgetItem(QTreeWidget * pTreeWidget,Type eType,const QString &szName);
+	AliasEditorTreeWidgetItem(AliasEditorTreeWidgetItem * pParentItem,Type eType,const QString &szName);
+	~AliasEditorTreeWidgetItem(){};
 protected:
 	Type m_eType;
-	KviAliasEditorTreeWidgetItem * m_pParentItem;
+	AliasEditorTreeWidgetItem * m_pParentItem;
 	QString m_szName;
 	QString m_szBuffer;
 	int  m_cPos;
@@ -64,8 +64,8 @@ public:
 	void setType(Type t);
 	inline bool isAlias(){ return m_eType == Alias; };
 	inline bool isNamespace(){ return m_eType == Namespace; };
-	void setParentItem(KviAliasEditorTreeWidgetItem* it){ m_pParentItem=it; };
-	KviAliasEditorTreeWidgetItem * parentItem(){ return m_pParentItem; };
+	void setParentItem(AliasEditorTreeWidgetItem* it){ m_pParentItem=it; };
+	AliasEditorTreeWidgetItem * parentItem(){ return m_pParentItem; };
 	inline void setBuffer(const QString &szBuffer){ m_szBuffer = szBuffer; };
 	inline const QString & buffer(){ return m_szBuffer; };
 	inline const int & cursorPosition(){return m_cPos; };
@@ -75,27 +75,27 @@ public:
 
 
 
-class KviAliasEditorTreeWidget : public QTreeWidget
+class AliasEditorTreeWidget : public QTreeWidget
 {
 	Q_OBJECT
 public:
-	KviAliasEditorTreeWidget(QWidget*);
-	~KviAliasEditorTreeWidget();
+	AliasEditorTreeWidget(QWidget*);
+	~AliasEditorTreeWidget();
 };
 
-class KviAliasEditor : public QWidget
+class AliasEditorWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	KviAliasEditor(QWidget * par);
-	~KviAliasEditor();
+	AliasEditorWidget(QWidget * par);
+	~AliasEditorWidget();
 public:
 	KviScriptEditor              * m_pEditor;
-	KviAliasEditorTreeWidget     * m_pTreeWidget;
+	AliasEditorTreeWidget     * m_pTreeWidget;
 	QLabel                       * m_pNameLabel;
 	QPushButton                  * m_pRenameButton;
-	KviAliasEditorTreeWidgetItem * m_pLastEditedItem;
-	KviAliasEditorTreeWidgetItem * m_pLastClickedItem;
+	AliasEditorTreeWidgetItem * m_pLastEditedItem;
+	AliasEditorTreeWidgetItem * m_pLastClickedItem;
 	KviTalPopupMenu              * m_pContextPopup;
 	QSplitter                    * m_pSplitter;
 	QString                        m_szDir;
@@ -104,7 +104,7 @@ public:
 	//bool modified(){ return m_bModified; };
 	void commit();
 	void exportAliases(bool,bool=false);
-	void exportSelectionInSinglesFiles(KviPointerList<KviAliasEditorTreeWidgetItem> *l);
+	void exportSelectionInSinglesFiles(KviPointerList<AliasEditorTreeWidgetItem> *l);
 
 	void saveProperties(KviConfigurationFile *);
 	void loadProperties(KviConfigurationFile *);
@@ -115,7 +115,7 @@ protected slots:
 	void newAlias();
 	void customContextMenuRequested(const QPoint pnt);
 	void newNamespace();
-	void newItem(QString &szName,KviAliasEditorTreeWidgetItem::Type eType);
+	void newItem(QString &szName,AliasEditorTreeWidgetItem::Type eType);
 
 	void exportAll();
 	void exportSelectedSepFiles();
@@ -130,24 +130,24 @@ protected slots:
 	void aliasRefresh(const QString &szName);
 
 protected:
-	KviPointerList<KviAliasEditorTreeWidgetItem> *m_pAliases;
-	void recursiveCollapseNamespaces(KviAliasEditorTreeWidgetItem * it);
+	KviPointerList<AliasEditorTreeWidgetItem> *m_pAliases;
+	void recursiveCollapseNamespaces(AliasEditorTreeWidgetItem * it);
 	void searchReplace(const QString &szSearch,bool bReplace=false,const QString &szReplace="n");
 
-	void getExportAliasBuffer(QString &buffer,KviAliasEditorTreeWidgetItem * it);
+	void getExportAliasBuffer(QString &buffer,AliasEditorTreeWidgetItem * it);
 	void oneTimeSetup();
 	void saveLastEditedItem();
-	void getUniqueItemName(KviAliasEditorTreeWidgetItem *item,QString &buffer,KviAliasEditorTreeWidgetItem::Type eType);
-	void appendSelectedAliasItems(KviPointerList<KviAliasEditorTreeWidgetItem> * l);
-	void appendSelectedAliasItemsRecursive(KviPointerList<KviAliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom);
-	void appendSelectedItems(KviPointerList<KviAliasEditorTreeWidgetItem> * l);
-	void appendSelectedItemsRecursive(KviPointerList<KviAliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom);
+	void getUniqueItemName(AliasEditorTreeWidgetItem *item,QString &buffer,AliasEditorTreeWidgetItem::Type eType);
+	void appendSelectedAliasItems(KviPointerList<AliasEditorTreeWidgetItem> * l);
+	void appendSelectedAliasItemsRecursive(KviPointerList<AliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom);
+	void appendSelectedItems(KviPointerList<AliasEditorTreeWidgetItem> * l);
+	void appendSelectedItemsRecursive(KviPointerList<AliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom);
 
 	void openParentItems(QTreeWidgetItem * it);
 	void activateItem(QTreeWidgetItem * it);
 
-	bool removeItem(KviAliasEditorTreeWidgetItem *it,bool * pbYesToAll,bool bDeleteEmptyTree);
-	void removeItemChildren(KviAliasEditorTreeWidgetItem *it);
+	bool removeItem(AliasEditorTreeWidgetItem *it,bool * pbYesToAll,bool bDeleteEmptyTree);
+	void removeItemChildren(AliasEditorTreeWidgetItem *it);
 
 	QString askForAliasName(const QString &szAction,const QString &szText,const QString &szInitialText);
 	QString askForNamespaceName(const QString &szAction,const QString &szText,const QString &szInitialText);
@@ -155,27 +155,27 @@ protected:
 	bool itemExists(QTreeWidgetItem *pSearchFor);
 	bool namespaceExists(QString &szFullItemName);
 	bool aliasExists(QString &szFullItemName);
-	void appendAllItems(KviPointerList<KviAliasEditorTreeWidgetItem> * l,KviAliasEditorTreeWidgetItem::Type);
-	void appendAllItemsRecursive(KviPointerList<KviAliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom,KviAliasEditorTreeWidgetItem::Type);
+	void appendAllItems(KviPointerList<AliasEditorTreeWidgetItem> * l,AliasEditorTreeWidgetItem::Type);
+	void appendAllItemsRecursive(KviPointerList<AliasEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom,AliasEditorTreeWidgetItem::Type);
 	bool hasSelectedItems();
-	void buildAliasesFile(KviPointerList<KviAliasEditorTreeWidgetItem> *l, QString & szBuffer);
+	void buildAliasesFile(KviPointerList<AliasEditorTreeWidgetItem> *l, QString & szBuffer);
 
-	void buildFullItemPath(KviAliasEditorTreeWidgetItem * it,QString &szBuffer);
-	KviAliasEditorTreeWidgetItem * findTopLevelItem(const QString &szName);
-	KviAliasEditorTreeWidgetItem * createFullItem(const QString &szFullName);
-	KviAliasEditorTreeWidgetItem * findItem(const QString &szName);
-	QString buildFullItemName(KviAliasEditorTreeWidgetItem * it);
+	void buildFullItemPath(AliasEditorTreeWidgetItem * it,QString &szBuffer);
+	AliasEditorTreeWidgetItem * findTopLevelItem(const QString &szName);
+	AliasEditorTreeWidgetItem * createFullItem(const QString &szFullName);
+	AliasEditorTreeWidgetItem * findItem(const QString &szName);
+	QString buildFullItemName(AliasEditorTreeWidgetItem * it);
 };
 
 
-class KviAliasEditorWindow : public KviWindow
+class AliasEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviAliasEditorWindow(KviMainWindow * lpFrm);
-	~KviAliasEditorWindow();
+	AliasEditorWindow(KviMainWindow * lpFrm);
+	~AliasEditorWindow();
 protected:
-	KviAliasEditor * m_pEditor;
+	AliasEditorWidget * m_pEditor;
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void getConfigGroupName(QString &szName);
diff --git a/src/modules/aliaseditor/CMakeLists.txt b/src/modules/aliaseditor/CMakeLists.txt
index 2b0c789a8..10f2ee102 100644
--- a/src/modules/aliaseditor/CMakeLists.txt
+++ b/src/modules/aliaseditor/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/aliaseditor
 
 SET(kvialiaseditor_MOC_HDRS
-	aliaseditor.h
+	AliasEditorWindow.h
 )
 
 SET(kvialiaseditor_SRCS
 	libkvialiaseditor.cpp
-	aliaseditor.cpp
+	AliasEditorWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/aliaseditor/libkvialiaseditor.cpp b/src/modules/aliaseditor/libkvialiaseditor.cpp
index 00f09ca5e..ffa63d704 100644
--- a/src/modules/aliaseditor/libkvialiaseditor.cpp
+++ b/src/modules/aliaseditor/libkvialiaseditor.cpp
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "aliaseditor.h"
+#include "AliasEditorWindow.h"
 
 #include "KviModule.h"
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
 
-KviAliasEditorWindow * g_pAliasEditorWindow = 0;
+AliasEditorWindow * g_pAliasEditorWindow = 0;
 KviModule * g_pAliasEditorModule = 0;
 
 
@@ -51,7 +51,7 @@ static bool aliaseditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	if(!g_pAliasEditorWindow)
 	{
-		g_pAliasEditorWindow = new KviAliasEditorWindow(c->window()->frame());
+		g_pAliasEditorWindow = new AliasEditorWindow(c->window()->frame());
 		c->window()->frame()->addWindow(g_pAliasEditorWindow);
 	}
 
diff --git a/src/modules/channelsjoin/CMakeLists.txt b/src/modules/channelsjoin/CMakeLists.txt
index 06805bacb..1abae2f9e 100644
--- a/src/modules/channelsjoin/CMakeLists.txt
+++ b/src/modules/channelsjoin/CMakeLists.txt
@@ -2,10 +2,10 @@
 
 SET(kvichannelsjoin_SRCS
 	libkvichannelsjoin.cpp
-	channelsjoinwindow.cpp
+	ChannelsJoinDialog.cpp
 )
 SET(kvichannelsjoin_MOC_HDRS
-	channelsjoinwindow.h
+	ChannelsJoinDialog.h
 )
 # After this call, files will be moc'ed to moc_kvi_*.cpp
 QT4_WRAP_CPP(kvichannelsjoin_MOC_SRCS ${kvichannelsjoin_MOC_HDRS})
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
index 2372e885c..65e307028 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : channelsjoinwindow.cpp
+//   File : ChannelsJoinDialog.cpp
 //   Creation date : Thu Nov 6 2001 12:41:18 by Juanjo �varez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "channelsjoinwindow.h"
+#include "ChannelsJoinDialog.h"
 
 #include "KviLocale.h"
 #include "KviOptions.h"
@@ -48,13 +48,13 @@
 #include <QCheckBox>
 
 
-extern KviChannelsJoinWindow * g_pChannelsWindow;
+extern ChannelsJoinDialog * g_pChannelsWindow;
 extern QRect                   g_rectChannelsJoinGeometry;
 // KviApplication.cpp
 extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
 
 
-KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name)
+ChannelsJoinDialog::ChannelsJoinDialog(QWidget * par, const char * name)
 : QDialog(par)
 {
 	setObjectName(name);
@@ -145,7 +145,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name)
 	enableJoin();
 }
 
-KviChannelsJoinWindow::~KviChannelsJoinWindow()
+ChannelsJoinDialog::~ChannelsJoinDialog()
 {
 	KVI_OPTION_BOOL(KviOption_boolShowChannelsJoinOnIrc) = m_pShowAtStartupCheck->isChecked();
 
@@ -153,13 +153,13 @@ KviChannelsJoinWindow::~KviChannelsJoinWindow()
 	g_pChannelsWindow = 0;
 }
 
-void KviChannelsJoinWindow::setConsole(KviConsoleWindow  * pConsole)
+void ChannelsJoinDialog::setConsole(KviConsoleWindow  * pConsole)
 {
 	m_pConsole = pConsole;
 	fillListView();
 }
 
-void KviChannelsJoinWindow::fillListView()
+void ChannelsJoinDialog::fillListView()
 {
 	m_pTreeWidget->clear();
 
@@ -240,7 +240,7 @@ void KviChannelsJoinWindow::fillListView()
 	}
 }
 
-void KviChannelsJoinWindow::itemClicked(QTreeWidgetItem * it, int)
+void ChannelsJoinDialog::itemClicked(QTreeWidgetItem * it, int)
 {
 	if(!it)
 		return;
@@ -252,7 +252,7 @@ void KviChannelsJoinWindow::itemClicked(QTreeWidgetItem * it, int)
 	enableJoin();
 }
 
-void KviChannelsJoinWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
+void ChannelsJoinDialog::itemDoubleClicked(QTreeWidgetItem * it, int)
 {
 	if(!it)
 		return;
@@ -265,12 +265,12 @@ void KviChannelsJoinWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
 	joinClicked();
 }
 
-void KviChannelsJoinWindow::editTextChanged(const QString &)
+void ChannelsJoinDialog::editTextChanged(const QString &)
 {
 	enableJoin();
 }
 
-void KviChannelsJoinWindow::enableJoin()
+void ChannelsJoinDialog::enableJoin()
 {
 	QString szTmp = m_pChannelEdit->text();
 	KviConsoleWindow * c = g_pApp->topmostConnectedConsole();
@@ -291,12 +291,12 @@ void KviChannelsJoinWindow::enableJoin()
 	}
 }
 
-void KviChannelsJoinWindow::cancelClicked()
+void ChannelsJoinDialog::cancelClicked()
 {
 	delete this;
 }
 
-void KviChannelsJoinWindow::joinClicked()
+void ChannelsJoinDialog::joinClicked()
 {
 	QString szPass = m_pPass->text();
 	QString szTmp = m_pChannelEdit->text();
@@ -326,7 +326,7 @@ void KviChannelsJoinWindow::joinClicked()
 	m_pPass->setText("");
 }
 
-void KviChannelsJoinWindow::regClicked()
+void ChannelsJoinDialog::regClicked()
 {
 	QString szTmp = m_pChannelEdit->text();
 
@@ -357,7 +357,7 @@ void KviChannelsJoinWindow::regClicked()
 	}
 }
 
-void KviChannelsJoinWindow::clearClicked()
+void ChannelsJoinDialog::clearClicked()
 {
 	QString szCmd = "option stringlistRecentChannels";
 
@@ -374,20 +374,20 @@ void KviChannelsJoinWindow::clearClicked()
 }
 
 /*
-void KviChannelsJoinWindow::whoClicked()
+void ChannelsJoinDialog::whoClicked()
 {
 	KviCString tmp = m_pChannelEdit->text();
 	if(!tmp.isEmpty())doCmd("who", tmp.ptr());
 }
 
-void KviChannelsJoinWindow::namesClicked()
+void ChannelsJoinDialog::namesClicked()
 {
 	KviCString tmp = m_pChannelEdit->text();
 	//FIXME: I must be a nice guy and implement /names in the core...
 	if(!tmp.isEmpty())doCmd("raw names", tmp.ptr());
 }
 
-void KviChannelsJoinWindow::itemDoubleClicked(KviTalListBoxItem * it)
+void ChannelsJoinDialog::itemDoubleClicked(KviTalListBoxItem * it)
 {
 	if (it == 0)return;
 	KviCString tmp = it->text();
@@ -397,17 +397,17 @@ void KviChannelsJoinWindow::itemDoubleClicked(KviTalListBoxItem * it)
 }
 */
 
-void KviChannelsJoinWindow::editReturnPressed()
+void ChannelsJoinDialog::editReturnPressed()
 {
 	joinClicked();
 }
 
-void KviChannelsJoinWindow::closeEvent(QCloseEvent * e)
+void ChannelsJoinDialog::closeEvent(QCloseEvent * e)
 {
 	e->ignore();
 	delete this;
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_channelsjoinwindow.moc"
+#include "m_ChannelsJoinDialog.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/ChannelsJoinDialog.h
index ee819f4cd..b4b64145e 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.h
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.h
@@ -2,7 +2,7 @@
 #define _CHANNELSJOIN_H_
 //=============================================================================
 //
-//   File : channelsjoinwindow.h
+//   File : ChannelsJoinDialog.h
 //   Creation date : Thu Nov 06 2001 12:30:25 CEST by Juan Alvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file channelsjoinwindow.h
+* \file ChannelsJoinDialog.h
 * \author Juan Alvarez
 * \brief Channels join window
 */
@@ -43,10 +43,10 @@ class KviConsoleWindow;
 class KviTalGroupBox;
 
 /**
-* \class KviChannelsJoinWindow
+* \class ChannelsJoinDialog
 * \brief Channels join window class
 */
-class KviChannelsJoinWindow : public QDialog
+class ChannelsJoinDialog : public QDialog
 {
 	Q_OBJECT
 public:
@@ -54,14 +54,14 @@ public:
 	* \brief Constructs the channels join window
 	* \param par The parent widget
 	* \param name The name of the window
-	* \return KviChannelsJoinWindow
+	* \return ChannelsJoinDialog
 	*/
-	KviChannelsJoinWindow(QWidget * par, const char * name);
+	ChannelsJoinDialog(QWidget * par, const char * name);
 
 	/**
 	* \brief Destroys the channels join window
 	*/
-	~KviChannelsJoinWindow();
+	~ChannelsJoinDialog();
 protected:
 	QLineEdit        * m_pChannelEdit;
 	QTreeWidget * m_pTreeWidget;
diff --git a/src/modules/channelsjoin/libkvichannelsjoin.cpp b/src/modules/channelsjoin/libkvichannelsjoin.cpp
index 4f602a2e3..a96c3dc86 100644
--- a/src/modules/channelsjoin/libkvichannelsjoin.cpp
+++ b/src/modules/channelsjoin/libkvichannelsjoin.cpp
@@ -22,7 +22,7 @@
 //   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 //
 //=============================================================================
-#include "channelsjoinwindow.h"
+#include "ChannelsJoinDialog.h"
 
 #include "KviModule.h"
 #include "KviWindow.h"
@@ -32,7 +32,7 @@
 
 #include <QSplitter>
 
-KviChannelsJoinWindow * g_pChannelsWindow = 0;
+ChannelsJoinDialog * g_pChannelsWindow = 0;
 QRect                   g_rectChannelsJoinGeometry;
 
 /*
@@ -53,7 +53,7 @@ QRect                   g_rectChannelsJoinGeometry;
 
 static bool channelsjoin_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
-	if(!g_pChannelsWindow)g_pChannelsWindow = new KviChannelsJoinWindow(c->window()->frame(),"channelsjoin");
+	if(!g_pChannelsWindow)g_pChannelsWindow = new ChannelsJoinDialog(c->window()->frame(),"channelsjoin");
 
 	g_pChannelsWindow->setConsole(c->window()->console());
 
diff --git a/src/modules/classeditor/CMakeLists.txt b/src/modules/classeditor/CMakeLists.txt
index 94a459d5b..eb2d56d84 100644
--- a/src/modules/classeditor/CMakeLists.txt
+++ b/src/modules/classeditor/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/classeditor
 
 SET(kviclasseditor_MOC_HDRS
-	classeditor.h
+	ClassEditorWindow.h
 )
 
 SET(kviclasseditor_SRCS
 	libkviclasseditor.cpp
-	classeditor.cpp
+	ClassEditorWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/ClassEditorWindow.cpp
index 4d4569b0c..95ae67111 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/ClassEditorWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : classeditor.cpp
+//   File : ClassEditorWindow.cpp
 //   Creation date : Mon Feb 15 2010 14:35:55 CEST by Carbone Alessandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "classeditor.h"
+#include "ClassEditorWindow.h"
 
 #include "KviIconManager.h"
 #include "KviOptions.h"
@@ -62,10 +62,10 @@
 #include <QStringList>
 #include <QLabel>
 
-extern KviClassEditorWindow * g_pClassEditorWindow;
+extern ClassEditorWindow * g_pClassEditorWindow;
 extern KviModule * g_pClassEditorModule;
 
-KviClassEditorTreeWidget::KviClassEditorTreeWidget(QWidget * pParent)
+ClassEditorTreeWidget::ClassEditorTreeWidget(QWidget * pParent)
 : QTreeWidget(pParent)
 {
 	setColumnCount (1);
@@ -76,13 +76,13 @@ KviClassEditorTreeWidget::KviClassEditorTreeWidget(QWidget * pParent)
 	setAnimated(true);
 }
 
-KviClassEditorTreeWidget::~KviClassEditorTreeWidget()
+ClassEditorTreeWidget::~ClassEditorTreeWidget()
 {
 	//remove and delete all items
 	clear();
 }
 
-void KviClassEditorTreeWidget::mousePressEvent(QMouseEvent * e)
+void ClassEditorTreeWidget::mousePressEvent(QMouseEvent * e)
 {
 	if(e->button() == Qt::RightButton)
 	{
@@ -93,7 +93,7 @@ void KviClassEditorTreeWidget::mousePressEvent(QMouseEvent * e)
 	QTreeWidget::mousePressEvent(e);
 }
 
-KviClassEditorTreeWidgetItem::KviClassEditorTreeWidgetItem(QTreeWidget * pTreeWidget, Type eType, const QString & szName)
+ClassEditorTreeWidgetItem::ClassEditorTreeWidgetItem(QTreeWidget * pTreeWidget, Type eType, const QString & szName)
 : QTreeWidgetItem(pTreeWidget), KviHeapObject(), m_eType(eType)
 {
 	setName(szName);
@@ -103,7 +103,7 @@ KviClassEditorTreeWidgetItem::KviClassEditorTreeWidgetItem(QTreeWidget * pTreeWi
 	m_bClassModified      = false;
 	QPixmap * pIcon       = 0;
 	
-	if(eType == KviClassEditorTreeWidgetItem::Namespace)
+	if(eType == ClassEditorTreeWidgetItem::Namespace)
 		pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE);
 	else
 		pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_CLASS);
@@ -111,7 +111,7 @@ KviClassEditorTreeWidgetItem::KviClassEditorTreeWidgetItem(QTreeWidget * pTreeWi
 	setIcon(0,QIcon(*pIcon));
 }
 
-KviClassEditorTreeWidgetItem::KviClassEditorTreeWidgetItem(KviClassEditorTreeWidgetItem * pParentItem, Type eType, const QString & szName)
+ClassEditorTreeWidgetItem::ClassEditorTreeWidgetItem(ClassEditorTreeWidgetItem * pParentItem, Type eType, const QString & szName)
 : QTreeWidgetItem(pParentItem), m_eType(eType)
 {
 	setFlags(Qt::ItemIsEditable|Qt::ItemIsEnabled|Qt::ItemIsSelectable);
@@ -122,9 +122,9 @@ KviClassEditorTreeWidgetItem::KviClassEditorTreeWidgetItem(KviClassEditorTreeWid
 	m_bClassModified      = false;
 	QPixmap * pIcon       = 0;
 	
-	if(eType == KviClassEditorTreeWidgetItem::Namespace)
+	if(eType == ClassEditorTreeWidgetItem::Namespace)
 		pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE);
-	else if(eType == KviClassEditorTreeWidgetItem::Class)
+	else if(eType == ClassEditorTreeWidgetItem::Class)
 		pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_CLASS);
 	else
 		pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_FUNCTION);
@@ -132,7 +132,7 @@ KviClassEditorTreeWidgetItem::KviClassEditorTreeWidgetItem(KviClassEditorTreeWid
 	setIcon(0,QIcon(*pIcon));
 }
 
-void KviClassEditorTreeWidgetItem::setClassNotBuilt(bool bModified)
+void ClassEditorTreeWidgetItem::setClassNotBuilt(bool bModified)
 {
 	m_bClassModified = bModified;
 	QPixmap * pIcon = 0;
@@ -145,20 +145,20 @@ void KviClassEditorTreeWidgetItem::setClassNotBuilt(bool bModified)
 	setIcon(0,QIcon(*pIcon));
 }
 
-void KviClassEditorTreeWidgetItem::setName(const QString & szName)
+void ClassEditorTreeWidgetItem::setName(const QString & szName)
 {
 	m_szName = szName;
 	setText(0,m_szName);
 }
 
-void KviClassEditorTreeWidgetItem::setType(Type eType)
+void ClassEditorTreeWidgetItem::setType(Type eType)
 {
 	m_eType = eType;
 	QPixmap * pIcon = 0;
 	
-	if(eType == KviClassEditorTreeWidgetItem::Namespace)
+	if(eType == ClassEditorTreeWidgetItem::Namespace)
 		pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE);
-	else if(eType == KviClassEditorTreeWidgetItem::Class)
+	else if(eType == ClassEditorTreeWidgetItem::Class)
 		pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_CLASS);
 	else
 		pIcon = g_pIconManager->getSmallIcon(KVI_SMALLICON_FUNCTION);
@@ -166,10 +166,10 @@ void KviClassEditorTreeWidgetItem::setType(Type eType)
 	setIcon(0,QIcon(*pIcon));
 }
 
-KviClassEditor::KviClassEditor(QWidget * pParent)
+ClassEditorWidget::ClassEditorWidget(QWidget * pParent)
 : QWidget(pParent)
 {
-	m_pClasses = new KviPointerHashTable<QString,KviClassEditorTreeWidgetItem>(100,false);
+	m_pClasses = new KviPointerHashTable<QString,ClassEditorTreeWidgetItem>(100,false);
 	m_pClasses->setAutoDelete(false);
 	m_pLastEditedItem = 0;
 	m_pLastClickedItem = 0;
@@ -184,7 +184,7 @@ KviClassEditor::KviClassEditor(QWidget * pParent)
 	KviTalVBox * pVBox = new KviTalVBox(m_pSplitter);
 	pVBox->setSpacing(0);
 	pVBox->setMargin(0);
-	m_pTreeWidget = new KviClassEditorTreeWidget(pVBox);
+	m_pTreeWidget = new ClassEditorTreeWidget(pVBox);
 
 	pVBox = new KviTalVBox(m_pSplitter);
 
@@ -228,18 +228,18 @@ KviClassEditor::KviClassEditor(QWidget * pParent)
 	currentItemChanged(0,0);
 }
 
-KviClassEditor::~KviClassEditor()
+ClassEditorWidget::~ClassEditorWidget()
 {
 	m_pClasses->clear();
 	delete m_pClasses;
 }
 
-void KviClassEditor::buildFullItemPath(KviClassEditorTreeWidgetItem * pItem, QString & szBuffer)
+void ClassEditorWidget::buildFullItemPath(ClassEditorTreeWidgetItem * pItem, QString & szBuffer)
 {
 	if(!pItem)
 		return;
 	szBuffer.prepend(pItem->name() + "::");
-	pItem = (KviClassEditorTreeWidgetItem *)pItem->parent();
+	pItem = (ClassEditorTreeWidgetItem *)pItem->parent();
 	while(pItem)
 	{
 		QString szTmp = pItem->name();
@@ -248,16 +248,16 @@ void KviClassEditor::buildFullItemPath(KviClassEditorTreeWidgetItem * pItem, QSt
 			szBuffer.prepend("::");
 			szBuffer.prepend(szTmp);
 		}
-		pItem = (KviClassEditorTreeWidgetItem *)pItem->parent();
+		pItem = (ClassEditorTreeWidgetItem *)pItem->parent();
 	}
 }
 
-QString KviClassEditor::buildFullClassName(KviClassEditorTreeWidgetItem * pItem)
+QString ClassEditorWidget::buildFullClassName(ClassEditorTreeWidgetItem * pItem)
 {
 	if(!pItem)
 		return QString();
 	QString szName = pItem->name();
-	KviClassEditorTreeWidgetItem * pNItem = (KviClassEditorTreeWidgetItem *)pItem->parent();
+	ClassEditorTreeWidgetItem * pNItem = (ClassEditorTreeWidgetItem *)pItem->parent();
 	while(pNItem)
 	{
 		QString szTmp = pNItem->name();
@@ -266,28 +266,28 @@ QString KviClassEditor::buildFullClassName(KviClassEditorTreeWidgetItem * pItem)
 			szName.prepend("::");
 			szName.prepend(szTmp);
 		}
-		pNItem = (KviClassEditorTreeWidgetItem *)pNItem->parent();
+		pNItem = (ClassEditorTreeWidgetItem *)pNItem->parent();
 	}
 	return szName;
 }
 
-KviClassEditorTreeWidgetItem * KviClassEditor::findTopLevelItem(const QString & szName)
+ClassEditorTreeWidgetItem * ClassEditorWidget::findTopLevelItem(const QString & szName)
 {
 	for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++)
 	{
 		if(KviQString::equalCI(m_pTreeWidget->topLevelItem(i)->text(0),szName))
-			return (KviClassEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+			return (ClassEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 	}
 	return 0;
 }
 
-KviClassEditorTreeWidgetItem * KviClassEditor::findItem(const QString & szFullName)
+ClassEditorTreeWidgetItem * ClassEditorWidget::findItem(const QString & szFullName)
 {
 	bool bFound;
 	QStringList lNamespaces = szFullName.split("::");
 	if(lNamespaces.count() == 0)
 		return 0;
-	KviClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0));
+	ClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0));
 	if(!pItem)
 		return 0;
 	
@@ -298,7 +298,7 @@ KviClassEditorTreeWidgetItem * KviClassEditor::findItem(const QString & szFullNa
 		{
 			if (KviQString::equalCI(pItem->child(j)->text(0),lNamespaces.at(i)))
 			{
-				pItem=( KviClassEditorTreeWidgetItem *)pItem->child(j);
+				pItem=( ClassEditorTreeWidgetItem *)pItem->child(j);
 				bFound = true;
 				break;
 			}
@@ -306,10 +306,10 @@ KviClassEditorTreeWidgetItem * KviClassEditor::findItem(const QString & szFullNa
 		if(!bFound)
 			return 0;
 	}
-	return (KviClassEditorTreeWidgetItem *)pItem;
+	return (ClassEditorTreeWidgetItem *)pItem;
 }
 
-KviClassEditorTreeWidgetItem * KviClassEditor::createFullItem(const QString & szFullName)
+ClassEditorTreeWidgetItem * ClassEditorWidget::createFullItem(const QString & szFullName)
 {
 	bool bFound;
 	int i;
@@ -319,14 +319,14 @@ KviClassEditorTreeWidgetItem * KviClassEditor::createFullItem(const QString & sz
 		return 0;
 	if(lNamespaces.count() == 1)
 	{
-		KviClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0));
+		ClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0));
 		if(pItem)
 			return pItem;
-		return new KviClassEditorTreeWidgetItem(m_pTreeWidget,KviClassEditorTreeWidgetItem::Class,lNamespaces.at(0));
+		return new ClassEditorTreeWidgetItem(m_pTreeWidget,ClassEditorTreeWidgetItem::Class,lNamespaces.at(0));
 	}
-	KviClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0));
+	ClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0));
 	if(!pItem)
-		pItem = new KviClassEditorTreeWidgetItem(m_pTreeWidget,KviClassEditorTreeWidgetItem::Namespace,lNamespaces.at(0));
+		pItem = new ClassEditorTreeWidgetItem(m_pTreeWidget,ClassEditorTreeWidgetItem::Namespace,lNamespaces.at(0));
 
 	for(i=1; i < lNamespaces.count()-1; i++)
 	{
@@ -335,18 +335,18 @@ KviClassEditorTreeWidgetItem * KviClassEditor::createFullItem(const QString & sz
 		{
 			if(KviQString::equalCI(pItem->child(j)->text(0),lNamespaces.at(i)))
 			{
-				pItem = (KviClassEditorTreeWidgetItem *)pItem->child(j);
+				pItem = (ClassEditorTreeWidgetItem *)pItem->child(j);
 				bFound = true;
 				break;
 			}
 		}
 		if(!bFound)
-			pItem = new KviClassEditorTreeWidgetItem(pItem,KviClassEditorTreeWidgetItem::Namespace,lNamespaces.at(i));
+			pItem = new ClassEditorTreeWidgetItem(pItem,ClassEditorTreeWidgetItem::Namespace,lNamespaces.at(i));
 	}
-	return new KviClassEditorTreeWidgetItem(pItem,KviClassEditorTreeWidgetItem::Class,lNamespaces.at(i));
+	return new ClassEditorTreeWidgetItem(pItem,ClassEditorTreeWidgetItem::Class,lNamespaces.at(i));
 }
 
-KviClassEditorTreeWidgetItem * KviClassEditor::createFullNamespace(const QString & szFullName)
+ClassEditorTreeWidgetItem * ClassEditorWidget::createFullNamespace(const QString & szFullName)
 {
 	bool bFound;
 	int i;
@@ -354,9 +354,9 @@ KviClassEditorTreeWidgetItem * KviClassEditor::createFullNamespace(const QString
 	QStringList lNamespaces = szFullName.split("::");
 	if(lNamespaces.count() == 0)
 		return 0;
-	KviClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0));
+	ClassEditorTreeWidgetItem * pItem = findTopLevelItem(lNamespaces.at(0));
 	if(!pItem)
-		pItem = new KviClassEditorTreeWidgetItem(m_pTreeWidget,KviClassEditorTreeWidgetItem::Namespace,lNamespaces.at(0));
+		pItem = new ClassEditorTreeWidgetItem(m_pTreeWidget,ClassEditorTreeWidgetItem::Namespace,lNamespaces.at(0));
 	if(lNamespaces.count() == 1)
 		return pItem;
 
@@ -365,20 +365,20 @@ KviClassEditorTreeWidgetItem * KviClassEditor::createFullNamespace(const QString
 		bFound = false;
 		for(int j=0;j<pItem->childCount();j++)
 		{
-			if(KviQString::equalCI(pItem->child(j)->text(0),lNamespaces.at(i)) && (( KviClassEditorTreeWidgetItem *)pItem->child(j))->isNamespace())
+			if(KviQString::equalCI(pItem->child(j)->text(0),lNamespaces.at(i)) && (( ClassEditorTreeWidgetItem *)pItem->child(j))->isNamespace())
 			{
-				pItem = (KviClassEditorTreeWidgetItem *)pItem->child(j);
+				pItem = (ClassEditorTreeWidgetItem *)pItem->child(j);
 				bFound = true;
 				break;
 			}
 		}
 		if(!bFound)
-			pItem = new KviClassEditorTreeWidgetItem(pItem,KviClassEditorTreeWidgetItem::Namespace,lNamespaces.at(i));
+			pItem = new ClassEditorTreeWidgetItem(pItem,ClassEditorTreeWidgetItem::Namespace,lNamespaces.at(i));
 	}
 	return pItem;
 }
 
-void KviClassEditor::oneTimeSetup()
+void ClassEditorWidget::oneTimeSetup()
 {
 	QStringList sl;
 	QString szClassName;
@@ -393,7 +393,7 @@ void KviClassEditor::oneTimeSetup()
 	KviPointerHashTableIterator<QString,KviKvsObjectClass> it(*KviKvsKernel::instance()->objectController()->classDict());
 	
 	KviKvsObjectClass * pClass = 0;
-	KviClassEditorTreeWidgetItem * pClassItem = 0;
+	ClassEditorTreeWidgetItem * pClassItem = 0;
 	while(KviKvsObjectClass * pClass = it.current())
 	{
 		if(pClass->isBuiltin())
@@ -430,7 +430,7 @@ void KviClassEditor::oneTimeSetup()
 	connect(m_pTreeWidget,SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(customContextMenuRequested(const QPoint &)));
 }
 
-void KviClassEditor::createFullClass(KviKvsObjectClass * pClass, KviClassEditorTreeWidgetItem * pClassItem, const QString & szClassName)
+void ClassEditorWidget::createFullClass(KviKvsObjectClass * pClass, ClassEditorTreeWidgetItem * pClassItem, const QString & szClassName)
 {
 	KviPointerHashTableIterator<QString,KviKvsObjectFunctionHandler>  it(* pClass->getHandlers());
 	QStringList szFunctionsList;
@@ -440,7 +440,7 @@ void KviClassEditor::createFullClass(KviKvsObjectClass * pClass, KviClassEditorT
 		++it;
 	}
 	szFunctionsList.sort();
-	KviClassEditorTreeWidgetItem *pFunctionItem;
+	ClassEditorTreeWidgetItem *pFunctionItem;
 	m_pClasses->insert(szClassName,pClassItem);
 	KviKvsObjectClass * pParentClass = pClass->parentClass();
 	pClassItem->setInheritsClass(pParentClass->name());
@@ -451,7 +451,7 @@ void KviClassEditor::createFullClass(KviKvsObjectClass * pClass, KviClassEditorT
 		if (pClass->isScriptHandler(szFunctionsList.at(i)) && !pHandler->isClone())
 		{
 			pFunctionItem=findFunction(szFunctionsList.at(i), pClassItem);
-			if(!pFunctionItem) pFunctionItem = new KviClassEditorTreeWidgetItem(pClassItem,KviClassEditorTreeWidgetItem::Method,szFunctionsList.at(i));
+			if(!pFunctionItem) pFunctionItem = new ClassEditorTreeWidgetItem(pClassItem,ClassEditorTreeWidgetItem::Method,szFunctionsList.at(i));
 			pClass->getFunctionCode(szCode,*pHandler);
 			pFunctionItem->setBuffer(szCode);
 			pFunctionItem->setReminder(pClass->reminder(pHandler));
@@ -464,11 +464,11 @@ void KviClassEditor::createFullClass(KviKvsObjectClass * pClass, KviClassEditorT
 
 
 /*
-void KviClassEditor::classRefresh(const QString & szName)
+void ClassEditorWidget::classRefresh(const QString & szName)
 {
 	if(m_bSaving)
 		return;
-	KviClassEditorTreeWidgetItem * item;
+	ClassEditorTreeWidgetItem * item;
 	KviKvsScript * class = KviKvsClassManager::instance()->classDict()->find(szName);
 	item = createFullItem(szName);
 	if(item!=m_pLastEditedItem)
@@ -487,12 +487,12 @@ void KviClassEditor::classRefresh(const QString & szName)
 }
 */
 
-bool KviClassEditor::hasSelectedItems()
+bool ClassEditorWidget::hasSelectedItems()
 {
 	return m_pTreeWidget->selectedItems().count() ? 1 : 0;
 }
 
-bool KviClassEditor::classExists(QString & szFullItemName)
+bool ClassEditorWidget::classExists(QString & szFullItemName)
 {
 	if(m_pClasses->find(szFullItemName))
 		return true;
@@ -500,16 +500,16 @@ bool KviClassEditor::classExists(QString & szFullItemName)
 		return false;
 }
 
-void KviClassEditor::renameFunction()
+void ClassEditorWidget::renameFunction()
 {
 	if(!m_pLastEditedItem)
 		return;
-	KviClassEditorTreeWidgetItem * pFunction = m_pLastEditedItem;
-	QString szClassName = buildFullClassName((KviClassEditorTreeWidgetItem *)pFunction->parent());
+	ClassEditorTreeWidgetItem * pFunction = m_pLastEditedItem;
+	QString szClassName = buildFullClassName((ClassEditorTreeWidgetItem *)pFunction->parent());
 	QString szFunctionName = pFunction->name();
 	QString szReminder = pFunction->reminder();
 	QString szNewReminder = szReminder;
-	KviClassEditorTreeWidgetItem * pParentClass = (KviClassEditorTreeWidgetItem *) pFunction->parent();
+	ClassEditorTreeWidgetItem * pParentClass = (ClassEditorTreeWidgetItem *) pFunction->parent();
 
 	QString szNewFunctionName = szFunctionName;
 	bool bInternal = pFunction->isInternalFunction();
@@ -553,7 +553,7 @@ void KviClassEditor::renameFunction()
 	pFunction->setInternalFunction(bInternal);
 	pParentClass->setClassNotBuilt(true);
 	
-	KviPointerList<KviClassEditorTreeWidgetItem> lInheritedClasses;
+	KviPointerList<ClassEditorTreeWidgetItem> lInheritedClasses;
 	lInheritedClasses.setAutoDelete(false);
 	searchInheritedClasses(szClassName,lInheritedClasses);
 	for(unsigned int i=0; i < lInheritedClasses.count(); i++)
@@ -561,17 +561,17 @@ void KviClassEditor::renameFunction()
 	activateItem(pFunction);
 }
 
-KviClassEditorTreeWidgetItem * KviClassEditor::findFunction(const QString & szFunctionName, KviClassEditorTreeWidgetItem * pClass)
+ClassEditorTreeWidgetItem * ClassEditorWidget::findFunction(const QString & szFunctionName, ClassEditorTreeWidgetItem * pClass)
 {
 	for(int i=0; i < pClass->childCount(); i++)
 	{
-		if(KviQString::equalCI(szFunctionName,((KviClassEditorTreeWidgetItem *)pClass->child(i))->name()))
-			return (KviClassEditorTreeWidgetItem *) pClass->child(i);
+		if(KviQString::equalCI(szFunctionName,((ClassEditorTreeWidgetItem *)pClass->child(i))->name()))
+			return (ClassEditorTreeWidgetItem *) pClass->child(i);
 	}
 	return 0;
 }
 
-void KviClassEditor::renameItem()
+void ClassEditorWidget::renameItem()
 {
 	if(!m_pLastEditedItem)
 		return;
@@ -581,13 +581,13 @@ void KviClassEditor::renameItem()
 		renameNamespace(m_pLastEditedItem);
 	else {
 		// is function
-		KviClassEditorTreeWidgetItem * pParent = (KviClassEditorTreeWidgetItem *)m_pLastEditedItem->parent();
+		ClassEditorTreeWidgetItem * pParent = (ClassEditorTreeWidgetItem *)m_pLastEditedItem->parent();
 		if(pParent->isClass())
 			renameClass(pParent);
 	}
 }
 
-void KviClassEditor::renameClass(KviClassEditorTreeWidgetItem * pClassItem)
+void ClassEditorWidget::renameClass(ClassEditorTreeWidgetItem * pClassItem)
 {
 	QString szClassName = buildFullClassName(pClassItem);
 	QString szNewClassName = szClassName;
@@ -618,7 +618,7 @@ void KviClassEditor::renameClass(KviClassEditorTreeWidgetItem * pClassItem)
 		szNewName = "";
 		continue;
 	}*/
-	KviClassEditorTreeWidgetItem * pNewItem = 0;
+	ClassEditorTreeWidgetItem * pNewItem = 0;
 	m_pClasses->removeRef(pClassItem);
 	cutItem(pClassItem);
 	if(szNewClassName.contains("::"))
@@ -634,7 +634,7 @@ void KviClassEditor::renameClass(KviClassEditorTreeWidgetItem * pClassItem)
 	pClassItem->setInheritsClass(szNewInheritsClassName);
 	pClassItem->setClassNotBuilt(true);
 	
-	KviPointerList<KviClassEditorTreeWidgetItem> lInheritedClasses;
+	KviPointerList<ClassEditorTreeWidgetItem> lInheritedClasses;
 	lInheritedClasses.setAutoDelete(false);
 	searchInheritedClasses(szClassName,lInheritedClasses);
 	for(unsigned int i=0; i < lInheritedClasses.count(); i++)
@@ -659,18 +659,18 @@ void KviClassEditor::renameClass(KviClassEditorTreeWidgetItem * pClassItem)
 		KviKvsKernel::instance()->objectController()->deleteClass(pClass);
 }
 
-void KviClassEditor::cutItem(KviClassEditorTreeWidgetItem * pItem)
+void ClassEditorWidget::cutItem(ClassEditorTreeWidgetItem * pItem)
 {
 	int iIdx = m_pTreeWidget->indexOfTopLevelItem(pItem);
 	if(iIdx!=-1)
 		m_pTreeWidget->takeTopLevelItem(iIdx);
 	else {
-		KviClassEditorTreeWidgetItem * pParent = (KviClassEditorTreeWidgetItem *)pItem->parent();
+		ClassEditorTreeWidgetItem * pParent = (ClassEditorTreeWidgetItem *)pItem->parent();
 		pParent->removeChild(pItem);
 	}
 }
 
-void KviClassEditor::renameNamespace(KviClassEditorTreeWidgetItem * pOldNamespaceItem)
+void ClassEditorWidget::renameNamespace(ClassEditorTreeWidgetItem * pOldNamespaceItem)
 {
 	QString szOldNameSpaceName = buildFullClassName(m_pLastEditedItem);
 	QString szNewNameSpaceName;
@@ -678,7 +678,7 @@ void KviClassEditor::renameNamespace(KviClassEditorTreeWidgetItem * pOldNamespac
 		return;
 	if(KviQString::equalCI(szOldNameSpaceName,szNewNameSpaceName))
 		return;
-	KviClassEditorTreeWidgetItem * pNewItem = findItem(szNewNameSpaceName);
+	ClassEditorTreeWidgetItem * pNewItem = findItem(szNewNameSpaceName);
 	if(pNewItem)
 	{
 		g_pClassEditorModule->lock();
@@ -697,7 +697,7 @@ void KviClassEditor::renameNamespace(KviClassEditorTreeWidgetItem * pOldNamespac
 		g_pClassEditorModule->unlock();
 		return;
 	}
-	KviPointerList<KviClassEditorTreeWidgetItem> pList;
+	KviPointerList<ClassEditorTreeWidgetItem> pList;
 	pList.setAutoDelete(false);
 	appendAllClassItemsRecursive(&pList,pOldNamespaceItem);
 	cutItem(pOldNamespaceItem);
@@ -712,10 +712,10 @@ void KviClassEditor::renameNamespace(KviClassEditorTreeWidgetItem * pOldNamespac
 	}
 	for(unsigned int u=0; u < pList.count(); u++)
 	{
-		KviPointerHashTableEntry<QString,KviClassEditorTreeWidgetItem> * pEntry = m_pClasses->findRef(pList.at(u));
+		KviPointerHashTableEntry<QString,ClassEditorTreeWidgetItem> * pEntry = m_pClasses->findRef(pList.at(u));
 		if(pEntry)
 		{
-			KviPointerList<KviClassEditorTreeWidgetItem> lInheritedClasses;
+			KviPointerList<ClassEditorTreeWidgetItem> lInheritedClasses;
 			lInheritedClasses.setAutoDelete(false);
 
 			QString szOldName = pEntry->key();
@@ -748,23 +748,23 @@ void KviClassEditor::renameNamespace(KviClassEditorTreeWidgetItem * pOldNamespac
 	//searchReplace(szOldNameSpaceName+"::",true,szNewNameSpaceName+"::");
 }
 
-void KviClassEditor::saveLastEditedItem()
+void ClassEditorWidget::saveLastEditedItem()
 {
 	if(!m_pLastEditedItem)
 		return;
 	if(!m_pEditor->isModified() || m_pLastEditedItem->isNamespace() || m_pLastEditedItem->isClass())
 		return;
-	((KviClassEditorTreeWidgetItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor());
+	((ClassEditorTreeWidgetItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor());
 	QString newCode;
 	m_pEditor->getText(newCode);
-	((KviClassEditorTreeWidgetItem *)m_pLastEditedItem)->setBuffer(newCode);
-	((KviClassEditorTreeWidgetItem *)m_pLastEditedItem->parent())->setClassNotBuilt(true);
+	((ClassEditorTreeWidgetItem *)m_pLastEditedItem)->setBuffer(newCode);
+	((ClassEditorTreeWidgetItem *)m_pLastEditedItem->parent())->setClassNotBuilt(true);
 }
 
-void KviClassEditor::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetItem *)
+void ClassEditorWidget::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetItem *)
 {
 	saveLastEditedItem();
-	m_pLastEditedItem = (KviClassEditorTreeWidgetItem *)pTree;
+	m_pLastEditedItem = (ClassEditorTreeWidgetItem *)pTree;
 	if(!m_pLastEditedItem)
 	{
 		m_pClassNameLabel->setText(__tr2qs_ctx("No item selected","editor"));
@@ -774,9 +774,9 @@ void KviClassEditor::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetItem
 		return;
 	}
 	
-	KviClassEditorTreeWidgetItem * pClassItem = 0;
+	ClassEditorTreeWidgetItem * pClassItem = 0;
 	if(m_pLastEditedItem->isMethod())
-		pClassItem = (KviClassEditorTreeWidgetItem *)m_pLastEditedItem->parent();
+		pClassItem = (ClassEditorTreeWidgetItem *)m_pLastEditedItem->parent();
 	else
 		pClassItem = m_pLastEditedItem;
 	
@@ -844,13 +844,13 @@ void KviClassEditor::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetItem
 		m_pTreeWidget->setFocus();
 		QString szBuffer;
 		QStringList szFunctionsList;
-		KviPointerHashTable<QString,KviClassEditorTreeWidgetItem> lFunctions;
+		KviPointerHashTable<QString,ClassEditorTreeWidgetItem> lFunctions;
 		lFunctions.setAutoDelete(false);
 		
-		KviClassEditorTreeWidgetItem * pItem = 0;
+		ClassEditorTreeWidgetItem * pItem = 0;
 		for(int i=0; i < pTree->childCount(); i++)
 		{
-			pItem = ((KviClassEditorTreeWidgetItem *)pTree->child(i));
+			pItem = ((ClassEditorTreeWidgetItem *)pTree->child(i));
 			szFunctionsList.append(pItem->name());
 			lFunctions.insert(pItem->name(),pItem);
 		}
@@ -867,17 +867,17 @@ void KviClassEditor::currentItemChanged(QTreeWidgetItem * pTree, QTreeWidgetItem
 		return;
 	}
 	m_pEditor->setReadOnly(false);
-	m_pEditor->setText(((KviClassEditorTreeWidgetItem *)pTree)->buffer());
+	m_pEditor->setText(((ClassEditorTreeWidgetItem *)pTree)->buffer());
 	m_pEditor->setFocus();
-	m_pEditor->setCursorPosition(((KviClassEditorTreeWidgetItem *)pTree)->cursorPosition());
+	m_pEditor->setCursorPosition(((ClassEditorTreeWidgetItem *)pTree)->cursorPosition());
 	m_pEditor->setEnabled(true);
 }
 
-void KviClassEditor::customContextMenuRequested(QPoint pnt)
+void ClassEditorWidget::customContextMenuRequested(QPoint pnt)
 {
 	m_pContextPopup->clear();
 
-	m_pLastClickedItem = (KviClassEditorTreeWidgetItem *)m_pTreeWidget->itemAt(pnt);
+	m_pLastClickedItem = (ClassEditorTreeWidgetItem *)m_pTreeWidget->itemAt(pnt);
 
 	int iId;
 	iId = m_pContextPopup->insertItem(
@@ -956,21 +956,21 @@ void KviClassEditor::customContextMenuRequested(QPoint pnt)
 	m_pContextPopup->popup(m_pTreeWidget->mapToGlobal(pnt));
 }
 
-void KviClassEditor::searchReplace(const QString & szSearch, bool bReplace, const QString & szReplace)
+void ClassEditorWidget::searchReplace(const QString & szSearch, bool bReplace, const QString & szReplace)
 {
-	KviPointerHashTableIterator<QString,KviClassEditorTreeWidgetItem> it (*m_pClasses);
+	KviPointerHashTableIterator<QString,ClassEditorTreeWidgetItem> it (*m_pClasses);
 	while(it.current())
 	{
-		KviClassEditorTreeWidgetItem * pItem = it.current();
+		ClassEditorTreeWidgetItem * pItem = it.current();
 		for(int j=0; j < pItem->childCount(); j++)
 		{
 			bool bOpened = false;
-			if(((KviClassEditorTreeWidgetItem *)pItem->child(j))->buffer().indexOf(szSearch,0,Qt::CaseInsensitive) != -1)
+			if(((ClassEditorTreeWidgetItem *)pItem->child(j))->buffer().indexOf(szSearch,0,Qt::CaseInsensitive) != -1)
 			{
 				pItem->child(j)->setBackground(0, QColor(255,0,0,128));
 				if(bReplace)
 				{
-					QString &buffer=(QString &)((KviClassEditorTreeWidgetItem *)pItem->child(j))->buffer();
+					QString &buffer=(QString &)((ClassEditorTreeWidgetItem *)pItem->child(j))->buffer();
 					pItem->setClassNotBuilt(true);
 					buffer.replace(szSearch,szReplace,Qt::CaseInsensitive);
 				}
@@ -987,7 +987,7 @@ void KviClassEditor::searchReplace(const QString & szSearch, bool bReplace, cons
 	}
 }
 
-void KviClassEditor::slotFind()
+void ClassEditorWidget::slotFind()
 {
 	g_pClassEditorModule->lock();
 	bool bOk;
@@ -1008,12 +1008,12 @@ void KviClassEditor::slotFind()
 	searchReplace(szSearch);
 }
 
-void KviClassEditor::slotFindWord(const QString & szSearch)
+void ClassEditorWidget::slotFindWord(const QString & szSearch)
 {
 	m_pEditor->setFindText(szSearch);
 }
 
-void KviClassEditor::recursiveCollapseItems(KviClassEditorTreeWidgetItem * pItem)
+void ClassEditorWidget::recursiveCollapseItems(ClassEditorTreeWidgetItem * pItem)
 {
 	if(!pItem)
 		return;
@@ -1022,36 +1022,36 @@ void KviClassEditor::recursiveCollapseItems(KviClassEditorTreeWidgetItem * pItem
 		if(pItem->child(i)->childCount())
 		{
 			pItem->child(i)->setExpanded(false);
-			recursiveCollapseItems((KviClassEditorTreeWidgetItem *)pItem->child(i));
+			recursiveCollapseItems((ClassEditorTreeWidgetItem *)pItem->child(i));
 		}
 	}
 }
 
-void KviClassEditor::slotCollapseItems()
+void ClassEditorWidget::slotCollapseItems()
 {
 	for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++)
 	{
 		if(m_pTreeWidget->topLevelItem(i)->childCount())
 		{
 			m_pTreeWidget->topLevelItem(i)->setExpanded(false);
-			recursiveCollapseItems((KviClassEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i));
+			recursiveCollapseItems((ClassEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i));
 		}
 	}
 }
 
-void KviClassEditor::slotReplaceAll(const QString & szFind, const QString & szReplace)
+void ClassEditorWidget::slotReplaceAll(const QString & szFind, const QString & szReplace)
 {
 	m_pEditor->setFindText(szReplace);
 	searchReplace(szFind,true,szReplace);
 	/*
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		recursiveSearchReplace(szFind,(KviClassEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i),true,szReplace);
+		recursiveSearchReplace(szFind,(ClassEditorTreeWidgetItem *)m_pTreeWidget->topLevelItem(i),true,szReplace);
 	}
 	*/
 }
 
-void KviClassEditor::exportClassBuffer(QString & szBuffer, KviClassEditorTreeWidgetItem * pItem)
+void ClassEditorWidget::exportClassBuffer(QString & szBuffer, ClassEditorTreeWidgetItem * pItem)
 {
 	QString szTmp = pItem->buffer();
 	KviCommandFormatter::blockFromBuffer(szTmp);
@@ -1067,7 +1067,7 @@ void KviClassEditor::exportClassBuffer(QString & szBuffer, KviClassEditorTreeWid
 	szBuffer += "\")\n{\n";
 	for(int i=0; i < pItem->childCount(); i++)
 	{
-		KviClassEditorTreeWidgetItem * pFunction = (KviClassEditorTreeWidgetItem *)pItem->child(i);
+		ClassEditorTreeWidgetItem * pFunction = (ClassEditorTreeWidgetItem *)pItem->child(i);
 		if(pFunction->isMethod())
 		{
 			szBuffer += "\t";
@@ -1084,22 +1084,22 @@ void KviClassEditor::exportClassBuffer(QString & szBuffer, KviClassEditorTreeWid
 	szBuffer += "}\n";
 }
 
-void KviClassEditor::exportAll()
+void ClassEditorWidget::exportAll()
 {
 	exportClasses(false);
 }
 
-void KviClassEditor::exportSelectedSepFiles()
+void ClassEditorWidget::exportSelectedSepFiles()
 {
 	exportClasses(true,true);
 }
 
-void KviClassEditor::exportSelected()
+void ClassEditorWidget::exportSelected()
 {
 	exportClasses(true);
 }
 
-void KviClassEditor::exportSelectionInSinglesFiles(KviPointerList<KviClassEditorTreeWidgetItem> * pList)
+void ClassEditorWidget::exportSelectionInSinglesFiles(KviPointerList<ClassEditorTreeWidgetItem> * pList)
 {
 	bool bReplaceAll = false;
 	
@@ -1123,7 +1123,7 @@ void KviClassEditor::exportSelectionInSinglesFiles(KviPointerList<KviClassEditor
 	if(!m_szDir.endsWith(QString(KVI_PATH_SEPARATOR)))
 		m_szDir += KVI_PATH_SEPARATOR;
 
-	for(KviClassEditorTreeWidgetItem * pItem = pList->first(); pItem; pItem = pList->next())
+	for(ClassEditorTreeWidgetItem * pItem = pList->first(); pItem; pItem = pList->next())
 	{
 		QString szTmp;
 		exportClassBuffer(szTmp,pItem);
@@ -1148,7 +1148,7 @@ void KviClassEditor::exportSelectionInSinglesFiles(KviPointerList<KviClassEditor
 	g_pClassEditorModule->unlock();
 }
 
-void KviClassEditor::exportClasses(bool bSelectedOnly, bool bSingleFiles)
+void ClassEditorWidget::exportClasses(bool bSelectedOnly, bool bSingleFiles)
 {
 	QString szOut;
 	QString szNameFile;
@@ -1157,7 +1157,7 @@ void KviClassEditor::exportClasses(bool bSelectedOnly, bool bSingleFiles)
 	
 	saveLastEditedItem();
 
-	KviPointerList<KviClassEditorTreeWidgetItem> list;
+	KviPointerList<ClassEditorTreeWidgetItem> list;
 	list.setAutoDelete(false);
 
 	if(bSelectedOnly)
@@ -1171,8 +1171,8 @@ void KviClassEditor::exportClasses(bool bSelectedOnly, bool bSingleFiles)
 		return;
         }
 	
-	KviClassEditorTreeWidgetItem * pTempItem = 0;
-	for(KviClassEditorTreeWidgetItem * pItem = list.first(); pItem; pItem = list.next())
+	ClassEditorTreeWidgetItem * pTempItem = 0;
+	for(ClassEditorTreeWidgetItem * pItem = list.first(); pItem; pItem = list.next())
 	{
 		pTempItem = pItem;
 		iCount++;
@@ -1222,7 +1222,7 @@ void KviClassEditor::exportClasses(bool bSelectedOnly, bool bSingleFiles)
 	}
 }
 
-void KviClassEditor::saveProperties(KviConfigurationFile * pCfg)
+void ClassEditorWidget::saveProperties(KviConfigurationFile * pCfg)
 {
 	pCfg->writeEntry("Sizes",m_pSplitter->sizes());
 	QString szName;
@@ -1231,7 +1231,7 @@ void KviClassEditor::saveProperties(KviConfigurationFile * pCfg)
 	pCfg->writeEntry("LastClass",szName);
 }
 
-void KviClassEditor::loadProperties(KviConfigurationFile * pCfg)
+void ClassEditorWidget::loadProperties(KviConfigurationFile * pCfg)
 {
 	QList<int> def;
 	def.append(20);
@@ -1239,35 +1239,35 @@ void KviClassEditor::loadProperties(KviConfigurationFile * pCfg)
 	m_pSplitter->setSizes(pCfg->readIntListEntry("Sizes",def));
 	QString szTmp = pCfg->readEntry("LastClass",QString());
 
-	KviClassEditorTreeWidgetItem * pItem = findItem(szTmp);
+	ClassEditorTreeWidgetItem * pItem = findItem(szTmp);
 	activateItem(pItem);
 }
 
-void KviClassEditor::appendSelectedClassItems(KviPointerList<KviClassEditorTreeWidgetItem> * pList)
+void ClassEditorWidget::appendSelectedClassItems(KviPointerList<ClassEditorTreeWidgetItem> * pList)
 {
 	QList<QTreeWidgetItem *> list = m_pTreeWidget->selectedItems();
 	for(int i=0; i < list.count(); i++)
 	{
-		if(((KviClassEditorTreeWidgetItem *)list.at(i))->isClass())
-			pList->append((KviClassEditorTreeWidgetItem *)list.at(i));
+		if(((ClassEditorTreeWidgetItem *)list.at(i))->isClass())
+			pList->append((ClassEditorTreeWidgetItem *)list.at(i));
 		else appendSelectedClassItemsRecursive(pList,list.at(i));
 	}
 }
 
-void KviClassEditor::appendSelectedClassItemsRecursive(KviPointerList<KviClassEditorTreeWidgetItem> * pList, QTreeWidgetItem * pStartFrom)
+void ClassEditorWidget::appendSelectedClassItemsRecursive(KviPointerList<ClassEditorTreeWidgetItem> * pList, QTreeWidgetItem * pStartFrom)
 {
 	for(int i=0; i < pStartFrom->childCount(); i++)
 	{
-		if(((KviClassEditorTreeWidgetItem *)pStartFrom->child(i))->isClass())
-			pList->append(((KviClassEditorTreeWidgetItem *)pStartFrom->child(i)));
+		if(((ClassEditorTreeWidgetItem *)pStartFrom->child(i))->isClass())
+			pList->append(((ClassEditorTreeWidgetItem *)pStartFrom->child(i)));
 		else
 			appendSelectedClassItemsRecursive(pList,pStartFrom->child(i));
 	}
 }
 
-void KviClassEditor::appendAllClassItems(KviPointerList<KviClassEditorTreeWidgetItem> * pList)
+void ClassEditorWidget::appendAllClassItems(KviPointerList<ClassEditorTreeWidgetItem> * pList)
 {
-	KviPointerHashTableIterator<QString,KviClassEditorTreeWidgetItem> it (*m_pClasses);
+	KviPointerHashTableIterator<QString,ClassEditorTreeWidgetItem> it (*m_pClasses);
 	while(it.current())
 	{
 		pList->append(it.current());
@@ -1275,24 +1275,24 @@ void KviClassEditor::appendAllClassItems(KviPointerList<KviClassEditorTreeWidget
 	}
 }
 
-void KviClassEditor::appendAllClassItemsRecursive(KviPointerList<KviClassEditorTreeWidgetItem> * pList, QTreeWidgetItem * pStartFrom)
+void ClassEditorWidget::appendAllClassItemsRecursive(KviPointerList<ClassEditorTreeWidgetItem> * pList, QTreeWidgetItem * pStartFrom)
 {
 	for(int i=0; i < pStartFrom->childCount(); i++)
 	{
-		if(((KviClassEditorTreeWidgetItem *)pStartFrom->child(i))->isClass())
+		if(((ClassEditorTreeWidgetItem *)pStartFrom->child(i))->isClass())
 		{
-			pList->append((KviClassEditorTreeWidgetItem *)pStartFrom->child(i));
+			pList->append((ClassEditorTreeWidgetItem *)pStartFrom->child(i));
 		} else {
 			appendAllClassItemsRecursive(pList,pStartFrom->child(i));
 		}
 	}
 }
 
-void KviClassEditor::removeItemChildren(KviClassEditorTreeWidgetItem * pItem, KviPointerList <KviClassEditorTreeWidgetItem> & lRemovedItems)
+void ClassEditorWidget::removeItemChildren(ClassEditorTreeWidgetItem * pItem, KviPointerList <ClassEditorTreeWidgetItem> & lRemovedItems)
 {
 	if(pItem->isClass())
 	{
-		KviPointerList<KviClassEditorTreeWidgetItem> lInheritedClasses;
+		KviPointerList<ClassEditorTreeWidgetItem> lInheritedClasses;
 		lInheritedClasses.setAutoDelete(false);
 		searchInheritedClasses(buildFullClassName(pItem),lInheritedClasses);
 		for(unsigned int u=0; u < lInheritedClasses.count(); u++)
@@ -1305,7 +1305,7 @@ void KviClassEditor::removeItemChildren(KviClassEditorTreeWidgetItem * pItem, Kv
 	
 	while(pItem->childCount() > 0)
 	{
-		KviClassEditorTreeWidgetItem * pChild = (KviClassEditorTreeWidgetItem *)(pItem->child(0));
+		ClassEditorTreeWidgetItem * pChild = (ClassEditorTreeWidgetItem *)(pItem->child(0));
 		if(pChild->childCount())
 			removeItemChildren(pChild,lRemovedItems);
 		if(pChild->isClass())
@@ -1322,7 +1322,7 @@ void KviClassEditor::removeItemChildren(KviClassEditorTreeWidgetItem * pItem, Kv
 	}
 }
 
-bool KviClassEditor::removeItem(KviClassEditorTreeWidgetItem * pItem, KviPointerList <KviClassEditorTreeWidgetItem> & lRemovedItems, bool * pbYesToAll)
+bool ClassEditorWidget::removeItem(ClassEditorTreeWidgetItem * pItem, KviPointerList <ClassEditorTreeWidgetItem> & lRemovedItems, bool * pbYesToAll)
 {
 	if(!pItem)
 		return true;
@@ -1392,17 +1392,17 @@ bool KviClassEditor::removeItem(KviClassEditorTreeWidgetItem * pItem, KviPointer
 	}
 	if(pItem->isMethod())
 	{
-		updateClassHierarchy((KviClassEditorTreeWidgetItem *)pItem->parent());
+		updateClassHierarchy((ClassEditorTreeWidgetItem *)pItem->parent());
 	}
 	lRemovedItems.append(pItem);
 	delete pItem;
 	return true;
 }
 
-void KviClassEditor::updateClassHierarchy(KviClassEditorTreeWidgetItem * pClass)
+void ClassEditorWidget::updateClassHierarchy(ClassEditorTreeWidgetItem * pClass)
 {
 	pClass->setClassNotBuilt(true);
-	KviPointerList<KviClassEditorTreeWidgetItem> lInheritedClasses;
+	KviPointerList<ClassEditorTreeWidgetItem> lInheritedClasses;
 	lInheritedClasses.setAutoDelete(false);
 	searchInheritedClasses(pClass->name(),lInheritedClasses);
 	for(unsigned int u=0; u < lInheritedClasses.count(); u++)
@@ -1413,22 +1413,22 @@ void KviClassEditor::updateClassHierarchy(KviClassEditorTreeWidgetItem * pClass)
 	}
 }
 
-void KviClassEditor::removeSelectedItems()
+void ClassEditorWidget::removeSelectedItems()
 {
-	KviPointerList<KviClassEditorTreeWidgetItem> lRemovedItems;
+	KviPointerList<ClassEditorTreeWidgetItem> lRemovedItems;
 	lRemovedItems.setAutoDelete(false);
 	QList<QTreeWidgetItem *> list = m_pTreeWidget->selectedItems();
 	bool bYesToAll = false;
 	for(int i=0; i < list.count(); i++)
 	{
-		if(lRemovedItems.findRef((KviClassEditorTreeWidgetItem *) list.at(i)) != -1)
+		if(lRemovedItems.findRef((ClassEditorTreeWidgetItem *) list.at(i)) != -1)
 			continue;
-		if(!removeItem((KviClassEditorTreeWidgetItem *) list.at(i),lRemovedItems,&bYesToAll))
+		if(!removeItem((ClassEditorTreeWidgetItem *) list.at(i),lRemovedItems,&bYesToAll))
 			return;
 	}
 }
 
-bool KviClassEditor::askForClassName(QString & szClassName, QString & szInheritsClassName, bool bEdit)
+bool ClassEditorWidget::askForClassName(QString & szClassName, QString & szInheritsClassName, bool bEdit)
 {
 	KviClassEditorDialog * pDialog = new KviClassEditorDialog(this,"classdialog",m_pClasses,szClassName,szInheritsClassName,bEdit);
 	szClassName = "";
@@ -1446,7 +1446,7 @@ bool KviClassEditor::askForClassName(QString & szClassName, QString & szInherits
 	return false;
 }
 
-bool KviClassEditor::askForFunction(QString & szFunctionName, QString & szReminder, bool * bInternal, const QString & szClassName, bool bRenameMode)
+bool ClassEditorWidget::askForFunction(QString & szFunctionName, QString & szReminder, bool * bInternal, const QString & szClassName, bool bRenameMode)
 {
 	KviClassEditorFunctionDialog * pDialog = new KviClassEditorFunctionDialog(this,"function",szClassName,szFunctionName,szReminder,*bInternal, bRenameMode);
 	szFunctionName = "";
@@ -1465,7 +1465,7 @@ bool KviClassEditor::askForFunction(QString & szFunctionName, QString & szRemind
 	return false;
 }
 
-bool KviClassEditor::askForNamespaceName(const QString & szAction, const QString & szText, const QString & szInitialText, QString & szNewName)
+bool ClassEditorWidget::askForNamespaceName(const QString & szAction, const QString & szText, const QString & szInitialText, QString & szNewName)
 {
 	bool bOk = false;
 	while(szNewName.isEmpty())
@@ -1533,7 +1533,7 @@ bool KviClassEditor::askForNamespaceName(const QString & szAction, const QString
 	return true;
 }
 
-void KviClassEditor::openParentItems(QTreeWidgetItem * pItem)
+void ClassEditorWidget::openParentItems(QTreeWidgetItem * pItem)
 {
 	if(pItem->parent())
 	{
@@ -1542,7 +1542,7 @@ void KviClassEditor::openParentItems(QTreeWidgetItem * pItem)
 	}
 }
 
-void KviClassEditor::activateItem(QTreeWidgetItem * pItem)
+void ClassEditorWidget::activateItem(QTreeWidgetItem * pItem)
 {
 	if(!pItem)
 		return;
@@ -1550,14 +1550,14 @@ void KviClassEditor::activateItem(QTreeWidgetItem * pItem)
 	m_pTreeWidget->setCurrentItem(pItem);
 }
 
-void KviClassEditor::newClass()
+void ClassEditorWidget::newClass()
 {
 	QString szClassName;
 	QString szinheritsClassName;
 	askForClassName(szClassName,szinheritsClassName,false);
 	if(szClassName.isEmpty())
 		return;
-	KviClassEditorTreeWidgetItem * pItem = newItem(szClassName,KviClassEditorTreeWidgetItem::Class);
+	ClassEditorTreeWidgetItem * pItem = newItem(szClassName,ClassEditorTreeWidgetItem::Class);
 	
 	KviQString::escapeKvs(&szClassName, KviQString::EscapeSpace);
 	KviQString::escapeKvs(&szinheritsClassName, KviQString::EscapeSpace);
@@ -1571,25 +1571,25 @@ void KviClassEditor::newClass()
 	KviKvsScript::run(szClass,g_pActiveWindow);
 }
 
-void KviClassEditor::newNamespace()
+void ClassEditorWidget::newNamespace()
 {
 	QString szName;
 	if(!askForNamespaceName(__tr2qs_ctx("Add Namespace","editor"),__tr2qs_ctx("Please enter the name for the new namespace","editor"),"mynamespace",szName))
 		return;
 	if(szName.isEmpty())
 		return;
-	KviClassEditorTreeWidgetItem * pItem = newItem(szName,KviClassEditorTreeWidgetItem::Namespace);
+	ClassEditorTreeWidgetItem * pItem = newItem(szName,ClassEditorTreeWidgetItem::Namespace);
 	activateItem(pItem);
 }
 
-void KviClassEditor::newMemberFunction()
+void ClassEditorWidget::newMemberFunction()
 {
 	QString szFunctionName;
 	QString szClassName;
 	QString szReminder;
 	
 	if(m_pLastClickedItem->isMethod())
-		m_pLastClickedItem = (KviClassEditorTreeWidgetItem*)m_pLastClickedItem->parent();
+		m_pLastClickedItem = (ClassEditorTreeWidgetItem*)m_pLastClickedItem->parent();
 	szClassName = buildFullClassName(m_pLastClickedItem);
 	bool bInternal = false;
 	if(!askForFunction(szFunctionName, szReminder,&bInternal,szClassName,false))
@@ -1597,15 +1597,15 @@ void KviClassEditor::newMemberFunction()
 	if(szFunctionName.isEmpty())
 		return;
 	
-	KviClassEditorTreeWidgetItem * pItem = newItem(szFunctionName,KviClassEditorTreeWidgetItem::Method);
+	ClassEditorTreeWidgetItem * pItem = newItem(szFunctionName,ClassEditorTreeWidgetItem::Method);
 	pItem->setInternalFunction(bInternal);
 	if(!szReminder.isEmpty())
 		pItem->setReminder(szReminder);
 	activateItem(pItem);
-	((KviClassEditorTreeWidgetItem*)pItem->parent())->setClassNotBuilt(true);
+	((ClassEditorTreeWidgetItem*)pItem->parent())->setClassNotBuilt(true);
 }
 
-KviClassEditorTreeWidgetItem * KviClassEditor::newItem(QString & szName, KviClassEditorTreeWidgetItem::Type eType)
+ClassEditorTreeWidgetItem * ClassEditorWidget::newItem(QString & szName, ClassEditorTreeWidgetItem::Type eType)
 {
 	if(m_pLastClickedItem)
 		buildFullItemPath(m_pLastClickedItem,szName);
@@ -1622,24 +1622,24 @@ KviClassEditorTreeWidgetItem * KviClassEditor::newItem(QString & szName, KviClas
 		szName.append(szTmp);
 		iIdx++;
 	}
-	KviClassEditorTreeWidgetItem * pItem;
+	ClassEditorTreeWidgetItem * pItem;
 	pItem = createFullItem(szName);
 	pItem->setType(eType);
 	return pItem;
 }
 
-void KviClassEditor::build()
+void ClassEditorWidget::build()
 {
 	saveLastEditedItem();
-	KviPointerHashTableIterator<QString,KviClassEditorTreeWidgetItem> it (*m_pClasses);
-	KviPointerList<KviClassEditorTreeWidgetItem> linkedClasses;
+	KviPointerHashTableIterator<QString,ClassEditorTreeWidgetItem> it (*m_pClasses);
+	KviPointerList<ClassEditorTreeWidgetItem> linkedClasses;
 	linkedClasses.setAutoDelete(false);
-	KviPointerList<KviClassEditorTreeWidgetItem> skipClasses;
+	KviPointerList<ClassEditorTreeWidgetItem> skipClasses;
 	skipClasses.setAutoDelete(false);
 	bool bErrorWhilecompiling = false;
 	while(it.current())
 	{
-		KviClassEditorTreeWidgetItem * pClass = it.current();
+		ClassEditorTreeWidgetItem * pClass = it.current();
 		if(skipClasses.findRef(it.current()) != -1)
 		{
 			++it;
@@ -1648,7 +1648,7 @@ void KviClassEditor::build()
 		if(pClass->classNotBuilt())
 		{
 			//qDebug("compiling %s",pClass->name().toUtf8().data());
-			KviClassEditorTreeWidgetItem * pParentClass = m_pClasses->find(pClass->inheritsClass());
+			ClassEditorTreeWidgetItem * pParentClass = m_pClasses->find(pClass->inheritsClass());
 
 			linkedClasses.append(pClass);
 			//if (!pParentClass) qDebug("no parent class");
@@ -1673,7 +1673,7 @@ void KviClassEditor::build()
 					bErrorWhilecompiling = true;
 					QString szError = __tr2qs_ctx("Unable to compile class: ","editor");
 					szError += szFullClassName + "\n";
-					KviPointerList<KviClassEditorTreeWidgetItem> lInheritedClasses;
+					KviPointerList<ClassEditorTreeWidgetItem> lInheritedClasses;
 					lInheritedClasses.setAutoDelete(false);
 					searchInheritedClasses(szFullClassName,lInheritedClasses);
 					if(lInheritedClasses.count())
@@ -1711,7 +1711,7 @@ void KviClassEditor::build()
 	KviKvsKernel::instance()->objectController()->flushUserClasses();
 }
 
-void KviClassEditor::loadNotBuiltClasses()
+void ClassEditorWidget::loadNotBuiltClasses()
 {
 	QString szFileName = "libkviclasseditortmp.kvc";
 	QString szBuffer;
@@ -1731,7 +1731,7 @@ void KviClassEditor::loadNotBuiltClasses()
 	for(QString * pszTmp = l.first(); pszTmp; pszTmp = l.next())
 	{
 		cfg.setGroup(*pszTmp);
-		KviClassEditorTreeWidgetItem * pClassItem = createFullItem(*pszTmp);
+		ClassEditorTreeWidgetItem * pClassItem = createFullItem(*pszTmp);
 		m_pClasses->insert(*pszTmp,pClassItem);
 		pClassItem->setClassNotBuilt(true);
 		KviConfigurationFileGroup * pDict = cfg.dict()->find(*pszTmp);
@@ -1756,9 +1756,9 @@ void KviClassEditor::loadNotBuiltClasses()
                                 if((*pszTmp).left(9) == "@Reminder")
 					continue;
                                 QString szCode = cfg.readEntry(*pszTmp,"");
-				KviClassEditorTreeWidgetItem * pFunctionItem = findFunction(*pszTmp, pClassItem);
+				ClassEditorTreeWidgetItem * pFunctionItem = findFunction(*pszTmp, pClassItem);
 				if(!pFunctionItem)
-					pFunctionItem = new KviClassEditorTreeWidgetItem(pClassItem,KviClassEditorTreeWidgetItem::Method,*pszTmp);
+					pFunctionItem = new ClassEditorTreeWidgetItem(pClassItem,ClassEditorTreeWidgetItem::Method,*pszTmp);
 				pFunctionItem->setBuffer(szCode);
                                 QString szEntry = "@Reminder|" + (*pszTmp);
                                 QString szReminder = cfg.readEntry(szEntry,"");
@@ -1768,10 +1768,10 @@ void KviClassEditor::loadNotBuiltClasses()
 	}
 }
 
-void KviClassEditor::saveNotBuiltClasses()
+void ClassEditorWidget::saveNotBuiltClasses()
 {
 	saveLastEditedItem();
-	KviPointerHashTableIterator<QString,KviClassEditorTreeWidgetItem> it (*m_pClasses);
+	KviPointerHashTableIterator<QString,ClassEditorTreeWidgetItem> it (*m_pClasses);
 	QString szFileName = "libkviclasseditortmp.kvc";
 	QString szBuffer;
 	g_pApp->getLocalKvircDirectory(szBuffer,KviApplication::ConfigPlugins,szFileName);
@@ -1791,12 +1791,12 @@ void KviClassEditor::saveNotBuiltClasses()
 			QString szReminderEntry;
 			for(int i=0; i < it.current()->childCount(); i++)
 			{
-				if(!((KviClassEditorTreeWidgetItem *)it.current()->child(i))->reminder().isEmpty())
+				if(!((ClassEditorTreeWidgetItem *)it.current()->child(i))->reminder().isEmpty())
 				{
-					szReminderEntry="@Reminder|"+((KviClassEditorTreeWidgetItem *)it.current()->child(i))->name();
-					cfg.writeEntry(szReminderEntry,((KviClassEditorTreeWidgetItem *)it.current()->child(i))->reminder());
+					szReminderEntry="@Reminder|"+((ClassEditorTreeWidgetItem *)it.current()->child(i))->name();
+					cfg.writeEntry(szReminderEntry,((ClassEditorTreeWidgetItem *)it.current()->child(i))->reminder());
 				}
-				cfg.writeEntry(((KviClassEditorTreeWidgetItem *)it.current()->child(i))->name(),((KviClassEditorTreeWidgetItem *)it.current()->child(i))->buffer());
+				cfg.writeEntry(((ClassEditorTreeWidgetItem *)it.current()->child(i))->name(),((ClassEditorTreeWidgetItem *)it.current()->child(i))->buffer());
 			}
 		}
 		++it;
@@ -1804,9 +1804,9 @@ void KviClassEditor::saveNotBuiltClasses()
 	cfg.sync();
 }
 
-void KviClassEditor::searchInheritedClasses(const QString szClass, KviPointerList<KviClassEditorTreeWidgetItem> & lInheritedClasses)
+void ClassEditorWidget::searchInheritedClasses(const QString szClass, KviPointerList<ClassEditorTreeWidgetItem> & lInheritedClasses)
 {
-	KviPointerHashTableIterator<QString,KviClassEditorTreeWidgetItem> it (*m_pClasses);
+	KviPointerHashTableIterator<QString,ClassEditorTreeWidgetItem> it (*m_pClasses);
 	while(it.current())
 	{
 		if(KviQString::equalCI(szClass,it.current()->inheritsClass()))
@@ -1815,7 +1815,7 @@ void KviClassEditor::searchInheritedClasses(const QString szClass, KviPointerLis
 	}
 }
 
-KviClassEditorWindow::KviClassEditorWindow(KviMainWindow * pFrm)
+ClassEditorWindow::ClassEditorWindow(KviMainWindow * pFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,pFrm,"classeditor",0)
 {
 	g_pClassEditorWindow = this;
@@ -1824,7 +1824,7 @@ KviClassEditorWindow::KviClassEditorWindow(KviMainWindow * pFrm)
 
 	QGridLayout * pLayout = new QGridLayout();
 
-	m_pEditor = new KviClassEditor(this);
+	m_pEditor = new ClassEditorWidget(this);
 	pLayout->addWidget(m_pEditor,0,0,1,4);
 
 	QPushButton * pBtn = new QPushButton(__tr2qs_ctx("&Build","editor"),this);
@@ -1847,47 +1847,47 @@ KviClassEditorWindow::KviClassEditorWindow(KviMainWindow * pFrm)
 	setLayout(pLayout);
 }
 
-KviClassEditorWindow::~KviClassEditorWindow()
+ClassEditorWindow::~ClassEditorWindow()
 {
 	g_pClassEditorWindow = 0;
 }
 
-void KviClassEditorWindow::buildClicked()
+void ClassEditorWindow::buildClicked()
 {
 	m_pEditor->build();
 }
 
-void KviClassEditorWindow::saveClicked()
+void ClassEditorWindow::saveClicked()
 {
 	m_pEditor->saveNotBuiltClasses();
 }
 
-void KviClassEditorWindow::cancelClicked()
+void ClassEditorWindow::cancelClicked()
 {
 	close();
 }
 
-QPixmap * KviClassEditorWindow::myIconPtr()
+QPixmap * ClassEditorWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_CLASSEDITOR);
 }
 
-void KviClassEditorWindow::configGroupName(QString &szName)
+void ClassEditorWindow::configGroupName(QString &szName)
 {
 	szName = "classeditor";
 }
 
-void KviClassEditorWindow::saveProperties(KviConfigurationFile * pCfg)
+void ClassEditorWindow::saveProperties(KviConfigurationFile * pCfg)
 {
 	m_pEditor->saveProperties(pCfg);
 }
 
-void KviClassEditorWindow::loadProperties(KviConfigurationFile * pCfg)
+void ClassEditorWindow::loadProperties(KviConfigurationFile * pCfg)
 {
 	m_pEditor->loadProperties(pCfg);
 }
 
-KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & szName, KviPointerHashTable<QString,KviClassEditorTreeWidgetItem> * pClasses, const QString & szClassName, const QString & szInheritsClassName, bool bRenameMode)
+KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & szName, KviPointerHashTable<QString,ClassEditorTreeWidgetItem> * pClasses, const QString & szClassName, const QString & szInheritsClassName, bool bRenameMode)
 : QDialog(pParent)
 {
 	setObjectName(szName);
@@ -1934,7 +1934,7 @@ KviClassEditorDialog::KviClassEditorDialog(QWidget * pParent, const QString & sz
 	m_pInheritsClassComboBox = new QComboBox(pHBox);
 	pLabel->setBuddy(m_pInheritsClassComboBox);
 
-	KviPointerHashTableIterator<QString,KviClassEditorTreeWidgetItem> pClassesIt(*pClasses);
+	KviPointerHashTableIterator<QString,ClassEditorTreeWidgetItem> pClassesIt(*pClasses);
 
 	QStringList szClasses;
 	while(pClassesIt.current())
diff --git a/src/modules/classeditor/classeditor.h b/src/modules/classeditor/ClassEditorWindow.h
index c04bd7da4..f13956c91 100644
--- a/src/modules/classeditor/classeditor.h
+++ b/src/modules/classeditor/ClassEditorWindow.h
@@ -2,7 +2,7 @@
 #define _CLASSEDITOR_H_
 //=============================================================================
 //
-//   File : classeditor.h
+//   File : ClassEditorWindow.h
 //   Creation date : Mon Feb 15 2010 14:35:55 CEST by Carbone Alessandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,7 +25,7 @@
 //=============================================================================
 
 /**
-* \file classeditor.h
+* \file ClassEditorWindow.h
 * \author Alessandro Carbone
 * \brief Class Editor window
 */
@@ -53,24 +53,24 @@ class QSplitter;
 class KviScriptEditor;
 
 /**
-* \class KviClassEditorTreeWidget
+* \class ClassEditorTreeWidget
 * \brief Describes the tree widget hierarchy
 */
-class KviClassEditorTreeWidget : public QTreeWidget
+class ClassEditorTreeWidget : public QTreeWidget
 {
 	Q_OBJECT
 public:
 	/**
 	* \brief Construct the tree widget
 	* \param pParent The parent widget
-	* \return KviClassEditorTreeWidget
+	* \return ClassEditorTreeWidget
 	*/
-	KviClassEditorTreeWidget(QWidget * pParent);
+	ClassEditorTreeWidget(QWidget * pParent);
 	
 	/**
 	* \brief Destroys the tree widget
 	*/
-	~KviClassEditorTreeWidget();
+	~ClassEditorTreeWidget();
 protected:
 	virtual void mousePressEvent(QMouseEvent * e);
 signals:
@@ -84,10 +84,10 @@ signals:
 };
 
 /**
-* \class KviClassEditorTreeWidgetItem
+* \class ClassEditorTreeWidgetItem
 * \brief Describes an item inside the class editor tree widget
 */
-class KviClassEditorTreeWidgetItem : public QTreeWidgetItem, public KviHeapObject
+class ClassEditorTreeWidgetItem : public QTreeWidgetItem, public KviHeapObject
 {
 public:
 	/**
@@ -106,23 +106,23 @@ public:
 	* \param pTreeWidget The parent tree widget
 	* \param eType The type of the item
 	* \param szName The name of the item
-	* \return KviClassEditorTreeWidgetItem
+	* \return ClassEditorTreeWidgetItem
 	*/
-	KviClassEditorTreeWidgetItem(QTreeWidget * pTreeWidget, Type eType, const QString & szName);
+	ClassEditorTreeWidgetItem(QTreeWidget * pTreeWidget, Type eType, const QString & szName);
 	
 	/**
 	* \brief Constructs the class editor tree widget item
 	* \param pParentItem The parent tree widget item
 	* \param eType The type of the item
 	* \param szName The name of the item
-	* \return KviClassEditorTreeWidgetItem
+	* \return ClassEditorTreeWidgetItem
 	*/
-	KviClassEditorTreeWidgetItem(KviClassEditorTreeWidgetItem * pParentItem, Type eType, const QString & szName);
+	ClassEditorTreeWidgetItem(ClassEditorTreeWidgetItem * pParentItem, Type eType, const QString & szName);
 	
 	/**
 	* \brief Destroys the class editor tree widget item
 	*/
-	~KviClassEditorTreeWidgetItem(){};
+	~ClassEditorTreeWidgetItem(){};
 protected:
 	Type    m_eType;
 	QString m_szName;
@@ -257,41 +257,41 @@ public:
 };
 
 /**
-* \class KviClassEditor
+* \class ClassEditorWidget
 * \brief The Class Editor module
 */
-class KviClassEditor : public QWidget
+class ClassEditorWidget : public QWidget
 {
 	Q_OBJECT
 public:
 	/**
 	* \brief Constructs the class editor object
 	* \param pParent The parent widget
-	* \return KviClassEditor
+	* \return ClassEditorWidget
 	*/
-	KviClassEditor(QWidget * pParent);
+	ClassEditorWidget(QWidget * pParent);
 	
 	/**
 	* \brief Destroys the class editor object
 	*/
-	~KviClassEditor();
+	~ClassEditorWidget();
 public:
 	KviScriptEditor              * m_pEditor;
-	KviClassEditorTreeWidget     * m_pTreeWidget;
+	ClassEditorTreeWidget     * m_pTreeWidget;
 	QLabel                       * m_pClassNameLabel;
 	QPushButton                  * m_pClassNameRenameButton;
 	QLabel                       * m_pFunctionNameLabel;
 	QPushButton                  * m_pFunctionNameRenameButton;
 	QLabel                       * m_pReminderLabel;
 
-	KviClassEditorTreeWidgetItem * m_pLastEditedItem;
-	KviClassEditorTreeWidgetItem * m_pLastClickedItem;
+	ClassEditorTreeWidgetItem * m_pLastEditedItem;
+	ClassEditorTreeWidgetItem * m_pLastClickedItem;
 	KviTalPopupMenu              * m_pContextPopup;
 	QSplitter                    * m_pSplitter;
 	QString                        m_szDir;
 	bool                           m_bSaving;
 protected:
-	KviPointerHashTable<QString,KviClassEditorTreeWidgetItem> * m_pClasses;
+	KviPointerHashTable<QString,ClassEditorTreeWidgetItem> * m_pClasses;
 public:
 	/**
 	* \brief Called to save the window properties
@@ -329,9 +329,9 @@ public:
 	* \brief Searches a function
 	* \param szFunctionName The name of the function
 	* \param pClass The class in which the function is
-	* \return KviClassEditorTreeWidgetItem *
+	* \return ClassEditorTreeWidgetItem *
 	*/
-	KviClassEditorTreeWidgetItem * findFunction(const QString & szFunctionName, KviClassEditorTreeWidgetItem * pClass);
+	ClassEditorTreeWidgetItem * findFunction(const QString & szFunctionName, ClassEditorTreeWidgetItem * pClass);
 
 	/**
 	* \brief Exports class to a file
@@ -346,28 +346,28 @@ public:
 	* \param pList The list of file to export
 	* \return void
 	*/
-	void exportSelectionInSinglesFiles(KviPointerList<KviClassEditorTreeWidgetItem> * pList);
+	void exportSelectionInSinglesFiles(KviPointerList<ClassEditorTreeWidgetItem> * pList);
 	
 	/**
 	* \brief Removes the item from the tree
 	* \param pItem The item to remove
 	* \return void
 	*/
-	void cutItem(KviClassEditorTreeWidgetItem * pItem);
+	void cutItem(ClassEditorTreeWidgetItem * pItem);
 protected:
-	//void recursiveSearchReplace(const QString &szSearch,KviClassEditorTreeWidgetItem * it,bool bReplace=false,const QString &szReplace="n");
+	//void recursiveSearchReplace(const QString &szSearch,ClassEditorTreeWidgetItem * it,bool bReplace=false,const QString &szReplace="n");
 
-	void exportClassBuffer(QString & szBuffer, KviClassEditorTreeWidgetItem * pItem);
+	void exportClassBuffer(QString & szBuffer, ClassEditorTreeWidgetItem * pItem);
 
 	void oneTimeSetup();
-	void createFullClass(KviKvsObjectClass * pClass, KviClassEditorTreeWidgetItem * pItem, const QString & szClassName);
+	void createFullClass(KviKvsObjectClass * pClass, ClassEditorTreeWidgetItem * pItem, const QString & szClassName);
 
 	void saveLastEditedItem();
-	void appendSelectedClassItems(KviPointerList<KviClassEditorTreeWidgetItem> * pList);
-	void appendSelectedClassItemsRecursive(KviPointerList<KviClassEditorTreeWidgetItem> * pList, QTreeWidgetItem * pStartFrom);
+	void appendSelectedClassItems(KviPointerList<ClassEditorTreeWidgetItem> * pList);
+	void appendSelectedClassItemsRecursive(KviPointerList<ClassEditorTreeWidgetItem> * pList, QTreeWidgetItem * pStartFrom);
 
-	void appendAllClassItems(KviPointerList<KviClassEditorTreeWidgetItem> * pList);
-	void appendAllClassItemsRecursive(KviPointerList<KviClassEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom);
+	void appendAllClassItems(KviPointerList<ClassEditorTreeWidgetItem> * pList);
+	void appendAllClassItemsRecursive(KviPointerList<ClassEditorTreeWidgetItem> * l,QTreeWidgetItem * pStartFrom);
 
 	void openParentItems(QTreeWidgetItem * pItem);
 	void activateItem(QTreeWidgetItem * pItem);
@@ -375,7 +375,7 @@ protected:
 	bool askForClassName(QString & szClassName, QString & szInheritsClassName, bool bEdit);
 	bool askForNamespaceName(const QString & szAction, const QString & szText, const QString & szInitialText, QString & szNameBuffer);
 	bool askForFunction(QString & szFunctionName, QString & szReminder, bool * pbInternal, const QString & szClassName, bool bRenameMode);
-	void searchInheritedClasses(const QString szClass, KviPointerList<KviClassEditorTreeWidgetItem> & lInheritsedClasses);
+	void searchInheritedClasses(const QString szClass, KviPointerList<ClassEditorTreeWidgetItem> & lInheritsedClasses);
 	
 	/**
 	* \brief Returns true if the class exists, false otherwise
@@ -389,35 +389,35 @@ protected:
 	* \param pClass The class to rename
 	* \return void
 	*/
-	void renameClass(KviClassEditorTreeWidgetItem * pClass);
+	void renameClass(ClassEditorTreeWidgetItem * pClass);
 	
 	/**
 	* \brief Renames a namespace
 	* \param pNamespace The namespace to rename
 	* \return void
 	*/
-	void renameNamespace(KviClassEditorTreeWidgetItem * pNamespace);
+	void renameNamespace(ClassEditorTreeWidgetItem * pNamespace);
 
-	bool removeItem(KviClassEditorTreeWidgetItem * pItem, KviPointerList <KviClassEditorTreeWidgetItem> & lRemovedItems, bool * pbYesToAll);
-	void updateClassHierarchy(KviClassEditorTreeWidgetItem * pClass);
+	bool removeItem(ClassEditorTreeWidgetItem * pItem, KviPointerList <ClassEditorTreeWidgetItem> & lRemovedItems, bool * pbYesToAll);
+	void updateClassHierarchy(ClassEditorTreeWidgetItem * pClass);
 
-	void removeItemChildren(KviClassEditorTreeWidgetItem * pItem, KviPointerList <KviClassEditorTreeWidgetItem> & lRemovedItems);
-	void buildFullItemPath(KviClassEditorTreeWidgetItem * pItem, QString & szBuffer);
-	QString buildFullClassName(KviClassEditorTreeWidgetItem * pItem);
-	KviClassEditorTreeWidgetItem * createFullItem(const QString & szFullName);
-	KviClassEditorTreeWidgetItem * createFullNamespace(const QString & szFullName);
+	void removeItemChildren(ClassEditorTreeWidgetItem * pItem, KviPointerList <ClassEditorTreeWidgetItem> & lRemovedItems);
+	void buildFullItemPath(ClassEditorTreeWidgetItem * pItem, QString & szBuffer);
+	QString buildFullClassName(ClassEditorTreeWidgetItem * pItem);
+	ClassEditorTreeWidgetItem * createFullItem(const QString & szFullName);
+	ClassEditorTreeWidgetItem * createFullNamespace(const QString & szFullName);
 
 	/**
 	* \brief Searches an item
 	* \param szName The name of the item to find
-	* \return KviClassEditorTreeWidgetItem *
+	* \return ClassEditorTreeWidgetItem *
 	*/
-	KviClassEditorTreeWidgetItem * findItem(const QString & szName);
+	ClassEditorTreeWidgetItem * findItem(const QString & szName);
 	
 	
 	
-	KviClassEditorTreeWidgetItem * findTopLevelItem(const QString & szName);
-	KviClassEditorTreeWidgetItem * createFullItemRecursive(QTreeWidgetItem * pCurrent, QStringList & lNameSpaces, int & iLevel, bool bCreateNameSpace = 0);
+	ClassEditorTreeWidgetItem * findTopLevelItem(const QString & szName);
+	ClassEditorTreeWidgetItem * createFullItemRecursive(QTreeWidgetItem * pCurrent, QStringList & lNameSpaces, int & iLevel, bool bCreateNameSpace = 0);
 protected slots:
 	void currentItemChanged(QTreeWidgetItem * pItem, QTreeWidgetItem *);
 	void customContextMenuRequested(QPoint);
@@ -425,7 +425,7 @@ protected slots:
 	void newNamespace();
 	void newMemberFunction();
 	void renameFunction();
-	KviClassEditorTreeWidgetItem * newItem(QString & szName, KviClassEditorTreeWidgetItem::Type eType);
+	ClassEditorTreeWidgetItem * newItem(QString & szName, ClassEditorTreeWidgetItem::Type eType);
 
 	void renameItem();
 
@@ -448,7 +448,7 @@ protected slots:
 	* \param pItem The starting item to collapse
 	* \return void
 	*/
-	void recursiveCollapseItems(KviClassEditorTreeWidgetItem * pItem);
+	void recursiveCollapseItems(ClassEditorTreeWidgetItem * pItem);
 
 	/**
 	* \brief Called when we want to remove all selected items
@@ -466,26 +466,26 @@ protected slots:
 };
 
 /**
-* \class KviClassEditorWindow
+* \class ClassEditorWindow
 * \brief This is the Class Editor window
 */
-class KviClassEditorWindow : public KviWindow
+class ClassEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
 	/**
 	* \brief Constructs the class editor window
 	* \param pFrm The parent frame
-	* \return KviClassEditorWindow
+	* \return ClassEditorWindow
 	*/
-	KviClassEditorWindow(KviMainWindow * pFrm);
+	ClassEditorWindow(KviMainWindow * pFrm);
 	
 	/**
 	* \brief Destroys the class editor window
 	*/
-	~KviClassEditorWindow();
+	~ClassEditorWindow();
 protected:
-	KviClassEditor * m_pEditor;
+	ClassEditorWidget * m_pEditor;
 protected:
 	/**
 	* \brief Returns the class editor small icon
@@ -551,7 +551,7 @@ public:
 	* \param bRenameMode Whether the dialog is in rename mode
 	* \return KviClassEditorDialog
 	*/
-	KviClassEditorDialog(QWidget * pParent, const QString & szName, KviPointerHashTable<QString,KviClassEditorTreeWidgetItem> * pClasses, const QString & szClassName, const QString & szInheritsClassName, bool bRenameMode = false);
+	KviClassEditorDialog(QWidget * pParent, const QString & szName, KviPointerHashTable<QString,ClassEditorTreeWidgetItem> * pClasses, const QString & szClassName, const QString & szInheritsClassName, bool bRenameMode = false);
 	
 	/**
 	* \brief Destroys the class dialog
diff --git a/src/modules/classeditor/libkviclasseditor.cpp b/src/modules/classeditor/libkviclasseditor.cpp
index a0214b8d8..a45256029 100644
--- a/src/modules/classeditor/libkviclasseditor.cpp
+++ b/src/modules/classeditor/libkviclasseditor.cpp
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "classeditor.h"
+#include "ClassEditorWindow.h"
 
 #include "KviModule.h"
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
 
-KviClassEditorWindow * g_pClassEditorWindow = 0;
+ClassEditorWindow * g_pClassEditorWindow = 0;
 KviModule * g_pClassEditorModule = 0;
 
 
@@ -50,7 +50,7 @@ static bool classeditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	if(!g_pClassEditorWindow)
 	{
-		g_pClassEditorWindow = new KviClassEditorWindow(c->window()->frame());
+		g_pClassEditorWindow = new ClassEditorWindow(c->window()->frame());
 		c->window()->frame()->addWindow(g_pClassEditorWindow);
 	}
 
diff --git a/src/modules/codetester/CMakeLists.txt b/src/modules/codetester/CMakeLists.txt
index 87c4cedca..1cc744655 100644
--- a/src/modules/codetester/CMakeLists.txt
+++ b/src/modules/codetester/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/codetester
 
 SET(kvicodetester_MOC_HDRS
-	codetester.h
+	CodeTesterWindow.h
 )
 
 SET(kvicodetester_SRCS
 	libkvicodetester.cpp
-	codetester.cpp
+	CodeTesterWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/CodeTesterWindow.cpp
index 093f85b04..f21a610da 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/CodeTesterWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : codetester.cpp
+//   File : CodeTesterWindow.cpp
 //   Creation date : Mon Dec 23 2002 20:28:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "codetester.h"
+#include "CodeTesterWindow.h"
 
 #include "KviIconManager.h"
 #include "KviOptions.h"
@@ -43,10 +43,10 @@
 #include <QLabel>
 
 
-extern KviPointerList<KviCodeTesterWindow> * g_pCodeTesterWindowList;
+extern KviPointerList<CodeTesterWindow> * g_pCodeTesterWindowList;
 
 
-KviCodeTester::KviCodeTester(QWidget * par)
+CodeTesterWidget::CodeTesterWidget(QWidget * par)
 : QWidget(par)
 {
 	setObjectName("code_tester");
@@ -64,14 +64,14 @@ KviCodeTester::KviCodeTester(QWidget * par)
 	g->addWidget(m_pParams,1,2);
 }
 
-KviCodeTester::~KviCodeTester()
+CodeTesterWidget::~CodeTesterWidget()
 {
 	KviScriptEditor::destroyInstance(m_pEditor);
 }
 
 //#warning "Allow to bind the command to a specified window"
 
-void KviCodeTester::execute()
+void CodeTesterWidget::execute()
 {
 	QString parms = m_pParams->text();
 	QString buffer;
@@ -81,40 +81,40 @@ void KviCodeTester::execute()
 	KviKvsScript::run(buffer,con,new KviKvsVariantList(new QString(parms)));
 }
 
-KviCodeTesterWindow::KviCodeTesterWindow(KviMainWindow * lpFrm)
+CodeTesterWindow::CodeTesterWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"codetester",0)
 {
 	g_pCodeTesterWindowList->append(this);
 
-	m_pTester = new KviCodeTester(this);
+	m_pTester = new CodeTesterWidget(this);
 }
 
-KviCodeTesterWindow::~KviCodeTesterWindow()
+CodeTesterWindow::~CodeTesterWindow()
 {
 	g_pCodeTesterWindowList->removeRef(this);
 }
 
-QPixmap * KviCodeTesterWindow::myIconPtr()
+QPixmap * CodeTesterWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB);
 }
 
-void KviCodeTesterWindow::resizeEvent(QResizeEvent *)
+void CodeTesterWindow::resizeEvent(QResizeEvent *)
 {
 	m_pTester->setGeometry(0,0,width(),height());
 }
 
-void KviCodeTesterWindow::fillCaptionBuffers()
+void CodeTesterWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Script Tester","editor");
 }
 
-void KviCodeTesterWindow::getConfigGroupName(QString &szName)
+void CodeTesterWindow::getConfigGroupName(QString &szName)
 {
 	szName = "codetester";
 }
 
-void KviCodeTesterWindow::saveProperties(KviConfigurationFile *) //cfg
+void CodeTesterWindow::saveProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
@@ -125,7 +125,7 @@ void KviCodeTesterWindow::saveProperties(KviConfigurationFile *) //cfg
 */
 }
 
-void KviCodeTesterWindow::loadProperties(KviConfigurationFile *) //cfg
+void CodeTesterWindow::loadProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/codetester/codetester.h b/src/modules/codetester/CodeTesterWindow.h
index d54cc96be..eccdd433e 100644
--- a/src/modules/codetester/codetester.h
+++ b/src/modules/codetester/CodeTesterWindow.h
@@ -2,7 +2,7 @@
 #define _CODETESTER_H_
 //=============================================================================
 //
-//   File : eventeditor.h
+//   File : EventEditorWindow.h
 //   Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -34,12 +34,12 @@ class QLabel;
 class KviScriptEditor;
 
 
-class KviCodeTester : public QWidget
+class CodeTesterWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	KviCodeTester(QWidget * par);
-	~KviCodeTester();
+	CodeTesterWidget(QWidget * par);
+	~CodeTesterWidget();
 private:
 	KviScriptEditor * m_pEditor;
 	QLineEdit       * m_pParams;
@@ -49,14 +49,14 @@ private slots:
 	void execute();
 };
 
-class KviCodeTesterWindow : public KviWindow
+class CodeTesterWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviCodeTesterWindow(KviMainWindow * lpFrm);
-	~KviCodeTesterWindow();
+	CodeTesterWindow(KviMainWindow * lpFrm);
+	~CodeTesterWindow();
 protected:
-	KviCodeTester * m_pTester;
+	CodeTesterWidget * m_pTester;
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
diff --git a/src/modules/codetester/libkvicodetester.cpp b/src/modules/codetester/libkvicodetester.cpp
index 8c38db8ee..c90fcf843 100644
--- a/src/modules/codetester/libkvicodetester.cpp
+++ b/src/modules/codetester/libkvicodetester.cpp
@@ -22,7 +22,7 @@
 //
 //===============================================================================
 
-#include "codetester.h"
+#include "CodeTesterWindow.h"
 
 #include "KviModule.h"
 #include "KviLocale.h"
@@ -30,7 +30,7 @@
 #include "KviPointerList.h"
 
 
-KviPointerList<KviCodeTesterWindow> * g_pCodeTesterWindowList = 0;
+KviPointerList<CodeTesterWindow> * g_pCodeTesterWindowList = 0;
 
 
 /*
@@ -49,7 +49,7 @@ KviPointerList<KviCodeTesterWindow> * g_pCodeTesterWindowList = 0;
 
 static bool codetester_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
-	KviCodeTesterWindow * w = new KviCodeTesterWindow(c->window()->frame());
+	CodeTesterWindow * w = new CodeTesterWindow(c->window()->frame());
 	c->window()->frame()->addWindow(w);
 	w->setFocus();
 	return true;
@@ -59,7 +59,7 @@ static bool codetester_module_init(KviModule * m)
 {
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",codetester_kvs_cmd_open);
 
-	g_pCodeTesterWindowList = new KviPointerList<KviCodeTesterWindow>();
+	g_pCodeTesterWindowList = new KviPointerList<CodeTesterWindow>();
 	g_pCodeTesterWindowList->setAutoDelete(false);
 	return true;
 }
@@ -71,7 +71,7 @@ static bool codetester_module_can_unload(KviModule *)
 
 static bool codetester_module_cleanup(KviModule *)
 {
-	while(KviCodeTesterWindow * w = g_pCodeTesterWindowList->first())
+	while(CodeTesterWindow * w = g_pCodeTesterWindowList->first())
 	{
 		w->close(); // deleted path!
 	}
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();
diff --git a/src/modules/editor/CMakeLists.txt b/src/modules/editor/CMakeLists.txt
index 239a32db6..a4eca8e01 100644
--- a/src/modules/editor/CMakeLists.txt
+++ b/src/modules/editor/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/editor
 
 SET(kvieditor_MOC_HDRS
-	scripteditor.h
+	ScriptEditorImplementation.h
 )
 
 SET(kvieditor_SRCS
 	libkvieditor.cpp
-	scripteditor.cpp
+	ScriptEditorImplementation.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/ScriptEditorImplementation.cpp
index f38f9d33c..6bd4bed4a 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/ScriptEditorImplementation.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : scripteditor.cpp
+//   File : ScriptEditorImplementation.cpp
 //   Creation date : Sun Mar 28 1999 16:11:48 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "scripteditor.h"
+#include "ScriptEditorImplementation.h"
 
 #include "KviFileUtils.h"
 #include "kvi_fileextensions.h"
@@ -59,7 +59,7 @@
 #include <QPainter>
 
 extern KVIRC_API KviModuleManager                    * g_pModuleManager;
-extern KviPointerList<KviScriptEditorImplementation> * g_pScriptEditorWindowList;
+extern KviPointerList<ScriptEditorImplementation> * g_pScriptEditorWindowList;
 extern KviModule                                     * g_pEditorModulePointer;
 
 static QColor g_clrBackground(0,0,0);
@@ -83,7 +83,7 @@ static bool bSemaphore=false;
 static bool bCompleterReady=false;
 
 
-KviScriptEditorWidget::KviScriptEditorWidget(QWidget * pParent)
+ScriptEditorWidget::ScriptEditorWidget(QWidget * pParent)
 : QTextEdit(pParent)
 {
 	m_pSyntaxHighlighter=0;
@@ -120,14 +120,14 @@ KviScriptEditorWidget::KviScriptEditorWidget(QWidget * pParent)
 	} else loadCompleterFromFile();
 }
 
-KviScriptEditorWidget::~KviScriptEditorWidget()
+ScriptEditorWidget::~ScriptEditorWidget()
 {
 	if(m_pCompleter)
 		delete m_pCompleter;
 	disableSyntaxHighlighter();
 }
 
-void KviScriptEditorWidget::checkReadyCompleter()
+void ScriptEditorWidget::checkReadyCompleter()
 {
 	if(bCompleterReady)
 	{
@@ -138,7 +138,7 @@ void KviScriptEditorWidget::checkReadyCompleter()
 	}
 }
 
-void KviScriptEditorWidget::asyncCompleterCreation()
+void ScriptEditorWidget::asyncCompleterCreation()
 {
 	//static int iIndex = 0;
 	//static int iModulesCount = 0;
@@ -204,7 +204,7 @@ void KviScriptEditorWidget::asyncCompleterCreation()
 	}
 }
 
-void KviScriptEditorWidget::loadCompleterFromFile()
+void ScriptEditorWidget::loadCompleterFromFile()
 {
 	QStringList szListFunctionsCommand;
 	QString szTmp("kvscompleter.idx");
@@ -219,7 +219,7 @@ void KviScriptEditorWidget::loadCompleterFromFile()
 	createCompleter(szListFunctionsCommand);
 }
 
-void KviScriptEditorWidget::createCompleter(QStringList & list)
+void ScriptEditorWidget::createCompleter(QStringList & list)
 {
 	m_pCompleter = new QCompleter(list);
 	m_pCompleter->setCaseSensitivity(Qt::CaseInsensitive);
@@ -231,7 +231,7 @@ void KviScriptEditorWidget::createCompleter(QStringList & list)
 	QObject::connect(m_pCompleter, SIGNAL(activated(const QString &)),this, SLOT(insertCompletion(const QString &)));
 }
 
-void KviScriptEditorWidget::insertCompletion(const QString & szCompletion)
+void ScriptEditorWidget::insertCompletion(const QString & szCompletion)
 {
 	QTextCursor tc = textCursor();
 	int iExtra = szCompletion.length() - m_pCompleter->completionPrefix().length();
@@ -249,7 +249,7 @@ void KviScriptEditorWidget::insertCompletion(const QString & szCompletion)
 	setTextCursor(tc);
 }
 
-void KviScriptEditorWidget::contextMenuEvent(QContextMenuEvent * e)
+void ScriptEditorWidget::contextMenuEvent(QContextMenuEvent * e)
 {
 	QMenu * pMenu = createStandardContextMenu();
 	pMenu->addAction(__tr2qs_ctx("Context sensitive help","editor"),this,SLOT(slotHelp()),Qt::CTRL+Qt::Key_H);
@@ -258,15 +258,15 @@ void KviScriptEditorWidget::contextMenuEvent(QContextMenuEvent * e)
 	delete pMenu;
 }
 
-void KviScriptEditorWidget::slotFind()
+void ScriptEditorWidget::slotFind()
 {
-	m_szFind = ((KviScriptEditorImplementation*)m_pParent)->findLineEdit()->text();
+	m_szFind = ((ScriptEditorImplementation*)m_pParent)->findLineEdit()->text();
 	setText(toPlainText());
 }
 
-void KviScriptEditorWidget::slotReplace()
+void ScriptEditorWidget::slotReplace()
 {
-	KviScriptEditorReplaceDialog * pDialog = new KviScriptEditorReplaceDialog(this,__tr2qs_ctx("Find & Replace","editor"));
+	ScriptEditorReplaceDialog * pDialog = new ScriptEditorReplaceDialog(this,__tr2qs_ctx("Find & Replace","editor"));
 	connect(pDialog,SIGNAL(replaceAll(const QString &,const QString &)),m_pParent,SLOT(slotReplaceAll(const QString &,const QString &)));
 	connect(pDialog,SIGNAL(initFind()),m_pParent,SLOT(slotInitFind()));
 	connect(pDialog,SIGNAL(nextFind(const QString &)),m_pParent,SLOT(slotNextFind(const QString &)));
@@ -274,24 +274,24 @@ void KviScriptEditorWidget::slotReplace()
 	if(pDialog->exec()){};
 }
 
-void KviScriptEditorWidget::slotHelp()
+void ScriptEditorWidget::slotHelp()
 {
 	contextSensitiveHelp();
 }
-void KviScriptEditorWidget::enableSyntaxHighlighter()
+void ScriptEditorWidget::enableSyntaxHighlighter()
 {
 	// we currently delete and re-create the m_pSyntaxHighlighter
 	// as a trick to ensure proper re-highlightning to occur
 	if (!m_pSyntaxHighlighter)
-	    m_pSyntaxHighlighter = new KviScriptEditorSyntaxHighlighter(this);
+	    m_pSyntaxHighlighter = new ScriptEditorSyntaxHighlighter(this);
 }
-void KviScriptEditorWidget::disableSyntaxHighlighter()
+void ScriptEditorWidget::disableSyntaxHighlighter()
 {
 	if (m_pSyntaxHighlighter) delete m_pSyntaxHighlighter;
 	m_pSyntaxHighlighter = 0;
 }
 
-void KviScriptEditorWidget::updateOptions()
+void ScriptEditorWidget::updateOptions()
 {
 	QPalette p = palette();
 	p.setColor(QPalette::Base,g_clrBackground);
@@ -302,12 +302,12 @@ void KviScriptEditorWidget::updateOptions()
 	disableSyntaxHighlighter();
 	enableSyntaxHighlighter();
 
-	p = ((KviScriptEditorImplementation*)m_pParent)->findLineEdit()->palette();
+	p = ((ScriptEditorImplementation*)m_pParent)->findLineEdit()->palette();
 	p.setColor(foregroundRole(),g_clrFind);
-	((KviScriptEditorImplementation*)m_pParent)->findLineEdit()->setPalette(p);
+	((ScriptEditorImplementation*)m_pParent)->findLineEdit()->setPalette(p);
 }
 
-void KviScriptEditorWidget::keyPressEvent(QKeyEvent * e)
+void ScriptEditorWidget::keyPressEvent(QKeyEvent * e)
 {
 	if(m_pCompleter && m_pCompleter->popup()->isVisible())
 	{
@@ -374,7 +374,7 @@ void KviScriptEditorWidget::keyPressEvent(QKeyEvent * e)
 	m_pCompleter->complete(cr);
 }
 
-QString KviScriptEditorWidget::textUnderCursor() const
+QString ScriptEditorWidget::textUnderCursor() const
 {
 	QString szWord;
 	QTextCursor tc = textCursor();
@@ -410,7 +410,7 @@ QString KviScriptEditorWidget::textUnderCursor() const
 	return szWord;
 }
 /*
-void KviScriptEditorWidget::mouseReleaseEvent(QMouseEvent * e)
+void ScriptEditorWidget::mouseReleaseEvent(QMouseEvent * e)
 {
 
 	return;
@@ -461,7 +461,7 @@ void KviScriptEditorWidget::mouseReleaseEvent(QMouseEvent * e)
 	QTextEdit::mouseReleaseEvent(e);
 }
 */
-bool KviScriptEditorWidget::contextSensitiveHelp() const
+bool ScriptEditorWidget::contextSensitiveHelp() const
 {
 	/*
 	QString szBuffer;
@@ -512,7 +512,7 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const
 	return true;
 }
 
-KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(QWidget * pParent)
+ScriptEditorWidgetColorOptions::ScriptEditorWidgetColorOptions(QWidget * pParent)
 : QDialog(pParent)
 {
 	m_pSelectorInterfaceList = new KviPointerList<KviSelectorInterface>;
@@ -548,19 +548,19 @@ KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(QWidget * p
 	connect(b,SIGNAL(clicked()),this,SLOT(reject()));
 }
 
-KviScriptEditorWidgetColorOptions::~KviScriptEditorWidgetColorOptions()
+ScriptEditorWidgetColorOptions::~ScriptEditorWidgetColorOptions()
 {
 	delete m_pSelectorInterfaceList;
 }
 
-KviColorSelector * KviScriptEditorWidgetColorOptions::addColorSelector(QWidget * pParent,const QString & txt,QColor * pOption,bool bEnabled)
+KviColorSelector * ScriptEditorWidgetColorOptions::addColorSelector(QWidget * pParent,const QString & txt,QColor * pOption,bool bEnabled)
 {
 	KviColorSelector * s = new KviColorSelector(pParent,txt,pOption,bEnabled);
 	m_pSelectorInterfaceList->append(s);
 		return s;
 }
 
-void KviScriptEditorWidgetColorOptions::okClicked()
+void ScriptEditorWidgetColorOptions::okClicked()
 {
 	for(KviSelectorInterface * i = m_pSelectorInterfaceList->first();i;i = m_pSelectorInterfaceList->next())
 	{
@@ -570,7 +570,7 @@ void KviScriptEditorWidgetColorOptions::okClicked()
 }
 
 
-KviScriptEditorSyntaxHighlighter::KviScriptEditorSyntaxHighlighter(KviScriptEditorWidget * pWidget)
+ScriptEditorSyntaxHighlighter::ScriptEditorSyntaxHighlighter(ScriptEditorWidget * pWidget)
 : QSyntaxHighlighter(pWidget),m_pTextEdit(pWidget)
 {
 	// code adpated from QT4 example
@@ -604,11 +604,11 @@ KviScriptEditorSyntaxHighlighter::KviScriptEditorSyntaxHighlighter(KviScriptEdit
 	highlightingRules.append(rule);
 }
 
-KviScriptEditorSyntaxHighlighter::~KviScriptEditorSyntaxHighlighter()
+ScriptEditorSyntaxHighlighter::~ScriptEditorSyntaxHighlighter()
 {
 }
 
-void KviScriptEditorSyntaxHighlighter::updateSyntaxtTextFormat()
+void ScriptEditorSyntaxHighlighter::updateSyntaxtTextFormat()
 {
 	punctuationFormat.setForeground(g_clrPunctuation);
 	keywordFormat.setForeground(g_clrKeyword);
@@ -630,7 +630,7 @@ void KviScriptEditorSyntaxHighlighter::updateSyntaxtTextFormat()
 		} \
 	} \
 
-void KviScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText)
+void ScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText)
 {
 	if(szText.isEmpty())
 	{
@@ -751,7 +751,7 @@ void KviScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText)
 	}
 
 	// 'found matches' highlighting
-	KviScriptEditorWidget * pEditor = ((KviScriptEditorWidget *)textEdit());
+	ScriptEditorWidget * pEditor = ((ScriptEditorWidget *)textEdit());
 	QString szFind = pEditor->m_szFind;
 	if (!szFind.isEmpty())
 	{
@@ -766,7 +766,7 @@ void KviScriptEditorSyntaxHighlighter::highlightBlock(const QString & szText)
 }
 
 
-KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
+ScriptEditorImplementation::ScriptEditorImplementation(QWidget * par)
 :KviScriptEditor(par)
 {
 	m_pOptionsDialog=0;
@@ -782,7 +782,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
 	p.setColor(foregroundRole(), g_clrFind);
 	m_pFindLineEdit->setPalette(p);
 
-	m_pEditor = new KviScriptEditorWidget(this);
+	m_pEditor = new ScriptEditorWidget(this);
 
 	g->addWidget(m_pEditor, 0, 0, 1,4);
 	g->setRowStretch(0,1);
@@ -822,7 +822,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
 	m_lastCursorPos = 0;
 }
 
-KviScriptEditorImplementation::~KviScriptEditorImplementation()
+ScriptEditorImplementation::~ScriptEditorImplementation()
 {
 	if(m_pOptionsDialog)
 	{
@@ -834,7 +834,7 @@ KviScriptEditorImplementation::~KviScriptEditorImplementation()
 		saveOptions();
 }
 
-void KviScriptEditorImplementation::loadOptions()
+void ScriptEditorImplementation::loadOptions()
 {
 	QString szTmp;
 	g_pEditorModulePointer->getDefaultConfigFileName(szTmp);
@@ -852,35 +852,35 @@ void KviScriptEditorImplementation::loadOptions()
 	g_fntNormal = cfg.readFontEntry("Font",QFont(KVI_SCRIPTEDITOR_DEFAULT_FONT,8));
 }
 
-bool KviScriptEditorImplementation::isModified()
+bool ScriptEditorImplementation::isModified()
 {
 	return m_pEditor->document()->isModified();
 }
-void KviScriptEditorImplementation::setModified(bool bModified)
+void ScriptEditorImplementation::setModified(bool bModified)
 {
 	return m_pEditor->document()->setModified(bModified);
 }
-void KviScriptEditorImplementation::slotFind()
+void ScriptEditorImplementation::slotFind()
 {
 	emit find(m_pFindLineEdit->text());
 }
 
-void KviScriptEditorImplementation::slotNextFind(const QString &) //szText
+void ScriptEditorImplementation::slotNextFind(const QString &) //szText
 {
 //	emit nextFind(const QString & szText);
 }
 
-void KviScriptEditorImplementation::slotInitFind()
+void ScriptEditorImplementation::slotInitFind()
 {
 	emit initFind();
 }
 
-void KviScriptEditorImplementation::slotReplaceAll(const QString & szToReplace, const QString & szReplaceWith)
+void ScriptEditorImplementation::slotReplaceAll(const QString & szToReplace, const QString & szReplaceWith)
 {
 	emit replaceAll(szToReplace,szReplaceWith);
 }
 
-void KviScriptEditorImplementation::saveOptions()
+void ScriptEditorImplementation::saveOptions()
 {
 	QString szTmp;
 	g_pEditorModulePointer->getDefaultConfigFileName(szTmp);
@@ -898,24 +898,24 @@ void KviScriptEditorImplementation::saveOptions()
 	cfg.writeEntry("Font",g_fntNormal);
 }
 
-void KviScriptEditorImplementation::setFocus()
+void ScriptEditorImplementation::setFocus()
 {
 	m_pEditor->setFocus();
 }
 
-void KviScriptEditorImplementation::focusInEvent(QFocusEvent *)
+void ScriptEditorImplementation::focusInEvent(QFocusEvent *)
 {
 	m_pEditor->setFocus();
 }
 
-void KviScriptEditorImplementation::setEnabled(bool bEnabled)
+void ScriptEditorImplementation::setEnabled(bool bEnabled)
 {
 	QWidget::setEnabled(bEnabled);
 	m_pEditor->setEnabled(bEnabled);
 	m_pRowColLabel->setEnabled(bEnabled);
 }
 
-void KviScriptEditorImplementation::saveToFile()
+void ScriptEditorImplementation::saveToFile()
 {
 	QString szFileName;
 	if(KviFileDialog::askForSaveFileName(szFileName,
@@ -937,31 +937,31 @@ void KviScriptEditorImplementation::saveToFile()
 	}
 }
 
-void KviScriptEditorImplementation::setText(const char * txt)
+void ScriptEditorImplementation::setText(const char * txt)
 {
 	setText(QByteArray(txt));
 }
-void KviScriptEditorImplementation::setUnHighlightedText(const QString & szText)
+void ScriptEditorImplementation::setUnHighlightedText(const QString & szText)
 {
 	m_pEditor->disableSyntaxHighlighter();
 	m_pEditor->setText(szText);
 }
-void KviScriptEditorImplementation::setText(const QByteArray & szText)
+void ScriptEditorImplementation::setText(const QByteArray & szText)
 {
 	m_pEditor->setPlainText(szText.data());
 	m_pEditor->document()->setModified(false);
 	updateRowColLabel();
 }
-void KviScriptEditorImplementation::setReadOnly(bool bReadOnly)
+void ScriptEditorImplementation::setReadOnly(bool bReadOnly)
 {
 	m_pEditor->setReadOnly(bReadOnly);
 }
-void KviScriptEditorImplementation::getText(QByteArray & szText)
+void ScriptEditorImplementation::getText(QByteArray & szText)
 {
 	szText = m_pEditor->toPlainText().toUtf8();
 }
 
-void KviScriptEditorImplementation::setText(const QString & szText)
+void ScriptEditorImplementation::setText(const QString & szText)
 {
 	m_pEditor->enableSyntaxHighlighter();
 	m_pEditor->setPlainText(szText);
@@ -972,18 +972,18 @@ void KviScriptEditorImplementation::setText(const QString & szText)
 	updateRowColLabel();
 }
 
-void KviScriptEditorImplementation::getText(QString & szText)
+void ScriptEditorImplementation::getText(QString & szText)
 {
 	szText = m_pEditor->toPlainText();
 }
 
-void KviScriptEditorImplementation::setFindText(const QString & szText)
+void ScriptEditorImplementation::setFindText(const QString & szText)
 {
 	m_pFindLineEdit->setText(szText);
 	m_pEditor->slotFind();
 }
 
-void KviScriptEditorImplementation::updateRowColLabel()
+void ScriptEditorImplementation::updateRowColLabel()
 {
 	if(m_lastCursorPos==m_pEditor->textCursor().position())
 		return;
@@ -995,7 +995,7 @@ void KviScriptEditorImplementation::updateRowColLabel()
 	m_lastCursorPos = m_pEditor->textCursor().position();
 }
 
-void KviScriptEditorImplementation::setCursorPosition(int iPos)
+void ScriptEditorImplementation::setCursorPosition(int iPos)
 {
 	QTextCursor cur = m_pEditor->textCursor();
 	cur.setPosition(iPos);
@@ -1003,7 +1003,7 @@ void KviScriptEditorImplementation::setCursorPosition(int iPos)
 	updateRowColLabel();
 }
 
-void KviScriptEditorImplementation::loadFromFile()
+void ScriptEditorImplementation::loadFromFile()
 {
 	QString szFileName;
 	if(KviFileDialog::askForOpenFileName(szFileName,
@@ -1026,17 +1026,17 @@ void KviScriptEditorImplementation::loadFromFile()
 	}
 }
 
-void KviScriptEditorImplementation::configureColors()
+void ScriptEditorImplementation::configureColors()
 {
 	if(!m_pOptionsDialog)
 	{
-		m_pOptionsDialog = new KviScriptEditorWidgetColorOptions(this);
+		m_pOptionsDialog = new ScriptEditorWidgetColorOptions(this);
 		connect(m_pOptionsDialog,SIGNAL(finished(int)),this,SLOT(optionsDialogFinished(int)));
 	}
 	m_pOptionsDialog->show();
 }
 
-void KviScriptEditorImplementation::optionsDialogFinished(int iResult)
+void ScriptEditorImplementation::optionsDialogFinished(int iResult)
 {
 	if(iResult == QDialog::Accepted)
 	{
@@ -1045,7 +1045,7 @@ void KviScriptEditorImplementation::optionsDialogFinished(int iResult)
 	}
 }
 
-KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog(QWidget * pParent, const QString & szName)
+ScriptEditorReplaceDialog::ScriptEditorReplaceDialog(QWidget * pParent, const QString & szName)
 : QDialog(pParent)
 {
 	setObjectName(szName);
@@ -1105,11 +1105,11 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog(QWidget * pParent, co
 	connect(m_pFindLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(textChanged(const QString &)));
 }
 
-KviScriptEditorReplaceDialog::~KviScriptEditorReplaceDialog()
+ScriptEditorReplaceDialog::~ScriptEditorReplaceDialog()
 {
 }
 
-void KviScriptEditorReplaceDialog::textChanged(const QString & szText)
+void ScriptEditorReplaceDialog::textChanged(const QString & szText)
 {
 	if(!szText.isEmpty())
 		m_pReplaceButton->setEnabled(true);
@@ -1117,21 +1117,21 @@ void KviScriptEditorReplaceDialog::textChanged(const QString & szText)
 		m_pReplaceButton->setEnabled(false);
 }
 
-void KviScriptEditorReplaceDialog::slotReplace()
+void ScriptEditorReplaceDialog::slotReplace()
 {
-	QString szText = ((KviScriptEditorWidget *)m_pParent)->toPlainText();
+	QString szText = ((ScriptEditorWidget *)m_pParent)->toPlainText();
 	if(m_pCheckReplaceAll->isChecked())
 		emit replaceAll(m_pFindLineEdit->text(),m_pReplaceLineEdit->text());
 
 	szText.replace(m_pFindLineEdit->text(),m_pReplaceLineEdit->text(),Qt::CaseInsensitive);
-	((KviScriptEditorWidget *)m_pParent)->setText(szText);
-	((KviScriptEditorWidget *)m_pParent)->document()->setModified(true);
+	((ScriptEditorWidget *)m_pParent)->setText(szText);
+	((ScriptEditorWidget *)m_pParent)->document()->setModified(true);
 	m_pFindLineEdit->setText("");
 	m_pReplaceLineEdit->setText("");
 	setTabOrder(m_pFindLineEdit,m_pReplaceLineEdit);
 }
 
-void KviScriptEditorReplaceDialog::slotNextFind()
+void ScriptEditorReplaceDialog::slotNextFind()
 {
 	emit nextFind(m_pFindLineEdit->text());
 }
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/ScriptEditorImplementation.h
index b8611c944..50fcb3ca6 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/ScriptEditorImplementation.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : scripteditor.h
+//   File : ScriptEditorImplementation.h
 //   Creation date : Sun Mar 28 1999 16:11:48 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -43,18 +43,18 @@
 class QTimer;
 
 //typedef KviPointerList<int> ColumnList;
-class KviScriptEditorSyntaxHighlighter;
-class KviScriptEditorWidget : public QTextEdit
+class ScriptEditorSyntaxHighlighter;
+class ScriptEditorWidget : public QTextEdit
 {
 	Q_OBJECT
 	Q_PROPERTY(bool contextSensitiveHelp READ contextSensitiveHelp)
 public:
-	KviScriptEditorWidget(QWidget * pParent);
-	virtual ~KviScriptEditorWidget();
+	ScriptEditorWidget(QWidget * pParent);
+	virtual ~ScriptEditorWidget();
 public:
 	QString m_szFind;
 protected:
-	KviScriptEditorSyntaxHighlighter * m_pSyntaxHighlighter;
+	ScriptEditorSyntaxHighlighter * m_pSyntaxHighlighter;
 	QCompleter  * m_pCompleter;
 	QStringList * m_pListModulesNames;
 	QStringList * m_pListCompletition;
@@ -63,7 +63,7 @@ protected:
 	int iIndex,iModulesCount;
 	QString       m_szHelp;
 public:
-	KviScriptEditorSyntaxHighlighter * syntaxHighlighter(){return m_pSyntaxHighlighter;};
+	ScriptEditorSyntaxHighlighter * syntaxHighlighter(){return m_pSyntaxHighlighter;};
 	void disableSyntaxHighlighter();
 	void enableSyntaxHighlighter();
 
@@ -91,12 +91,12 @@ protected:
 // 	void mouseReleaseEvent(QMouseEvent * e);
 };
 
-class KviScriptEditorWidgetColorOptions : public QDialog
+class ScriptEditorWidgetColorOptions : public QDialog
 {
 	Q_OBJECT
 public:
-	KviScriptEditorWidgetColorOptions(QWidget * pParent);
-	~KviScriptEditorWidgetColorOptions();
+	ScriptEditorWidgetColorOptions(QWidget * pParent);
+	~ScriptEditorWidgetColorOptions();
 private:
 	KviPointerList<KviSelectorInterface> * m_pSelectorInterfaceList;
 protected:
@@ -107,11 +107,11 @@ protected slots:
 
 };
 
-class KviScriptEditorSyntaxHighlighter : public QSyntaxHighlighter
+class ScriptEditorSyntaxHighlighter : public QSyntaxHighlighter
 {
 public:
-	KviScriptEditorSyntaxHighlighter(KviScriptEditorWidget * pWidget);
-	virtual ~KviScriptEditorSyntaxHighlighter();
+	ScriptEditorSyntaxHighlighter(ScriptEditorWidget * pWidget);
+	virtual ~ScriptEditorSyntaxHighlighter();
 public:
 	QTextEdit * m_pTextEdit;
 public:
@@ -139,17 +139,17 @@ private:
 	QTextCharFormat commentFormat;
 };
 
-class KviScriptEditorImplementation : public KviScriptEditor
+class ScriptEditorImplementation : public KviScriptEditor
 {
 	Q_OBJECT
 public:
-	KviScriptEditorImplementation(QWidget * par);
-	virtual ~KviScriptEditorImplementation();
+	ScriptEditorImplementation(QWidget * par);
+	virtual ~ScriptEditorImplementation();
 public:
 	QLineEdit * m_pFindLineEdit;
 protected:
-	KviScriptEditorWidgetColorOptions * m_pOptionsDialog;
-	KviScriptEditorWidget * m_pEditor;
+	ScriptEditorWidgetColorOptions * m_pOptionsDialog;
+	ScriptEditorWidget * m_pEditor;
 	QLabel                * m_pRowColLabel;
 	int                     m_lastCursorPos;
 public:
@@ -193,12 +193,12 @@ signals:
 	void nextFind(const QString & szText);
 };
 
-class KviScriptEditorReplaceDialog: public QDialog
+class ScriptEditorReplaceDialog: public QDialog
 {
 	Q_OBJECT
 public:
-	KviScriptEditorReplaceDialog(QWidget * parent = 0, const QString & szName = QString());
-	~KviScriptEditorReplaceDialog();
+	ScriptEditorReplaceDialog(QWidget * parent = 0, const QString & szName = QString());
+	~ScriptEditorReplaceDialog();
 public:
 	QLineEdit * m_pFindLineEdit;
 	QLineEdit * m_pReplaceLineEdit;
diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp
index cd65b52d7..6ed7b541a 100644
--- a/src/modules/editor/libkvieditor.cpp
+++ b/src/modules/editor/libkvieditor.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "scripteditor.h"
+#include "ScriptEditorImplementation.h"
 
 #include "KviModule.h"
 #include "KviWindow.h"
@@ -30,11 +30,11 @@
 
 KviModule * g_pEditorModulePointer = 0;
 
-KviPointerList<KviScriptEditorImplementation> * g_pScriptEditorWindowList = 0;
+KviPointerList<ScriptEditorImplementation> * g_pScriptEditorWindowList = 0;
 
 static bool editor_module_init(KviModule * m)
 {
-	g_pScriptEditorWindowList = new KviPointerList<KviScriptEditorImplementation>;
+	g_pScriptEditorWindowList = new KviPointerList<ScriptEditorImplementation>;
 	g_pScriptEditorWindowList->setAutoDelete(false);
 
 	g_pEditorModulePointer = m;
@@ -97,10 +97,10 @@ KVIRC_MODULE(
 
 KVIMODULEEXPORTFUNC KviScriptEditor * editor_module_createScriptEditor(QWidget * par)
 {
-	return new KviScriptEditorImplementation(par);
+	return new ScriptEditorImplementation(par);
 }
 
 KVIMODULEEXPORTFUNC void editor_module_destroyScriptEditor(KviScriptEditor * e)
 {
-	delete ((KviScriptEditorImplementation *)e);
+	delete ((ScriptEditorImplementation *)e);
 }
diff --git a/src/modules/eventeditor/CMakeLists.txt b/src/modules/eventeditor/CMakeLists.txt
index fa063255f..24d672a1d 100644
--- a/src/modules/eventeditor/CMakeLists.txt
+++ b/src/modules/eventeditor/CMakeLists.txt
@@ -1,11 +1,11 @@
 # CMakeLists for src/modules/eventeditor
 
 SET(kvieventeditor_MOC_HDRS
-	eventeditor.h
+	EventEditorWindow.h
 )
 
 SET(kvieventeditor_SRCS
-	eventeditor.cpp
+	EventEditorWindow.cpp
 	libkvieventeditor.cpp
 )
 
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index 1b5be86e6..f8467e5b1 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : eventeditor.cpp
+//   File : EventEditorWindow.cpp
 //   Creation date : Mon Dec 23 2002 20:28:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "eventeditor.h"
+#include "EventEditorWindow.h"
 
 #include "KviIconManager.h"
 #include "KviOptions.h"
@@ -49,21 +49,21 @@
 #include <QPushButton>
 #include <QMouseEvent>
 
-extern KviEventEditorWindow * g_pEventEditorWindow;
+extern EventEditorWindow * g_pEventEditorWindow;
 
-KviEventTreeWidgetItem::KviEventTreeWidgetItem(QTreeWidget * par,unsigned int uEvIdx,const QString &name,const QString &params)
+EventEditorEventTreeWidgetItem::EventEditorEventTreeWidgetItem(QTreeWidget * par,unsigned int uEvIdx,const QString &name,const QString &params)
 : QTreeWidgetItem(par), m_uEventIdx(uEvIdx), m_szParams(params)
 {
 	setName(name);
 }
 
-void KviEventTreeWidgetItem::setName(const QString &szName)
+void EventEditorEventTreeWidgetItem::setName(const QString &szName)
 {
 	m_szName = szName;
 	setText(0,m_szName);
 }
 
-KviEventHandlerTreeWidgetItem::KviEventHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString &name,const QString &buffer,bool bEnabled)
+EventEditorHandlerTreeWidgetItem::EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString &name,const QString &buffer,bool bEnabled)
 : QTreeWidgetItem(par), m_szBuffer(buffer)
 {
 	m_cPos=0;
@@ -71,19 +71,19 @@ KviEventHandlerTreeWidgetItem::KviEventHandlerTreeWidgetItem(QTreeWidgetItem * p
 	setName(name);
 }
 
-void KviEventHandlerTreeWidgetItem::setName(const QString &szName)
+void EventEditorHandlerTreeWidgetItem::setName(const QString &szName)
 {
 	m_szName = szName;
 	setText(0,m_szName);
 }
 
-void KviEventHandlerTreeWidgetItem::setEnabled(const bool bEnabled)
+void EventEditorHandlerTreeWidgetItem::setEnabled(const bool bEnabled)
 {
 	m_bEnabled = bEnabled;
 	setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(m_bEnabled ? KVI_SMALLICON_HANDLER : KVI_SMALLICON_HANDLERDISABLED))));
 }
 
-KviEventEditor::KviEventEditor(QWidget * par)
+EventEditor::EventEditor(QWidget * par)
 : QWidget(par)
 {
 	setObjectName("event_editor");
@@ -99,7 +99,7 @@ KviEventEditor::KviEventEditor(QWidget * par)
 	vbox->setSpacing(0);
 	vbox->setMargin(0);
 
-	m_pTreeWidget = new KviEventEditorTreeWidget(vbox);
+	m_pTreeWidget = new EventEditorTreeWidget(vbox);
 
 	QPushButton * pb = new QPushButton(__tr2qs_ctx("&Export All To...","editor"),vbox);
 	connect(pb,SIGNAL(clicked()),this,SLOT(exportAllEvents()));
@@ -120,30 +120,30 @@ KviEventEditor::KviEventEditor(QWidget * par)
 	m_pLastEditedItem = 0;
 }
 
-KviEventEditor::~KviEventEditor()
+EventEditor::~EventEditor()
 {
 	KviScriptEditor::destroyInstance(m_pEditor);
 }
 
-void KviEventEditor::oneTimeSetup()
+void EventEditor::oneTimeSetup()
 {
 	if(m_bOneTimeSetupDone)return;
 	m_bOneTimeSetupDone = true;
 
-	KviEventTreeWidgetItem * it;
+	EventEditorEventTreeWidgetItem * it;
 
 	for(unsigned int i = 0;i < KVI_KVS_NUM_APP_EVENTS;i++)
 	{
 		KviKvsEvent * e = KviKvsEventManager::instance()->appEvent(i);
 
-		it = new KviEventTreeWidgetItem(m_pTreeWidget,i,e->name(),e->parameterDescription());
+		it = new EventEditorEventTreeWidgetItem(m_pTreeWidget,i,e->name(),e->parameterDescription());
 		if(KviPointerList<KviKvsEventHandler> * l = e->handlers())
 		{
 			for(KviKvsEventHandler * s = l->first();s;s = l->next())
 			{
 				if(s->type() == KviKvsEventHandler::Script)
 				{
-					new KviEventHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(),
+					new EventEditorHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(),
 					((KviKvsScriptEventHandler *)s)->code(),((KviKvsScriptEventHandler *)s)->isEnabled());
 				}
 			}
@@ -158,20 +158,20 @@ void KviEventEditor::oneTimeSetup()
 	m_pContextPopup = new KviTalPopupMenu(this);
 	m_pTreeWidget->sortItems(0,Qt::AscendingOrder);
 }
-void KviEventEditor::eventHandlerDisabled(const QString &szHandler)
+void EventEditor::eventHandlerDisabled(const QString &szHandler)
 {
     QString szEventName=szHandler.split("::")[0];
     QString szHandlerName=szHandler.split("::")[1];
     qDebug("Handler %s of event %s : disabled",szHandlerName.toUtf8().data(),szEventName.toUtf8().data());
     for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
     {
-        KviEventTreeWidgetItem *pItem=(KviEventTreeWidgetItem*)m_pTreeWidget->topLevelItem(i);
+        EventEditorEventTreeWidgetItem *pItem=(EventEditorEventTreeWidgetItem*)m_pTreeWidget->topLevelItem(i);
         if(!KviQString::equalCI(szEventName,pItem->name())) continue;
         for(int j=0;j<pItem->childCount();j++)
         {
-            if(KviQString::equalCI(szHandlerName,((KviEventHandlerTreeWidgetItem *)pItem->child(j))->name()))
+            if(KviQString::equalCI(szHandlerName,((EventEditorHandlerTreeWidgetItem *)pItem->child(j))->name()))
             {
-                ((KviEventHandlerTreeWidgetItem *)pItem->child(j))->setEnabled(false);
+                ((EventEditorHandlerTreeWidgetItem *)pItem->child(j))->setEnabled(false);
                 return;
             }
 
@@ -180,7 +180,7 @@ void KviEventEditor::eventHandlerDisabled(const QString &szHandler)
 
 }
 
-KviEventEditorTreeWidget::KviEventEditorTreeWidget(QWidget * par)
+EventEditorTreeWidget::EventEditorTreeWidget(QWidget * par)
 : QTreeWidget(par)
 {
 	setColumnCount (1);
@@ -191,7 +191,7 @@ KviEventEditorTreeWidget::KviEventEditorTreeWidget(QWidget * par)
 	setAnimated(true);
 }
 
-void KviEventEditorTreeWidget::mousePressEvent (QMouseEvent *e)
+void EventEditorTreeWidget::mousePressEvent (QMouseEvent *e)
 {
 	if (e->button() == Qt::RightButton)
 	{
@@ -201,7 +201,7 @@ void KviEventEditorTreeWidget::mousePressEvent (QMouseEvent *e)
 	QTreeWidget::mousePressEvent(e);
 }
 
-void KviEventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt)
+void EventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt)
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 
@@ -211,7 +211,7 @@ void KviEventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt)
 		if(it->parent())
 		{
 			QString tmp;
-			if(!(((KviEventHandlerTreeWidgetItem *)it)->m_bEnabled))
+			if(!(((EventEditorHandlerTreeWidgetItem *)it)->m_bEnabled))
 				m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)),
 					__tr2qs_ctx("&Enable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled()));
@@ -239,7 +239,7 @@ void KviEventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt)
 	}
 }
 
-void KviEventEditor::getUniqueHandlerName(KviEventTreeWidgetItem *it,QString &buffer)
+void EventEditor::getUniqueHandlerName(EventEditorEventTreeWidgetItem *it,QString &buffer)
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 
@@ -254,9 +254,9 @@ void KviEventEditor::getUniqueHandlerName(KviEventTreeWidgetItem *it,QString &bu
 		bFound = false;
 
 		for(int i=0;i<it->childCount();i++)
-		//for(KviEventHandlerTreeWidgetItem * ch = (KviEventHandlerTreeWidgetItem *)(it->firstChild());ch;ch = (KviEventHandlerTreeWidgetItem *)ch->nextSibling())
+		//for(EventEditorHandlerTreeWidgetItem * ch = (EventEditorHandlerTreeWidgetItem *)(it->firstChild());ch;ch = (EventEditorHandlerTreeWidgetItem *)ch->nextSibling())
 		{
-			if(KviQString::equalCI(newName,((KviEventHandlerTreeWidgetItem *)it->child(i))->m_szName))
+			if(KviQString::equalCI(newName,((EventEditorHandlerTreeWidgetItem *)it->child(i))->m_szName))
 			{
 				bFound = true;
 				KviQString::sprintf(newName,"%Q_%d",&buffer,idx);
@@ -269,7 +269,7 @@ void KviEventEditor::getUniqueHandlerName(KviEventTreeWidgetItem *it,QString &bu
 	buffer = newName;
 }
 
-void KviEventEditor::addHandlerForCurrentEvent()
+void EventEditor::addHandlerForCurrentEvent()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 
@@ -283,15 +283,15 @@ void KviEventEditor::addHandlerForCurrentEvent()
 				it->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EVENT))));
 
 			QString buffer = __tr2qs_ctx("default","editor");
-			getUniqueHandlerName((KviEventTreeWidgetItem *)it,buffer);
-			QTreeWidgetItem * ch = new KviEventHandlerTreeWidgetItem(it,buffer,"",true);
+			getUniqueHandlerName((EventEditorEventTreeWidgetItem *)it,buffer);
+			QTreeWidgetItem * ch = new EventEditorHandlerTreeWidgetItem(it,buffer,"",true);
 			it->setExpanded(true);
 			ch->setSelected(true);
 		}
 	}
 }
 
-void KviEventEditor::removeCurrentHandler()
+void EventEditor::removeCurrentHandler()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(m_pLastEditedItem)
@@ -312,7 +312,7 @@ void KviEventEditor::removeCurrentHandler()
 	}
 }
 
-void KviEventEditor::toggleCurrentHandlerEnabled()
+void EventEditor::toggleCurrentHandlerEnabled()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(m_pLastEditedItem)
@@ -323,7 +323,7 @@ void KviEventEditor::toggleCurrentHandlerEnabled()
 	}
 }
 
-void KviEventEditor::commit()
+void EventEditor::commit()
 {
 	if(!m_bOneTimeSetupDone)return; // nothing to commit
 
@@ -342,15 +342,15 @@ void KviEventEditor::commit()
 			for(int j=0;j<ccount;j++)
 			{
 				QTreeWidgetItem * ch = it->child(j);
-				KviQString::sprintf(szContext,"%Q::%Q",&(((KviEventTreeWidgetItem *)it)->m_szName),&(((KviEventHandlerTreeWidgetItem *)ch)->m_szName));
+				KviQString::sprintf(szContext,"%Q::%Q",&(((EventEditorEventTreeWidgetItem *)it)->m_szName),&(((EventEditorHandlerTreeWidgetItem *)ch)->m_szName));
 				KviKvsScriptEventHandler * s = KviKvsScriptEventHandler::createInstance( // msvc workaround
-						((KviEventHandlerTreeWidgetItem *)ch)->m_szName,
+						((EventEditorHandlerTreeWidgetItem *)ch)->m_szName,
 						szContext,
-						((KviEventHandlerTreeWidgetItem *)ch)->m_szBuffer,
-						((KviEventHandlerTreeWidgetItem *)ch)->m_bEnabled
+						((EventEditorHandlerTreeWidgetItem *)ch)->m_szBuffer,
+						((EventEditorHandlerTreeWidgetItem *)ch)->m_bEnabled
 					);
 
-				KviKvsEventManager::instance()->addAppHandler(((KviEventTreeWidgetItem *)it)->m_uEventIdx,s);
+				KviKvsEventManager::instance()->addAppHandler(((EventEditorEventTreeWidgetItem *)it)->m_uEventIdx,s);
 			}
 		}
 	}
@@ -358,17 +358,17 @@ void KviEventEditor::commit()
 	g_pApp->saveAppEvents();
 }
 
-void KviEventEditor::saveLastEditedItem()
+void EventEditor::saveLastEditedItem()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(!m_pLastEditedItem)return;
-	((KviEventHandlerTreeWidgetItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor());
+	((EventEditorHandlerTreeWidgetItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor());
 	QString buffer = m_pNameEditor->text();
 	//not-so elaborate fix for #218, we'd better rework this
 	buffer.replace(QRegExp("[^A-Za-z0-9_]"), "");
 	if(!KviQString::equalCI(buffer,m_pLastEditedItem->m_szName))
 	{
-		getUniqueHandlerName((KviEventTreeWidgetItem *)(m_pLastEditedItem->parent()),buffer);
+		getUniqueHandlerName((EventEditorEventTreeWidgetItem *)(m_pLastEditedItem->parent()),buffer);
 	}
 
 	m_pLastEditedItem->setName(buffer);
@@ -378,7 +378,7 @@ void KviEventEditor::saveLastEditedItem()
 	m_pLastEditedItem->m_szBuffer = tmp;
 }
 
-void KviEventEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
+void EventEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	saveLastEditedItem();
@@ -393,36 +393,36 @@ void KviEventEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
 
 	if(it->parent())
 	{
-		m_pLastEditedItem = (KviEventHandlerTreeWidgetItem *)it;
+		m_pLastEditedItem = (EventEditorHandlerTreeWidgetItem *)it;
 		m_pNameEditor->setEnabled(true);
 		m_pNameEditor->setText(m_pLastEditedItem->name());
 		m_pEditor->setEnabled(true);
 		m_pEditor->setFocus();
 		m_pEditor->setText(m_pLastEditedItem->m_szBuffer);
-		m_pEditor->setCursorPosition(((KviEventHandlerTreeWidgetItem *)it)->cursorPosition());
+		m_pEditor->setCursorPosition(((EventEditorHandlerTreeWidgetItem *)it)->cursorPosition());
 	} else {
 		m_pLastEditedItem = 0;
 		m_pNameEditor->setEnabled(false);
 		m_pNameEditor->setText("");
 		m_pEditor->setEnabled(false);
-		QString parms = ((KviEventTreeWidgetItem *)it)->m_szParams;
+		QString parms = ((EventEditorEventTreeWidgetItem *)it)->m_szParams;
 		if(parms.isEmpty())parms = __tr2qs_ctx("none","editor");
 		KviCommandFormatter::indent(parms);
 		KviCommandFormatter::indent(parms);
 		QString tmp;
 		KviQString::sprintf(tmp,__tr2qs_ctx("\n\nEvent:\n%s\n\nParameters:\n%s","editor"),
-			((KviEventTreeWidgetItem *)it)->m_szName.toUtf8().data(),parms.toUtf8().data());
+			((EventEditorEventTreeWidgetItem *)it)->m_szName.toUtf8().data(),parms.toUtf8().data());
 		m_pEditor->setText(tmp);
 	}
 }
 
-void KviEventEditor::showEvent(QShowEvent *e)
+void EventEditor::showEvent(QShowEvent *e)
 {
 	oneTimeSetup();
 	QWidget::showEvent(e);
 }
 
-void KviEventEditor::getExportEventBuffer(QString &buffer,KviEventHandlerTreeWidgetItem * it)
+void EventEditor::getExportEventBuffer(QString &buffer,EventEditorHandlerTreeWidgetItem * it)
 {
 	if(!it->parent())return;
 
@@ -431,7 +431,7 @@ void KviEventEditor::getExportEventBuffer(QString &buffer,KviEventHandlerTreeWid
 	KviCommandFormatter::blockFromBuffer(szBuf);
 
 	buffer = "event(";
-	buffer += ((KviEventTreeWidgetItem *)(it->parent()))->m_szName;
+	buffer += ((EventEditorEventTreeWidgetItem *)(it->parent()))->m_szName;
 	buffer += ",";
 	buffer += it->m_szName;
 	buffer += ")\n";
@@ -442,13 +442,13 @@ void KviEventEditor::getExportEventBuffer(QString &buffer,KviEventHandlerTreeWid
 	{
 		buffer += "\n";
 		buffer += "eventctl -d ";
-		buffer += ((KviEventTreeWidgetItem *)(it->parent()))->m_szName;
+		buffer += ((EventEditorEventTreeWidgetItem *)(it->parent()))->m_szName;
 		buffer += " ";
 		buffer += it->m_szName;
 	}
 }
 
-void KviEventEditor::exportCurrentHandler()
+void EventEditor::exportCurrentHandler()
 {
 	if(!m_pLastEditedItem)return;
 	saveLastEditedItem();
@@ -456,7 +456,7 @@ void KviEventEditor::exportCurrentHandler()
 
 	QString szName = QDir::homePath();
 	if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
-	szName += ((KviEventTreeWidgetItem *)(m_pLastEditedItem->parent()))->m_szName;
+	szName += ((EventEditorEventTreeWidgetItem *)(m_pLastEditedItem->parent()))->m_szName;
 	szName += ".";
 	szName += m_pLastEditedItem->m_szName;
 	szName += ".kvs";
@@ -474,7 +474,7 @@ void KviEventEditor::exportCurrentHandler()
 	}
 }
 
-void KviEventEditor::exportAllEvents()
+void EventEditor::exportAllEvents()
 {
 	saveLastEditedItem();
 
@@ -483,13 +483,13 @@ void KviEventEditor::exportAllEvents()
 	int count=m_pTreeWidget->topLevelItemCount();
 	for (int i=0;i<count;i++)
 	{
-		KviEventTreeWidgetItem * it = (KviEventTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		EventEditorEventTreeWidgetItem * it = (EventEditorEventTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 
 		int ccount = it->childCount();
 
 		for(int j=0;j<ccount;j++)
 		{
-			KviEventHandlerTreeWidgetItem * item = (KviEventHandlerTreeWidgetItem *) it->child(j);
+			EventEditorHandlerTreeWidgetItem * item = (EventEditorHandlerTreeWidgetItem *) it->child(j);
 
 			QString tmp;
 			getExportEventBuffer(tmp,item);
@@ -513,13 +513,13 @@ void KviEventEditor::exportAllEvents()
 }
 
 
-KviEventEditorWindow::KviEventEditorWindow(KviMainWindow * lpFrm)
+EventEditorWindow::EventEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"eventeditor",0)
 {
 	g_pEventEditorWindow = this;
 
 	QGridLayout * g = new QGridLayout();
-	m_pEditor = new KviEventEditor(this);
+	m_pEditor = new EventEditor(this);
 	g->addWidget(m_pEditor,0,0,1,4);
 
 	QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this);
@@ -542,43 +542,43 @@ KviEventEditorWindow::KviEventEditorWindow(KviMainWindow * lpFrm)
 	setLayout(g);
 }
 
-KviEventEditorWindow::~KviEventEditorWindow()
+EventEditorWindow::~EventEditorWindow()
 {
 	g_pEventEditorWindow = 0;
 }
 
-void KviEventEditorWindow::okClicked()
+void EventEditorWindow::okClicked()
 {
 	m_pEditor->commit();
 	close();
 }
 
-void KviEventEditorWindow::applyClicked()
+void EventEditorWindow::applyClicked()
 {
 	m_pEditor->commit();
 }
 
-void KviEventEditorWindow::cancelClicked()
+void EventEditorWindow::cancelClicked()
 {
 	close();
 }
 
-QPixmap * KviEventEditorWindow::myIconPtr()
+QPixmap * EventEditorWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_EVENT);
 }
 
-void KviEventEditorWindow::fillCaptionBuffers()
+void EventEditorWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Event Editor","editor");
 }
 
-void KviEventEditorWindow::getConfigGroupName(QString &szName)
+void EventEditorWindow::getConfigGroupName(QString &szName)
 {
 	szName = "eventeditor";
 }
 
-void KviEventEditorWindow::saveProperties(KviConfigurationFile *) //cfg
+void EventEditorWindow::saveProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
@@ -589,7 +589,7 @@ void KviEventEditorWindow::saveProperties(KviConfigurationFile *) //cfg
 */
 }
 
-void KviEventEditorWindow::loadProperties(KviConfigurationFile *) //cfg
+void EventEditorWindow::loadProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/eventeditor/eventeditor.h b/src/modules/eventeditor/EventEditorWindow.h
index 1916247da..cd0b0f105 100644
--- a/src/modules/eventeditor/eventeditor.h
+++ b/src/modules/eventeditor/EventEditorWindow.h
@@ -2,7 +2,7 @@
 #define _EVENTEDITOR_H_
 //=============================================================================
 //
-//   File : eventeditor.h
+//   File : EventEditorWindow.h
 //   Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -34,21 +34,21 @@
 
 class KviScriptEditor;
 
-class KviEventTreeWidgetItem : public QTreeWidgetItem
+class EventEditorEventTreeWidgetItem : public QTreeWidgetItem
 {
 public:
 	unsigned int m_uEventIdx;
 	QString m_szName;
 	QString m_szParams;
 public:
-	KviEventTreeWidgetItem(QTreeWidget * par,unsigned int uEvIdx,const QString &name,const QString &params);
-	~KviEventTreeWidgetItem() {};
+	EventEditorEventTreeWidgetItem(QTreeWidget * par,unsigned int uEvIdx,const QString &name,const QString &params);
+	~EventEditorEventTreeWidgetItem() {};
 public:
 	void setName(const QString &szName);
 	QString name() const { return m_szName; };
 };
 
-class KviEventHandlerTreeWidgetItem : public QTreeWidgetItem
+class EventEditorHandlerTreeWidgetItem : public QTreeWidgetItem
 {
 public:
 	QString m_szName;
@@ -56,8 +56,8 @@ public:
 	bool   m_bEnabled;
 	int m_cPos;
 public:
-	KviEventHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString &name,const QString &buffer,bool bEnabled);
-	~KviEventHandlerTreeWidgetItem() {};
+	EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString &name,const QString &buffer,bool bEnabled);
+	~EventEditorHandlerTreeWidgetItem() {};
 public:
 	const int & cursorPosition(){return m_cPos; };
 	void setCursorPosition(const int &cPos){qDebug("set cursor to %d",cPos); m_cPos = cPos; };
@@ -67,12 +67,12 @@ public:
 	void setEnabled(const bool bEnabled);
 };
 
-class KviEventEditorTreeWidget : public QTreeWidget
+class EventEditorTreeWidget : public QTreeWidget
 {
 	Q_OBJECT
 public:
-	KviEventEditorTreeWidget(QWidget*);
-	~KviEventEditorTreeWidget(){};
+	EventEditorTreeWidget(QWidget*);
+	~EventEditorTreeWidget(){};
 protected:
 
 	void mousePressEvent (QMouseEvent *e);
@@ -80,24 +80,24 @@ signals:
 	void rightButtonPressed(QTreeWidgetItem *,QPoint);
 };
 
-class KviEventEditor : public QWidget
+class EventEditor : public QWidget
 {
 	Q_OBJECT
 public:
-	KviEventEditor(QWidget * par);
-	~KviEventEditor();
+	EventEditor(QWidget * par);
+	~EventEditor();
 public:
 	KviScriptEditor * m_pEditor;
-	KviEventEditorTreeWidget       * m_pTreeWidget;
+	EventEditorTreeWidget       * m_pTreeWidget;
 	QLineEdit       * m_pNameEditor;
 	KviTalPopupMenu      * m_pContextPopup;
-	KviEventHandlerTreeWidgetItem * m_pLastEditedItem;
+	EventEditorHandlerTreeWidgetItem * m_pLastEditedItem;
 	bool              m_bOneTimeSetupDone;
 public:
 	void commit();
 	void saveLastEditedItem();
-	void getUniqueHandlerName(KviEventTreeWidgetItem *it,QString &buffer);
-	void getExportEventBuffer(QString &szBuffer,KviEventHandlerTreeWidgetItem * it);
+	void getUniqueHandlerName(EventEditorEventTreeWidgetItem *it,QString &buffer);
+	void getExportEventBuffer(QString &szBuffer,EventEditorHandlerTreeWidgetItem * it);
 protected slots:
 	void currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *);
 	void itemPressed(QTreeWidgetItem *it,const QPoint &pnt);
@@ -113,14 +113,14 @@ private:
 	void oneTimeSetup();
 };
 
-class KviEventEditorWindow : public KviWindow
+class EventEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviEventEditorWindow(KviMainWindow * lpFrm);
-	~KviEventEditorWindow();
+	EventEditorWindow(KviMainWindow * lpFrm);
+	~EventEditorWindow();
 protected:
-	KviEventEditor * m_pEditor;
+	EventEditor * m_pEditor;
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp
index 61fce5f16..5f69b618f 100644
--- a/src/modules/eventeditor/libkvieventeditor.cpp
+++ b/src/modules/eventeditor/libkvieventeditor.cpp
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "eventeditor.h"
+#include "EventEditorWindow.h"
 
 #include "KviModule.h"
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
-KviEventEditorWindow * g_pEventEditorWindow = 0;
+EventEditorWindow * g_pEventEditorWindow = 0;
 
 
 /*
@@ -49,7 +49,7 @@ static bool eventeditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	if(!g_pEventEditorWindow)
 	{
-		g_pEventEditorWindow = new KviEventEditorWindow(c->window()->frame());
+		g_pEventEditorWindow = new EventEditorWindow(c->window()->frame());
 		c->window()->frame()->addWindow(g_pEventEditorWindow);
 	}
 
diff --git a/src/modules/filetransferwindow/CMakeLists.txt b/src/modules/filetransferwindow/CMakeLists.txt
index 1a1da2d39..bc408b8dc 100644
--- a/src/modules/filetransferwindow/CMakeLists.txt
+++ b/src/modules/filetransferwindow/CMakeLists.txt
@@ -3,12 +3,12 @@
 SUBDIRS(caps)
 
 SET(kvifiletransferwindow_MOC_HDRS
-	filetransferwindow.h
+	FileTransferWindow.h
 )
 
 SET(kvifiletransferwindow_SRCS
 	libkvifiletransferwindow.cpp
-	filetransferwindow.cpp
+	FileTransferWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 1ef3b0bad..a4bd25cce 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : filetransferwindow.cpp
+//   File : FileTransferWindow.cpp
 //   Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "filetransferwindow.h"
+#include "FileTransferWindow.h"
 
 #include "kvi_debug.h"
 #include "KviIconManager.h"
@@ -66,10 +66,10 @@
 
 #define FILETRANSFERW_CELLSIZE 70
 
-extern KviFileTransferWindow * g_pFileTransferWindow;
+extern FileTransferWindow * g_pFileTransferWindow;
 
 
-KviFileTransferItem::KviFileTransferItem(KviFileTransferWidget * v,KviFileTransfer * t)
+FileTransferItem::FileTransferItem(FileTransferWidget * v,KviFileTransfer * t)
 : KviTalTableWidgetItemEx(v)
 {
 	m_pTransfer = t;
@@ -82,14 +82,14 @@ KviFileTransferItem::KviFileTransferItem(KviFileTransferWidget * v,KviFileTransf
 	tableWidget()->setRowHeight( row(), FILETRANSFERW_CELLSIZE );
 }
 
-KviFileTransferItem::~KviFileTransferItem()
+FileTransferItem::~FileTransferItem()
 {
 	m_pTransfer->setDisplayItem(0);
 	delete col1Item;
 	delete col2Item;
 }
 
-void KviFileTransferItem::displayUpdate()
+void FileTransferItem::displayUpdate()
 {
 	//FIXME this hurts
 	int dummy = (int) time(NULL);
@@ -98,7 +98,7 @@ void KviFileTransferItem::displayUpdate()
 	tableWidget()->model()->setData(tableWidget()->model()->index(row(),2), dummy, Qt::DisplayRole);
 }
 
-QString KviFileTransferItem::key(int,bool) const
+QString FileTransferItem::key(int,bool) const
 {
 	QString ret;
 	ret.setNum(m_pTransfer->id());
@@ -114,7 +114,7 @@ QString KviFileTransferItem::key(int,bool) const
 
 
 
-KviFileTransferWidget::KviFileTransferWidget(QWidget * pParent)
+FileTransferWidget::FileTransferWidget(QWidget * pParent)
 : KviTalTableWidget(pParent)
 {
 	//hide the header
@@ -147,7 +147,7 @@ KviFileTransferWidget::KviFileTransferWidget(QWidget * pParent)
 	viewport()->setFocusPolicy(Qt::NoFocus);
 }
 
-void KviFileTransferWidget::mousePressEvent (QMouseEvent *e)
+void FileTransferWidget::mousePressEvent (QMouseEvent *e)
 {
 	if (e->button() == Qt::RightButton)
 	{
@@ -156,27 +156,27 @@ void KviFileTransferWidget::mousePressEvent (QMouseEvent *e)
 		QTableWidgetItem *clicked = itemAt(e->pos());
 		if(clicked)
 		{
-			KviFileTransferItem *i = (KviFileTransferItem*) item(clicked->row(),0);
+			FileTransferItem *i = (FileTransferItem*) item(clicked->row(),0);
 			if (i) emit rightButtonPressed(i, QCursor::pos());
 		}
 	}
 	QTableWidget::mousePressEvent(e);
 }
 
-void KviFileTransferWidget::mouseDoubleClickEvent (QMouseEvent *e)
+void FileTransferWidget::mouseDoubleClickEvent (QMouseEvent *e)
 {
 	// we have 3 items: the one on the first column is the real one (has a transfer() member)
 	// others are just fakes
 	QTableWidgetItem *clicked = itemAt(e->pos());
 	if(clicked)
 	{
-		KviFileTransferItem *i = (KviFileTransferItem*) item(clicked->row(),0);
+		FileTransferItem *i = (FileTransferItem*) item(clicked->row(),0);
 		if (i) emit doubleClicked(i,QCursor::pos());
 	}
 	QTableWidget::mouseDoubleClickEvent(e);
 }
 
-void KviFileTransferWidget::paintEvent(QPaintEvent * event)
+void FileTransferWidget::paintEvent(QPaintEvent * event)
 {
 	QPainter *p = new QPainter(viewport());
 	QStyleOptionViewItem option = viewOptions();
@@ -208,14 +208,14 @@ void KviFileTransferWidget::paintEvent(QPaintEvent * event)
 	KviTalTableWidget::paintEvent(event);
 }
 
-void KviFileTransferItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index) const
+void FileTransferItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
 	//FIXME not exactly model/view coding style.. but we need to access data on the item by now
-	KviFileTransferWidget* tableWidget = (KviFileTransferWidget*)parent();
-	KviFileTransferItem* item = (KviFileTransferItem*) tableWidget->itemFromIndex(index);
+	FileTransferWidget* tableWidget = (FileTransferWidget*)parent();
+	FileTransferItem* item = (FileTransferItem*) tableWidget->itemFromIndex(index);
 
 	if(!item) return;
-	KviFileTransfer* transfer = ((KviFileTransferItem*)tableWidget->item(item->row(), 0))->transfer();
+	KviFileTransfer* transfer = ((FileTransferItem*)tableWidget->item(item->row(), 0))->transfer();
 
 
 	p->setFont(option.font);
@@ -231,13 +231,13 @@ void KviFileTransferItemDelegate::paint(QPainter * p, const QStyleOptionViewItem
 	transfer->displayPaint(p, index.column(), option.rect);
 }
 
-QSize KviFileTransferItemDelegate::sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const
+QSize FileTransferItemDelegate::sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const
 {
 	// FIXME fixed width
-	return QSize(((KviFileTransferWidget*)parent())->viewport()->size().width(), 68);
+	return QSize(((FileTransferWidget*)parent())->viewport()->size().width(), 68);
 }
 
-KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
+FileTransferWindow::FileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"file transfer window",0), KviModuleExtension(d)
 {
 	g_pFileTransferWindow = this;
@@ -258,10 +258,10 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 	m_pVertSplitter->setObjectName("transferwindow_vsplitter");
 	m_pVertSplitter->setChildrenCollapsible(false);
 
-	m_pTableWidget  = new KviFileTransferWidget(m_pVertSplitter);
+	m_pTableWidget  = new FileTransferWidget(m_pVertSplitter);
 
 	//ad-hoc itemdelegate for this view
-	m_pItemDelegate = new KviFileTransferItemDelegate(m_pTableWidget);
+	m_pItemDelegate = new FileTransferItemDelegate(m_pTableWidget);
 	m_pTableWidget->setItemDelegate(m_pItemDelegate);
 
 /*
@@ -277,9 +277,9 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 
 	m_pTableWidget->installEventFilter(this);
 
-	connect(m_pTableWidget,SIGNAL(rightButtonPressed(KviFileTransferItem *,QPoint)),
-		this,SLOT(rightButtonPressed(KviFileTransferItem *,QPoint)));
-	connect(m_pTableWidget,SIGNAL(doubleClicked(KviFileTransferItem *,const QPoint &)),this,SLOT(doubleClicked(KviFileTransferItem *,const QPoint &)));
+	connect(m_pTableWidget,SIGNAL(rightButtonPressed(FileTransferItem *,QPoint)),
+		this,SLOT(rightButtonPressed(FileTransferItem *,QPoint)));
+	connect(m_pTableWidget,SIGNAL(doubleClicked(FileTransferItem *,const QPoint &)),this,SLOT(doubleClicked(FileTransferItem *,const QPoint &)));
 	fillTransferView();
 
 	connect(KviFileTransferManager::instance(),SIGNAL(transferRegistered(KviFileTransfer *)),this,SLOT(transferRegistered(KviFileTransfer *)));
@@ -290,17 +290,17 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv
 	m_pTimer->start(2000);
 }
 
-KviFileTransferWindow::~KviFileTransferWindow()
+FileTransferWindow::~FileTransferWindow()
 {
 	KviFileTransferManager::instance()->setTransferWindow(0);
 	g_pFileTransferWindow = 0;
 }
 
-bool KviFileTransferWindow::eventFilter( QObject *obj, QEvent *ev )
+bool FileTransferWindow::eventFilter( QObject *obj, QEvent *ev )
 {
 	if( ( ev->type() == QEvent::KeyPress ) )
 	{
-		//m_pTableWidget could not have been initialized yet when KviFileTransferWindow
+		//m_pTableWidget could not have been initialized yet when FileTransferWindow
 		//will receive the first events.. but it will surely be on a keypress event
 		if(obj==m_pTableWidget)
 		{
@@ -320,41 +320,41 @@ bool KviFileTransferWindow::eventFilter( QObject *obj, QEvent *ev )
 	return KviWindow::eventFilter( obj, ev );
 }
 
-void KviFileTransferWindow::fontChange(const QFont &oldFont)
+void FileTransferWindow::fontChange(const QFont &oldFont)
 {
 	QFontMetrics fm(font());
 	m_iLineSpacing = fm.lineSpacing();
 	KviWindow::fontChange(oldFont);
 }
 
-void KviFileTransferWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt)
+void FileTransferWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt)
 {
-	KviFileTransferItem * it = (KviFileTransferItem *)m_pTableWidget->itemAt(pnt);
+	FileTransferItem * it = (FileTransferItem *)m_pTableWidget->itemAt(pnt);
 	if(!it)return;
 	QString txt = it->transfer()->tipText();
 	tip->tip(m_pTableWidget->visualItemRect(it),txt);
 }
 
-void KviFileTransferWindow::fillTransferView()
+void FileTransferWindow::fillTransferView()
 {
 	KviPointerList<KviFileTransfer> * l = KviFileTransferManager::instance()->transferList();
 	if(!l)return;
-	KviFileTransferItem * it;
+	FileTransferItem * it;
 	for(KviFileTransfer * t = l->first();t;t = l->next())
 	{
-		it = new KviFileTransferItem(m_pTableWidget,t);
+		it = new FileTransferItem(m_pTableWidget,t);
 		t->setDisplayItem(it);
 	}
 }
 
-KviFileTransferItem * KviFileTransferWindow::findItem(KviFileTransfer * t)
+FileTransferItem * FileTransferWindow::findItem(KviFileTransfer * t)
 {
 	int i;
-	KviFileTransferItem * it;
+	FileTransferItem * it;
 
 	for(i=0;i<m_pTableWidget->rowCount();i++)
 	{
-		it = (KviFileTransferItem *)m_pTableWidget->item(i,0);
+		it = (FileTransferItem *)m_pTableWidget->item(i,0);
 		if(!it) continue;
 
 		if(it->transfer() == t)
@@ -363,15 +363,15 @@ KviFileTransferItem * KviFileTransferWindow::findItem(KviFileTransfer * t)
 	return 0;
 }
 
-void KviFileTransferWindow::transferRegistered(KviFileTransfer * t)
+void FileTransferWindow::transferRegistered(KviFileTransfer * t)
 {
-	new KviFileTransferItem(m_pTableWidget,t);
+	new FileTransferItem(m_pTableWidget,t);
 	//t->setDisplayItem(it);
 }
 
-void KviFileTransferWindow::transferUnregistering(KviFileTransfer * t)
+void FileTransferWindow::transferUnregistering(KviFileTransfer * t)
 {
-	KviFileTransferItem * it = findItem(t);
+	FileTransferItem * it = findItem(t);
 	//t->setDisplayItem(0);
 	if(it)
 	{
@@ -380,12 +380,12 @@ void KviFileTransferWindow::transferUnregistering(KviFileTransfer * t)
 	}
 }
 
-void KviFileTransferWindow::doubleClicked(KviFileTransferItem *it,const QPoint &)
+void FileTransferWindow::doubleClicked(FileTransferItem *it,const QPoint &)
 {
 	if(it) openLocalFile();
 }
 
-void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPoint &pnt)
+void FileTransferWindow::rightButtonPressed(FileTransferItem *it,const QPoint &pnt)
 {
 	if(!m_pContextPopup)m_pContextPopup = new KviTalPopupMenu(this);
 	if(!m_pLocalFilePopup)m_pLocalFilePopup = new KviTalPopupMenu(this);
@@ -401,7 +401,7 @@ void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPo
 
 	if(it)
 	{
-		KviFileTransferItem * i = (KviFileTransferItem *)it;
+		FileTransferItem * i = (FileTransferItem *)it;
 		if(i->transfer())
 		{
 
@@ -498,11 +498,11 @@ void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPo
 
 	bool bHaveTerminated = false;
 	int i;
-	KviFileTransferItem * item;
+	FileTransferItem * item;
 
 	for(i=0;i<m_pTableWidget->rowCount();i++)
 	{
-		item = (KviFileTransferItem *)m_pTableWidget->item(i,0);
+		item = (FileTransferItem *)m_pTableWidget->item(i,0);
 		if(!item)
 			continue;
 
@@ -527,16 +527,16 @@ void KviFileTransferWindow::rightButtonPressed(KviFileTransferItem *it,const QPo
 }
 
 
-KviFileTransfer * KviFileTransferWindow::selectedTransfer()
+KviFileTransfer * FileTransferWindow::selectedTransfer()
 {
 	if(m_pTableWidget->selectedItems().count() == 0) return 0;
-	KviFileTransferItem * it = (KviFileTransferItem *)m_pTableWidget->selectedItems().first();
+	FileTransferItem * it = (FileTransferItem *)m_pTableWidget->selectedItems().first();
 	if(!it)return 0;
-	KviFileTransferItem * i = (KviFileTransferItem *)it;
+	FileTransferItem * i = (FileTransferItem *)it;
 	return i->transfer();
 }
 
-void KviFileTransferWindow::openFilePopupActivated(int id)
+void FileTransferWindow::openFilePopupActivated(int id)
 {
 #ifdef COMPILE_KDE_SUPPORT
 	int ip = m_pOpenFilePopup->itemParameter(id);
@@ -569,7 +569,7 @@ void KviFileTransferWindow::openFilePopupActivated(int id)
 #endif //COMPILE_KDE_SUPPORT
 }
 
-void KviFileTransferWindow::openLocalFileTerminal()
+void FileTransferWindow::openLocalFileTerminal()
 {
 //-| Grifisx & Noldor |-
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -604,7 +604,7 @@ void KviFileTransferWindow::openLocalFileTerminal()
 #endif
 }
 
-void KviFileTransferWindow::deleteLocalFile()
+void FileTransferWindow::deleteLocalFile()
 {
 	KviFileTransfer * t = selectedTransfer();
 	if(!t)return;
@@ -624,7 +624,7 @@ void KviFileTransferWindow::deleteLocalFile()
 			__tr2qs_ctx("OK","filetransferwindow"));
 }
 
-void KviFileTransferWindow::openLocalFile()
+void FileTransferWindow::openLocalFile()
 {
 //-| Grifisx & Noldor |-
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -661,7 +661,7 @@ void KviFileTransferWindow::openLocalFile()
 #endif
 }
 
-void KviFileTransferWindow::openLocalFileWith()
+void FileTransferWindow::openLocalFileWith()
 {
 //-| Grifisx & Noldor |-
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -689,7 +689,7 @@ void KviFileTransferWindow::openLocalFileWith()
 #endif
 }
 
-void KviFileTransferWindow::copyLocalFileToClipboard()
+void FileTransferWindow::copyLocalFileToClipboard()
 {
 	KviFileTransfer * t = selectedTransfer();
 	if(!t)return;
@@ -698,7 +698,7 @@ void KviFileTransferWindow::copyLocalFileToClipboard()
 	QApplication::clipboard()->setText(tmp);
 }
 
-void KviFileTransferWindow::openLocalFileFolder()
+void FileTransferWindow::openLocalFileFolder()
 {
 //-| Grifisx & Noldor|-
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -735,16 +735,16 @@ void KviFileTransferWindow::openLocalFileFolder()
 #endif
 }
 
-void KviFileTransferWindow::heartbeat()
+void FileTransferWindow::heartbeat()
 {
 	int i;
 	QModelIndex index;
-	KviFileTransferItem* it;
+	FileTransferItem* it;
 	int dummy = (int) time(NULL);
 
 	for(i=0;i<=m_pTableWidget->rowCount();i++)
 	{
-		it = (KviFileTransferItem *)m_pTableWidget->item(i,0);
+		it = (FileTransferItem *)m_pTableWidget->item(i,0);
 
 		if(!it)
 			continue;
@@ -758,17 +758,17 @@ void KviFileTransferWindow::heartbeat()
 	}
 }
 
-void KviFileTransferWindow::clearAll()
+void FileTransferWindow::clearAll()
 {
 	QString tmp;
 
 	bool bHaveAllTerminated = true;
 	int i;
-	KviFileTransferItem * item;
+	FileTransferItem * item;
 
 	for(i=0;i<m_pTableWidget->rowCount();i++)
 	{
-		item = (KviFileTransferItem *)m_pTableWidget->item(i,0);
+		item = (FileTransferItem *)m_pTableWidget->item(i,0);
 		if(!item)
 			continue;
 
@@ -789,37 +789,37 @@ void KviFileTransferWindow::clearAll()
 	KviFileTransferManager::instance()->killAllTransfers();
 }
 
-void KviFileTransferWindow::clearTerminated()
+void FileTransferWindow::clearTerminated()
 {
 	KviFileTransferManager::instance()->killTerminatedTransfers();
 }
 
-void KviFileTransferWindow::getBaseLogFileName(QString &buffer)
+void FileTransferWindow::getBaseLogFileName(QString &buffer)
 {
 	buffer.sprintf("FILETRANSFER");
 }
 
-QPixmap * KviFileTransferWindow::myIconPtr()
+QPixmap * FileTransferWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_FILETRANSFER);
 }
 
-void KviFileTransferWindow::resizeEvent(QResizeEvent *)
+void FileTransferWindow::resizeEvent(QResizeEvent *)
 {
 	m_pSplitter->setGeometry(0,0,width(),height());
 }
 
-QSize KviFileTransferWindow::sizeHint() const
+QSize FileTransferWindow::sizeHint() const
 {
 	return m_pSplitter->sizeHint();
 }
 
-void KviFileTransferWindow::fillCaptionBuffers()
+void FileTransferWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("File Transfers","filetransferwindow");
 }
 
-void KviFileTransferWindow::die()
+void FileTransferWindow::die()
 {
 	close();
 }
@@ -828,7 +828,7 @@ void KviFileTransferWindow::die()
 
 //#warning "Load & save properties of this kind of window"
 
-//void KviFileTransferWindow::saveProperties()
+//void FileTransferWindow::saveProperties()
 //{
 //	KviWindowProperty p;
 //	p.rect = externalGeometry();
@@ -845,7 +845,7 @@ void KviFileTransferWindow::die()
 //	g_pOptions->m_pWinPropertiesList->setProperty(caption(),&p);
 //}
 //
-//void KviFileTransferWindow::setProperties(KviWindowProperty *p)
+//void FileTransferWindow::setProperties(KviWindowProperty *p)
 //{
 //	QValueList<int> l;
 //	l.append(p->splitWidth1);
@@ -855,12 +855,12 @@ void KviFileTransferWindow::die()
 //	m_pIrcView->setShowImages(p->imagesVisible);
 //}
 
-void KviFileTransferWindow::applyOptions()
+void FileTransferWindow::applyOptions()
 {
 	m_pIrcView->applyOptions();
 	KviWindow::applyOptions();
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_filetransferwindow.moc"
+#include "m_FileTransferWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/FileTransferWindow.h
index a32a6c220..2fcac8689 100644
--- a/src/modules/filetransferwindow/filetransferwindow.h
+++ b/src/modules/filetransferwindow/FileTransferWindow.h
@@ -2,7 +2,7 @@
 #define _FILETRANSFERWINDOW_H_
 //=============================================================================
 //
-//   File : filetransferwindow.h
+//   File : FileTransferWindow.h
 //   Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -39,31 +39,31 @@
 #include <QTimer>
 #include <QPixmap>
 
-class KviFileTransferItem;
+class FileTransferItem;
 
-class KviFileTransferWidget : public KviTalTableWidget
+class FileTransferWidget : public KviTalTableWidget
 {
-	friend class KviFileTransferItemDelegate;
+	friend class FileTransferItemDelegate;
 	Q_OBJECT
 	Q_PROPERTY(int TransparencyCapable READ dummyRead)
 public:
-	KviFileTransferWidget(QWidget * pParent);
-	~KviFileTransferWidget() {};
+	FileTransferWidget(QWidget * pParent);
+	~FileTransferWidget() {};
 	void paintEvent(QPaintEvent * event);
 	int dummyRead() const { return 0; };
 protected:
 	void mousePressEvent (QMouseEvent *e);
 	void mouseDoubleClickEvent (QMouseEvent *e);
 signals:
-	void rightButtonPressed(KviFileTransferItem *,QPoint pnt);
-	void doubleClicked(KviFileTransferItem *,QPoint pnt);
+	void rightButtonPressed(FileTransferItem *,QPoint pnt);
+	void doubleClicked(FileTransferItem *,QPoint pnt);
 };
 
-class KviFileTransferItem : public KviTalTableWidgetItemEx
+class FileTransferItem : public KviTalTableWidgetItemEx
 {
 public:
-	KviFileTransferItem(KviFileTransferWidget * v,KviFileTransfer * t);
-	~KviFileTransferItem();
+	FileTransferItem(FileTransferWidget * v,KviFileTransfer * t);
+	~FileTransferItem();
 protected:
 	KviFileTransfer * m_pTransfer;
 	KviTalTableWidgetItem * col1Item; //item on the second column
@@ -74,28 +74,28 @@ public:
 	virtual void displayUpdate();
 };
 
-class KviFileTransferItemDelegate : public KviTalIconAndRichTextItemDelegate
+class FileTransferItemDelegate : public KviTalIconAndRichTextItemDelegate
 {
 	Q_OBJECT
 public:
-	KviFileTransferItemDelegate(QAbstractItemView * pWidget=0)
+	FileTransferItemDelegate(QAbstractItemView * pWidget=0)
 		: KviTalIconAndRichTextItemDelegate(pWidget) {};
-	~KviFileTransferItemDelegate(){};
+	~FileTransferItemDelegate(){};
 	 QSize sizeHint(const QStyleOptionViewItem &option,const QModelIndex &index) const;
 	void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
 };
 
-class KviFileTransferWindow : public KviWindow, public KviModuleExtension
+class FileTransferWindow : public KviWindow, public KviModuleExtension
 {
-	friend class KviFileTransferItem;
-	friend class KviFileTransferItemDelegate;
+	friend class FileTransferItem;
+	friend class FileTransferItemDelegate;
 	Q_OBJECT
 public:
-	KviFileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm);
-	~KviFileTransferWindow();
+	FileTransferWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm);
+	~FileTransferWindow();
 protected:
 	QSplitter		* m_pVertSplitter;
-	KviFileTransferWidget	* m_pTableWidget;
+	FileTransferWidget	* m_pTableWidget;
 	QAbstractItemDelegate	* m_pItemDelegate;
 	KviTalPopupMenu		* m_pContextPopup;
 	KviTalPopupMenu		* m_pLocalFilePopup;
@@ -110,7 +110,7 @@ protected:
 	virtual void applyOptions();
 	virtual void resizeEvent(QResizeEvent *e);
 	virtual void getBaseLogFileName(QString &buffer);
-	KviFileTransferItem * findItem(KviFileTransfer * t);
+	FileTransferItem * findItem(KviFileTransfer * t);
 	void fillTransferView();
 	KviFileTransfer * selectedTransfer();
 	virtual void fontChange(const QFont &oldFont);
@@ -121,8 +121,8 @@ public:
 protected slots:
 	void transferRegistered(KviFileTransfer *t);
 	void transferUnregistering(KviFileTransfer *t);
-	void rightButtonPressed(KviFileTransferItem *it,const QPoint &pnt);
-	void doubleClicked(KviFileTransferItem *it,const QPoint &pnt);
+	void rightButtonPressed(FileTransferItem *it,const QPoint &pnt);
+	void doubleClicked(FileTransferItem *it,const QPoint &pnt);
 	void heartbeat();
 	void clearTerminated();
 	void clearAll();
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 35040e431..a6cddb5f8 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -21,7 +21,7 @@
 //
 //=============================================================================
 
-#include "filetransferwindow.h"
+#include "FileTransferWindow.h"
 
 #include "KviModule.h"
 #include "KviApplication.h"
@@ -32,7 +32,7 @@
 
 #include <QSplitter>
 
-KviFileTransferWindow * g_pFileTransferWindow = 0;
+FileTransferWindow * g_pFileTransferWindow = 0;
 
 static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensionAllocStruct * s)
 {
@@ -55,7 +55,7 @@ static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensio
 			}
 		}
 
-		g_pFileTransferWindow = new KviFileTransferWindow(s->pDescriptor,g_pFrame);
+		g_pFileTransferWindow = new FileTransferWindow(s->pDescriptor,g_pFrame);
 		g_pFrame->addWindow(g_pFileTransferWindow,!bCreateMinimized);
 		if(bCreateMinimized)g_pFileTransferWindow->minimize();
 		return g_pFileTransferWindow;
diff --git a/src/modules/help/CMakeLists.txt b/src/modules/help/CMakeLists.txt
index ac9d04d02..567f94e88 100644
--- a/src/modules/help/CMakeLists.txt
+++ b/src/modules/help/CMakeLists.txt
@@ -1,16 +1,16 @@
 # CMakeLists for src/modules/help
 
 SET(kvihelp_MOC_HDRS
-	helpwidget.h
-	helpwindow.h
-	index.h
+	HelpWidget.h
+	HelpWindow.h
+	HelpIndex.h
 )
 
 SET(kvihelp_SRCS
 	libkvihelp.cpp
-	helpwidget.cpp
-	helpwindow.cpp
-	index.cpp
+	HelpWidget.cpp
+	HelpWindow.cpp
+	HelpIndex.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/help/index.cpp b/src/modules/help/HelpIndex.cpp
index 0bd2a0033..5d9ddc062 100644
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/HelpIndex.cpp
@@ -35,7 +35,7 @@
 **
 ****************************************************************************/
 
-#include "index.h"
+#include "HelpIndex.h"
 
 #include <QFile>
 #include <QDir>
@@ -75,7 +75,7 @@ QDataStream &operator<<( QDataStream &s, const Document &l )
     return s;
 }
 
-Index::Index( const QString &dp, const QString &hp )
+HelpIndex::HelpIndex( const QString &dp, const QString &hp )
     : QObject( 0 ), docPath( dp )
 {
     Q_UNUSED(hp);
@@ -91,7 +91,7 @@ Index::Index( const QString &dp, const QString &hp )
 	connect(m_pTimer, SIGNAL(timeout()), this, SLOT(filterNext()));
 }
 
-Index::Index( const QStringList &dl, const QString &hp )
+HelpIndex::HelpIndex( const QStringList &dl, const QString &hp )
     : QObject( 0 )
 {
     Q_UNUSED(hp);
@@ -102,27 +102,27 @@ Index::Index( const QStringList &dl, const QString &hp )
              this, SLOT(setLastWinClosed()) );
 }
 
-void Index::setLastWinClosed()
+void HelpIndex::setLastWinClosed()
 {
     lastWindowClosed = true;
 }
 
-void Index::setDictionaryFile( const QString &f )
+void HelpIndex::setDictionaryFile( const QString &f )
 {
     dictFile = f;
 }
 
-void Index::setDocListFile( const QString &f )
+void HelpIndex::setDocListFile( const QString &f )
 {
     docListFile = f;
 }
 
-void Index::setDocList( const QStringList &lst )
+void HelpIndex::setDocList( const QStringList &lst )
 {
     docList = lst;
 }
 
-void Index::makeIndex()
+void HelpIndex::makeIndex()
 {
 	if ( !alreadyHaveDocList )
 		setupDocumentList();
@@ -134,7 +134,7 @@ void Index::makeIndex()
 	m_pTimer->start(); //singleshot
 }
 
-void Index::filterNext()
+void HelpIndex::filterNext()
 {
 	if(m_iCurItem < docList.count() && !lastWindowClosed)
 	{
@@ -148,7 +148,7 @@ void Index::filterNext()
 	}
 }
 
-void Index::setupDocumentList()
+void HelpIndex::setupDocumentList()
 {
     docList.clear();
     titleList.clear();
@@ -165,7 +165,7 @@ void Index::setupDocumentList()
     }
 }
 
-void Index::insertInDict( const QString &str, int docNum )
+void HelpIndex::insertInDict( const QString &str, int docNum )
 {
     if ( str == QLatin1String("amp") || str == QLatin1String("nbsp"))
         return;
@@ -183,7 +183,7 @@ void Index::insertInDict( const QString &str, int docNum )
     }
 }
 
-QString Index::getCharsetForDocument(QFile *file)
+QString HelpIndex::getCharsetForDocument(QFile *file)
 {
     QTextStream s(file);
     QString contents = s.readAll();
@@ -206,7 +206,7 @@ QString Index::getCharsetForDocument(QFile *file)
     return encoding;
 }
 
-void Index::parseDocument( const QString &filename, int docNum )
+void HelpIndex::parseDocument( const QString &filename, int docNum )
 {
     QFile file( filename );
     if ( !file.open(QFile::ReadOnly) ) {
@@ -261,7 +261,7 @@ void Index::parseDocument( const QString &filename, int docNum )
     file.close();
 }
 
-void Index::writeDict()
+void HelpIndex::writeDict()
 {
     QFile f( dictFile );
     if ( !f.open(QFile::WriteOnly ) )
@@ -276,7 +276,7 @@ void Index::writeDict()
     writeDocumentList();
 }
 
-void Index::writeDocumentList()
+void HelpIndex::writeDocumentList()
 {
     QFile f( docListFile );
     if ( !f.open(QFile::WriteOnly ) )
@@ -292,7 +292,7 @@ void Index::writeDocumentList()
     
 }
 
-void Index::readDict()
+void HelpIndex::readDict()
 {
     QFile f( dictFile );
     if ( !f.open(QFile::ReadOnly ) )
@@ -314,7 +314,7 @@ void Index::readDict()
     readDocumentList();
 }
 
-void Index::readDocumentList()
+void HelpIndex::readDocumentList()
 {
     QFile f( docListFile );
     if ( !f.open(QFile::ReadOnly ) )
@@ -328,7 +328,7 @@ void Index::readDocumentList()
     s1 >> titleList;
 }
 
-QStringList Index::query( const QStringList &terms, const QStringList &termSeq, const QStringList &seqWords )
+QStringList HelpIndex::query( const QStringList &terms, const QStringList &termSeq, const QStringList &seqWords )
 {
     QList<Term> termList;
     for (QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it ) {
@@ -384,7 +384,7 @@ QStringList Index::query( const QStringList &terms, const QStringList &termSeq,
     return results;
 }
 
-QString Index::getDocumentTitle( const QString &fullFileName )
+QString HelpIndex::getDocumentTitle( const QString &fullFileName )
 {
     QUrl url(fullFileName);
     QString fileName = url.toLocalFile();
@@ -416,7 +416,7 @@ QString Index::getDocumentTitle( const QString &fullFileName )
     return title;
 }
 
-QStringList Index::getWildcardTerms( const QString &term )
+QStringList HelpIndex::getWildcardTerms( const QString &term )
 {
     QStringList lst;
     QStringList terms = split( term );
@@ -459,7 +459,7 @@ QStringList Index::getWildcardTerms( const QString &term )
     return lst;
 }
 
-QStringList Index::split( const QString &str )
+QStringList HelpIndex::split( const QString &str )
 {
     QStringList lst;
     int j = 0;
@@ -484,7 +484,7 @@ QStringList Index::split( const QString &str )
     return lst;
 }
 
-QVector<Document> Index::setupDummyTerm( const QStringList &terms )
+QVector<Document> HelpIndex::setupDummyTerm( const QStringList &terms )
 {
     QList<Term> termList;
     for (QStringList::ConstIterator it = terms.begin(); it != terms.end(); ++it) {
@@ -511,14 +511,14 @@ QVector<Document> Index::setupDummyTerm( const QStringList &terms )
     return maxList;
 }
 
-void Index::buildMiniDict( const QString &str )
+void HelpIndex::buildMiniDict( const QString &str )
 {
     if ( miniDict[ str ] )
         miniDict[ str ]->positions.append( wordNum );
     ++wordNum;
 }
 
-bool Index::searchForPattern( const QStringList &patterns, const QStringList &words, const QString &fileName )
+bool HelpIndex::searchForPattern( const QStringList &patterns, const QStringList &words, const QString &fileName )
 {
     QUrl url(fileName);
     QString fName = url.toLocalFile();
diff --git a/src/modules/help/index.h b/src/modules/help/HelpIndex.h
index 3d5970645..6eb1cdf6c 100644
--- a/src/modules/help/index.h
+++ b/src/modules/help/HelpIndex.h
@@ -72,7 +72,7 @@ struct Document {
 QDataStream &operator>>( QDataStream &s, Document &l );
 QDataStream &operator<<( QDataStream &s, const Document &l );
 
-class Index : public QObject
+class HelpIndex : public QObject
 {
     Q_OBJECT
 public:
@@ -86,8 +86,8 @@ public:
 	    QList<uint> positions;
     };
 
-    Index( const QString &dp, const QString &hp );
-    Index( const QStringList &dl, const QString &hp );
+    HelpIndex( const QString &dp, const QString &hp );
+    HelpIndex( const QStringList &dl, const QString &hp );
     void writeDict();
     void readDict();
     void makeIndex();
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/HelpWidget.cpp
index 66de43932..e7f5d53f3 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/HelpWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : helpwidget.cpp
+//   File : HelpWidget.cpp
 //   Creation date : Thu Aug 10 2000 17:42:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "helpwidget.h"
-#include "helpwindow.h"
+#include "HelpWidget.h"
+#include "HelpWindow.h"
 
 #include "KviMainWindow.h"
 #include "KviIconManager.h"
@@ -40,11 +40,11 @@
 #include <QClipboard>
 #include <QDir>
 
-extern Index        * g_pDocIndex;
-extern KviPointerList<KviHelpWindow> * g_pHelpWindowList;
-extern KviPointerList<KviHelpWidget> * g_pHelpWidgetList;
+extern HelpIndex        * g_pDocIndex;
+extern KviPointerList<HelpWindow> * g_pHelpWindowList;
+extern KviPointerList<HelpWidget> * g_pHelpWidgetList;
 
-KviHelpWidget::KviHelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
+HelpWidget::HelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
 : QWidget(par)
 {
 	setObjectName("help_widget");
@@ -86,12 +86,12 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
 	connect(m_pTextBrowser,SIGNAL(forwardAvailable(bool)),m_pBtnForward,SLOT(setEnabled(bool)));
 }
 
-KviHelpWidget::~KviHelpWidget()
+HelpWidget::~HelpWidget()
 {
 	if(m_bIsStandalone)g_pHelpWidgetList->removeRef(this);
 }
 
-void KviHelpWidget::showIndex()
+void HelpWidget::showIndex()
 {
 	QString szHelpDir;
         QDir dirHelp;
@@ -102,7 +102,7 @@ void KviHelpWidget::showIndex()
 	m_pTextBrowser->setSource(QUrl::fromLocalFile(dirHelp.absoluteFilePath("index.html")));
 }
 
-void KviHelpWidget::resizeEvent(QResizeEvent *)
+void HelpWidget::resizeEvent(QResizeEvent *)
 {
 	int hght = m_pToolBar->sizeHint().height();
 	if(hght < 40)hght = 40;
@@ -110,7 +110,7 @@ void KviHelpWidget::resizeEvent(QResizeEvent *)
 	m_pTextBrowser->setGeometry(0,hght,width(),height() - hght);
 }
 
-void KviHelpWidget::doClose()
+void HelpWidget::doClose()
 {
 	// hack needed to workaround "QToolBar::emulateButtonClicked()"
 	// that refers to the "this" pointer after this slot has been
@@ -118,13 +118,13 @@ void KviHelpWidget::doClose()
 	QTimer::singleShot(0,this,SLOT(suicide()));
 }
 
-void KviHelpWidget::suicide()
+void HelpWidget::suicide()
 {
 	// goodbye cruel wolrd
 	delete this;
 }
 
-QSize KviHelpWidget::sizeHint() const
+QSize HelpWidget::sizeHint() const
 {
 	int wdth = m_pTextBrowser->sizeHint().width();
 	if(m_pToolBar->sizeHint().width() > wdth)wdth = m_pToolBar->sizeHint().width();
@@ -133,5 +133,5 @@ QSize KviHelpWidget::sizeHint() const
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "helpwidget.moc"
+#include "HelpWidget.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/help/helpwidget.h b/src/modules/help/HelpWidget.h
index 8b6509ef9..e94225f17 100644
--- a/src/modules/help/helpwidget.h
+++ b/src/modules/help/HelpWidget.h
@@ -2,7 +2,7 @@
 #define _HELPWIDGET_H_
 //=============================================================================
 //
-//   File : helpwidget.h
+//   File : HelpWidget.h
 //   Creation date : Thu Aug 10 2000 17:26:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "index.h"
+#include "HelpIndex.h"
 
 #include "KviTalHBox.h"
 
@@ -36,12 +36,12 @@ class QLineEdit;
 class KviMainWindow;
 //class QProcess;
 
-class KviHelpWidget : public QWidget
+class HelpWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	KviHelpWidget(QWidget *par,KviMainWindow * lpFrm,bool bIsStandalone = false);
-	~KviHelpWidget();
+	HelpWidget(QWidget *par,KviMainWindow * lpFrm,bool bIsStandalone = false);
+	~HelpWidget();
 private:
 	QToolButton  * m_pBtnIndex;
 	QToolButton  * m_pBtnBackward;
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/HelpWindow.cpp
index 052d2c6eb..5f58d85ed 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : helpwindow.cpp
+//   File : HelpWindow.cpp
 //   Creation date : Tue Aug 11 2000 18:08:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "helpwindow.h"
-#include "helpwidget.h"
+#include "HelpWindow.h"
+#include "HelpWidget.h"
 
 #include "KviApplication.h"
 #include "KviIconManager.h"
@@ -42,12 +42,12 @@
 #include <QToolTip>
 #include <QTimer>
 
-extern Index        * g_pDocIndex;
-extern KviPointerList<KviHelpWindow> * g_pHelpWindowList;
-extern KviPointerList<KviHelpWidget> * g_pHelpWidgetList;
+extern HelpIndex        * g_pDocIndex;
+extern KviPointerList<HelpWindow> * g_pHelpWindowList;
+extern KviPointerList<HelpWidget> * g_pHelpWidgetList;
 
 bool g_bIndexingDone = FALSE;
-KviHelpWindow::KviHelpWindow(KviMainWindow * lpFrm,const char * name)
+HelpWindow::HelpWindow(KviMainWindow * lpFrm,const char * name)
 : KviWindow(KVI_WINDOW_TYPE_HELP,lpFrm,name)
 {
 	g_pHelpWindowList->append(this);
@@ -55,7 +55,7 @@ KviHelpWindow::KviHelpWindow(KviMainWindow * lpFrm,const char * name)
 	m_pSplitter->setObjectName("main_splitter");
 	m_pSplitter->setChildrenCollapsible(false);
 
-	m_pHelpWidget = new KviHelpWidget(m_pSplitter,lpFrm);
+	m_pHelpWidget = new HelpWidget(m_pSplitter,lpFrm);
 
 	m_pToolBar=new KviTalVBox(m_pSplitter);	
 	m_pTabWidget = new QTabWidget(m_pToolBar);
@@ -68,7 +68,7 @@ KviHelpWindow::KviHelpWindow(KviMainWindow * lpFrm,const char * name)
 	m_pBottomLayout->setVisible(false);
 
 	m_pIndexTab  = new KviTalVBox(m_pTabWidget);
-	m_pTabWidget->addTab(m_pIndexTab,__tr2qs("Index"));
+	m_pTabWidget->addTab(m_pIndexTab,__tr2qs("HelpIndex"));
 
 	KviTalHBox* pSearchBox = new KviTalHBox(m_pIndexTab);
 	m_pIndexSearch = new QLineEdit(pSearchBox);
@@ -108,12 +108,12 @@ KviHelpWindow::KviHelpWindow(KviMainWindow * lpFrm,const char * name)
 	QTimer::singleShot(0,this,SLOT(initialSetup()));
 }
 
-KviHelpWindow::~KviHelpWindow()
+HelpWindow::~HelpWindow()
 {
 	g_pHelpWindowList->removeRef(this);
 }
 
-void KviHelpWindow::initialSetup()
+void HelpWindow::initialSetup()
 {
 	m_pIndexSearch->setFocus();
 
@@ -138,19 +138,19 @@ void KviHelpWindow::initialSetup()
 	}
 }
 
-void KviHelpWindow::indexingStart( int iNum )
+void HelpWindow::indexingStart( int iNum )
 {
 	m_pBtnRefreshIndex->setEnabled(false);
 	m_pBottomLayout->setVisible(true);
 	m_pProgressBar->setRange(0, iNum);
 	m_pProgressBar->setValue(0);
 }
-void KviHelpWindow::indexingProgress( int iNum )
+void HelpWindow::indexingProgress( int iNum )
 {
 	m_pProgressBar->setValue(iNum);
 }
 
-void KviHelpWindow::indexingEnd()
+void HelpWindow::indexingEnd()
 {
 	m_pProgressBar->setValue(0);
 	m_pBottomLayout->setVisible(false);
@@ -162,13 +162,13 @@ void KviHelpWindow::indexingEnd()
 	m_pBtnRefreshIndex->setEnabled(true);
 }
 
-void KviHelpWindow::saveProperties(KviConfigurationFile *cfg)
+void HelpWindow::saveProperties(KviConfigurationFile *cfg)
 {
 	KviWindow::saveProperties(cfg);
 	cfg->writeEntry("Splitter",m_pSplitter->sizes());
 }
 
-void KviHelpWindow::loadProperties(KviConfigurationFile *cfg)
+void HelpWindow::loadProperties(KviConfigurationFile *cfg)
 {
 	QList<int> def;
 	int w = width();
@@ -178,12 +178,12 @@ void KviHelpWindow::loadProperties(KviConfigurationFile *cfg)
 	KviWindow::loadProperties(cfg);
 }
 
-void KviHelpWindow::refreshIndex()
+void HelpWindow::refreshIndex()
 {
 	g_pDocIndex->makeIndex();
 }
 
-void KviHelpWindow::startSearch()
+void HelpWindow::startSearch()
 {
 	QString str = m_pTermsEdit->text();
 	str = str.replace( "\'", "\"" );
@@ -258,19 +258,19 @@ void KviHelpWindow::startSearch()
 	setCursor( Qt::ArrowCursor );
 }
 
-QTextBrowser * KviHelpWindow::textBrowser()
+QTextBrowser * HelpWindow::textBrowser()
 {
 	return m_pHelpWidget->textBrowser();
 }
 
-void KviHelpWindow::showIndexTopic()
+void HelpWindow::showIndexTopic()
 {
 	if (m_pIndexSearch->text().isEmpty()|| !m_pIndexListWidget->selectedItems().count()) return;
 	int i=g_pDocIndex->titlesList().indexOf(m_pIndexListWidget->selectedItems().at(0)->text());
 	textBrowser()->setSource(QUrl(g_pDocIndex->documentList()[ i ]));
 }
 
-void KviHelpWindow::searchInIndex( const QString &s )
+void HelpWindow::searchInIndex( const QString &s )
 {
 	QListWidgetItem *item ;
 	QString sl = s.toLower();
@@ -287,36 +287,36 @@ void KviHelpWindow::searchInIndex( const QString &s )
 	}
 }
 
-void KviHelpWindow::indexSelected ( QListWidgetItem *item )
+void HelpWindow::indexSelected ( QListWidgetItem *item )
 {
 	if (!item) return;
 	int i=g_pDocIndex->titlesList().indexOf(item->text());
 	textBrowser()->setSource(QUrl(g_pDocIndex->documentList()[ i ]));
 }
 
-void KviHelpWindow::searchSelected ( QListWidgetItem *item )
+void HelpWindow::searchSelected ( QListWidgetItem *item )
 {
 	if (!item) return;
 	int i=g_pDocIndex->titlesList().indexOf(item->text());
 	textBrowser()->setSource(QUrl(g_pDocIndex->documentList()[ i ]));
 }
 
-QPixmap * KviHelpWindow::myIconPtr()
+QPixmap * HelpWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_MDIHELP);
 }
 
-void KviHelpWindow::resizeEvent(QResizeEvent *)
+void HelpWindow::resizeEvent(QResizeEvent *)
 {
 	m_pSplitter->setGeometry(0,0,width(),height());
 }
 
-void KviHelpWindow::fillCaptionBuffers()
+void HelpWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs("Help Browser");
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "helpwindow.moc"
+#include "HelpWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/help/helpwindow.h b/src/modules/help/HelpWindow.h
index 8b262273c..94eacc347 100644
--- a/src/modules/help/helpwindow.h
+++ b/src/modules/help/HelpWindow.h
@@ -2,7 +2,7 @@
 #define _HELPWINDOW_H_
 //=============================================================================
 //
-//   File : helpwindow.h
+//   File : HelpWindow.h
 //   Creation date : Fri Aug 11 2000 18:05:59 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -35,16 +35,16 @@
 class QProgressBar;
 class QPushButton;
 class QTextBrowser;
-class KviHelpWidget;
+class HelpWidget;
 
-class KviHelpWindow : public KviWindow
+class HelpWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviHelpWindow(KviMainWindow * lpFrm,const char * name);
-	~KviHelpWindow();
+	HelpWindow(KviMainWindow * lpFrm,const char * name);
+	~HelpWindow();
 protected:
-	KviHelpWidget * m_pHelpWidget;
+	HelpWidget * m_pHelpWidget;
 	KviTalVBox    * m_pToolBar;
 	QTabWidget    * m_pTabWidget;
 	KviTalVBox    * m_pIndexTab;
@@ -61,7 +61,7 @@ protected:
 	QLineEdit     * m_pTermsEdit;
 	QPushButton   * m_pBtnRefreshIndex;
 public:
-	KviHelpWidget * helpWidget(){ return m_pHelpWidget; };
+	HelpWidget * helpWidget(){ return m_pHelpWidget; };
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index 8cf269cbd..039d4fbef 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "helpwidget.h"
-#include "helpwindow.h"
-#include "index.h"
+#include "HelpWidget.h"
+#include "HelpWindow.h"
+#include "HelpIndex.h"
 #include "KviLocale.h"
 #include "KviModule.h"
 #include "KviFileUtils.h"
@@ -36,9 +36,9 @@
 #include <QFileInfo>
 #include <QSplitter>
 
-Index        * g_pDocIndex = 0;
-KviPointerList<KviHelpWidget> * g_pHelpWidgetList = 0;
-KviPointerList<KviHelpWindow> * g_pHelpWindowList = 0;
+HelpIndex        * g_pDocIndex = 0;
+KviPointerList<HelpWidget> * g_pHelpWidgetList = 0;
+KviPointerList<HelpWindow> * g_pHelpWindowList = 0;
 
 /*
 	@doc: help.open
@@ -177,7 +177,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 	if(!c->switches()->find('n',"new"))
 	{
-		KviHelpWidget * w = (KviHelpWidget *)c->window()->frame()->findChild<KviHelpWidget *>("help_widget");
+		HelpWidget * w = (HelpWidget *)c->window()->frame()->findChild<HelpWidget *>("help_widget");
 
 		if(w)
 		{
@@ -187,11 +187,11 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	}
 	if(c->switches()->find('m',"mdi"))
 	{
-		KviHelpWindow *w = new KviHelpWindow(c->window()->frame(),"Help browser");
+		HelpWindow *w = new HelpWindow(c->window()->frame(),"Help browser");
 		w->textBrowser()->setSource(QUrl::fromLocalFile(f.absoluteFilePath()));
 		c->window()->frame()->addWindow(w);
 	} else {
-		KviHelpWidget *w = new KviHelpWidget(c->window()->frame()->splitter(),
+		HelpWidget *w = new HelpWidget(c->window()->frame()->splitter(),
 			c->window()->frame(),true);
 		w->textBrowser()->setSource(QUrl::fromLocalFile(f.absoluteFilePath()));
 		w->show();
@@ -207,15 +207,15 @@ static bool help_module_init(KviModule * m)
 	g_pApp->getLocalKvircDirectory(szDocList,KviApplication::Help,"help.doclist." KVI_SOURCES_DATE);
 	g_pApp->getGlobalKvircDirectory(szHelpDir,KviApplication::Help);
 
-	g_pDocIndex = new Index(szHelpDir,szDocList);
+	g_pDocIndex = new HelpIndex(szHelpDir,szDocList);
 	g_pDocIndex->setDocListFile(szDocList);
 
 	g_pApp->getLocalKvircDirectory(szHelpDir,KviApplication::Help,"help.dict." KVI_SOURCES_DATE);
 	g_pDocIndex->setDictionaryFile(szHelpDir);
 
-	g_pHelpWidgetList = new KviPointerList<KviHelpWidget>;
+	g_pHelpWidgetList = new KviPointerList<HelpWidget>;
 	g_pHelpWidgetList->setAutoDelete(false);
-	g_pHelpWindowList = new KviPointerList<KviHelpWindow>;
+	g_pHelpWindowList = new KviPointerList<HelpWindow>;
 	g_pHelpWindowList->setAutoDelete(false);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",help_kvs_cmd_open);
diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt
index b3a48e052..29ce4f8f1 100644
--- a/src/modules/http/CMakeLists.txt
+++ b/src/modules/http/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/http
 
 SET(kvihttp_MOC_HDRS
-	httpfiletransfer.h
+	HttpFileTransfer.h
 )
 
 SET(kvihttp_SRCS
 	libkvihttp.cpp
-	httpfiletransfer.cpp
+	HttpFileTransfer.cpp
 )
 
 SET(files
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/HttpFileTransfer.cpp
index 2c48b49c2..2e63b1aa1 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/HttpFileTransfer.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : httpfiletransfer.h
+//   File : HttpFileTransfer.h
 //   Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek
 //
 //   This config is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "httpfiletransfer.h"
+#include "HttpFileTransfer.h"
 
 #include "KviApplication.h"
 #include "kvi_out.h"
@@ -37,11 +37,11 @@
 
 #include <QPainter>
 
-static KviPointerList<KviHttpFileTransfer> * g_pHttpFileTransfers = 0;
+static KviPointerList<HttpFileTransfer> * g_pHttpFileTransfers = 0;
 static QPixmap * g_pHttpIcon = 0;
 
 
-KviHttpFileTransfer::KviHttpFileTransfer()
+HttpFileTransfer::HttpFileTransfer()
 : KviFileTransfer()
 {
 	init(); // ensure we're initialized
@@ -71,7 +71,7 @@ KviHttpFileTransfer::KviHttpFileTransfer()
 	m_szStatusString = __tr2qs_ctx("Initializing","http");
 }
 
-KviHttpFileTransfer::~KviHttpFileTransfer()
+HttpFileTransfer::~HttpFileTransfer()
 {
 	g_pHttpFileTransfers->removeRef(this);
 	delete m_pHttpRequest;
@@ -82,34 +82,34 @@ KviHttpFileTransfer::~KviHttpFileTransfer()
 	}
 }
 
-void KviHttpFileTransfer::autoClean()
+void HttpFileTransfer::autoClean()
 {
 	killTimer(m_TimerId);
 	die();
 }
 
-QString KviHttpFileTransfer::localFileName()
+QString HttpFileTransfer::localFileName()
 {
 	return m_pHttpRequest->fileName();
 }
 
-void KviHttpFileTransfer::abort()
+void HttpFileTransfer::abort()
 {
 	m_pHttpRequest->abort();
 }
 
-void KviHttpFileTransfer::fillContextPopup(KviTalPopupMenu * m)
+void HttpFileTransfer::fillContextPopup(KviTalPopupMenu * m)
 {
 	int id = m->insertItem(__tr2qs_ctx("Abort","http"),this,SLOT(abort()));
 	if(!active())m->setItemEnabled(id,false);
 }
 
-bool KviHttpFileTransfer::active()
+bool HttpFileTransfer::active()
 {
 	return ((m_eGeneralStatus == Connecting) || (m_eGeneralStatus == Downloading));
 }
 
-void KviHttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
+void HttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 {
 	int width = rect.width(), height = rect.height();
 	QString txt;
@@ -288,13 +288,13 @@ void KviHttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 	}
 }
 
-int KviHttpFileTransfer::displayHeight(int iLineSpacing)
+int HttpFileTransfer::displayHeight(int iLineSpacing)
 {
 	int iH = (iLineSpacing * 3) + 10;
 	return iH >= 70 ? iH : 70;
 }
 
-QString KviHttpFileTransfer::tipText()
+QString HttpFileTransfer::tipText()
 {
 	QString s;
 	s = QString("<table><tr><td bgcolor=\"#000000\"><font color=\"#FFFFFF\"><b>HTTP Transfer (ID %1)</b></font></td></tr>").arg(id());
@@ -330,10 +330,10 @@ QString KviHttpFileTransfer::tipText()
 	return s;
 }
 
-void KviHttpFileTransfer::init()
+void HttpFileTransfer::init()
 {
 	if(g_pHttpFileTransfers)return;
-	g_pHttpFileTransfers = new KviPointerList<KviHttpFileTransfer>;
+	g_pHttpFileTransfers = new KviPointerList<HttpFileTransfer>;
 	g_pHttpFileTransfers->setAutoDelete(false);
 
 	QPixmap * pix = g_pIconManager->getImage("kvi_httpicons.png", false);
@@ -343,10 +343,10 @@ void KviHttpFileTransfer::init()
 		g_pHttpIcon = 0;
 }
 
-void KviHttpFileTransfer::done()
+void HttpFileTransfer::done()
 {
 	if(!g_pHttpFileTransfers)return;
-	while(KviHttpFileTransfer * t = g_pHttpFileTransfers->first())
+	while(HttpFileTransfer * t = g_pHttpFileTransfers->first())
 		delete t;
 	delete g_pHttpFileTransfers;
 	g_pHttpFileTransfers = 0;
@@ -357,13 +357,13 @@ void KviHttpFileTransfer::done()
 	}
 }
 
-unsigned int KviHttpFileTransfer::runningTransfers()
+unsigned int HttpFileTransfer::runningTransfers()
 {
 	if(!g_pHttpFileTransfers)return 0;
 	return g_pHttpFileTransfers->count();
 }
 
-void KviHttpFileTransfer::requestSent(const QStringList &requestHeaders)
+void HttpFileTransfer::requestSent(const QStringList &requestHeaders)
 {
 	m_szStatusString = __tr2qs_ctx("Request sent, waiting for reply...","http");
 	displayUpdate();
@@ -383,25 +383,25 @@ void KviHttpFileTransfer::requestSent(const QStringList &requestHeaders)
 	m_lRequest = requestHeaders;
 }
 
-void KviHttpFileTransfer::connectionEstabilished()
+void HttpFileTransfer::connectionEstabilished()
 {
 	m_szStatusString = __tr2qs_ctx("Connection established, sending request","http");
 	displayUpdate();
 }
 
-void KviHttpFileTransfer::resolvingHost(const QString &hostname)
+void HttpFileTransfer::resolvingHost(const QString &hostname)
 {
 	m_szStatusString = __tr2qs_ctx("Resolving host %1","http").arg(hostname);
 	displayUpdate();
 }
 
-void KviHttpFileTransfer::contactingHost(const QString &ipandport)
+void HttpFileTransfer::contactingHost(const QString &ipandport)
 {
 	m_szStatusString = __tr2qs_ctx("Contacting host %1","http").arg(ipandport);
 	displayUpdate();
 }
 
-void KviHttpFileTransfer::receivedResponse(const QString &response)
+void HttpFileTransfer::receivedResponse(const QString &response)
 {
 	m_lHeaders.clear();
 	m_lHeaders.append(response);
@@ -411,14 +411,14 @@ void KviHttpFileTransfer::receivedResponse(const QString &response)
 	displayUpdate();
 }
 
-void KviHttpFileTransfer::statusMessage(const QString &txt)
+void HttpFileTransfer::statusMessage(const QString &txt)
 {
 	KviWindow * out = transferWindow();
 	if(out && (!m_bNoOutput))
 		out->output(KVI_OUT_GENERICSTATUS,"[HTTP %d]: %Q",id(),&txt);
 }
 
-void KviHttpFileTransfer::transferTerminated(bool bSuccess)
+void HttpFileTransfer::transferTerminated(bool bSuccess)
 {
 	KviWindow * out = transferWindow();
 
@@ -464,7 +464,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
 	}
 }
 
-void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviCString> *h)
+void HttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviCString> *h)
 {
 	if(!h)return;
 	KviWindow * out = transferWindow();
@@ -482,12 +482,12 @@ void KviHttpFileTransfer::headersReceived(KviPointerHashTable<const char *,KviCS
 	}
 }
 
-bool KviHttpFileTransfer::startDownload()
+bool HttpFileTransfer::startDownload()
 {
 	m_eGeneralStatus = Connecting;
 	return m_pHttpRequest->start();
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_httpfiletransfer.moc"
+#include "m_HttpFileTransfer.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/HttpFileTransfer.h
index 6369087e2..b89c465b9 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/HttpFileTransfer.h
@@ -2,7 +2,7 @@
 #define _HTTPFILETRANSFER_H_
 //=============================================================================
 //
-//   File : httpfiletransfer.h
+//   File : HttpFileTransfer.h
 //   Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek
 //
 //   This config is part of the KVIrc irc client distribution
@@ -35,13 +35,13 @@
 class QPainter;
 class KviTalPopupMenu;
 
-class KviHttpFileTransfer : public KviFileTransfer
+class HttpFileTransfer : public KviFileTransfer
 {
 	enum GeneralStatus { Initializing, Connecting, Downloading, Success, Failure };
 	Q_OBJECT
 public:
-	KviHttpFileTransfer();
-	~KviHttpFileTransfer();
+	HttpFileTransfer();
+	~HttpFileTransfer();
 private:
 	int m_TimerId;
 	KviHttpRequest * m_pHttpRequest;
diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index c6ffb1eed..41e096220 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "httpfiletransfer.h"
+#include "HttpFileTransfer.h"
 
 #include "KviModule.h"
 #include "KviCString.h"
@@ -63,7 +63,7 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,QString &szUrl,QSt
 		}
 	}
 
-	KviHttpFileTransfer * hft = new KviHttpFileTransfer();
+	HttpFileTransfer * hft = new HttpFileTransfer();
 
 	bool bHead = c->switches()->find('h',"head");
 
@@ -303,7 +303,7 @@ static bool http_kvs_cmd_asyncGet(KviKvsModuleCallbackCommandCall * c)
 
 static bool http_module_init(KviModule * m)
 {
-	KviHttpFileTransfer::init();
+	HttpFileTransfer::init();
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"get",http_kvs_cmd_get);
 	KVSM_REGISTER_CALLBACK_COMMAND(m,"asyncGet",http_kvs_cmd_asyncGet);
@@ -313,13 +313,13 @@ static bool http_module_init(KviModule * m)
 
 static bool http_module_cleanup(KviModule *)
 {
-	KviHttpFileTransfer::done();
+	HttpFileTransfer::done();
 	return true;
 }
 
 static bool http_module_can_unload(KviModule *)
 {
-	return (KviHttpFileTransfer::runningTransfers() == 0);
+	return (HttpFileTransfer::runningTransfers() == 0);
 }
 
 KVIRC_MODULE(
diff --git a/src/modules/links/CMakeLists.txt b/src/modules/links/CMakeLists.txt
index 1ffe5e95d..17299d9f7 100644
--- a/src/modules/links/CMakeLists.txt
+++ b/src/modules/links/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/links
 
 SET(kvilinks_MOC_HDRS
-	linkswindow.h
+	LinksWindow.h
 )
 
 SET(kvilinks_SRCS
 	libkvilinks.cpp
-	linkswindow.cpp
+	LinksWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/LinksWindow.cpp
index 10f68f782..18127b77b 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/LinksWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : linkswindow.cpp
+//   File : LinksWindow.cpp
 //   Creation date : Thu Dec 21 2001 12:41:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "linkswindow.h"
+#include "LinksWindow.h"
 
 #include "kvi_debug.h"
 #include "KviIconManager.h"
@@ -43,9 +43,9 @@
 #include <QMouseEvent>
 #include <QHeaderView>
 
-extern KviPointerList<KviLinksWindow> * g_pLinksWindowList;
+extern KviPointerList<LinksWindow> * g_pLinksWindowList;
 
-KviLinksWindow::KviLinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole)
+LinksWindow::LinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_LINKS,lpFrm,"links",lpConsole), KviExternalServerDataParser()
 {
 	g_pLinksWindowList->append(this);
@@ -79,7 +79,7 @@ KviLinksWindow::KviLinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsol
 	m_pVertSplitter->setObjectName("vsplitter");
 	m_pVertSplitter->setChildrenCollapsible(false);
 
-	m_pListView  = new KviLinksListView(m_pVertSplitter, this, "links_treewidget");
+	m_pListView  = new LinksListView(m_pVertSplitter, this, "links_treewidget");
 
 	connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *,const QPoint &)),
 			this,SLOT(showHostPopup(QTreeWidgetItem *,const QPoint &)));
@@ -99,7 +99,7 @@ KviLinksWindow::KviLinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsol
 	m_szRootServer = __tr2qs("(None)");
 }
 
-KviLinksWindow::~KviLinksWindow()
+LinksWindow::~LinksWindow()
 {
 	g_pLinksWindowList->removeRef(this);
 	m_pConsole->context()->setLinksWindowPointer(0);
@@ -107,12 +107,12 @@ KviLinksWindow::~KviLinksWindow()
 	delete m_pHostPopup;
 }
 
-void KviLinksWindow::getBaseLogFileName(QString &buffer)
+void LinksWindow::getBaseLogFileName(QString &buffer)
 {
 	buffer.sprintf("LINKS_%d",context()->id());
 }
 
-void KviLinksWindow::requestLinks()
+void LinksWindow::requestLinks()
 {
 	if(m_pConsole->isConnected())
 	{
@@ -124,7 +124,7 @@ void KviLinksWindow::requestLinks()
 	}
 }
 
-void KviLinksWindow::connectionStateChange()
+void LinksWindow::connectionStateChange()
 {
 	KviIrcContext::State st = m_pConsole->context()->state();
 	m_pRequestButton->setEnabled(st == KviIrcContext::Connected);
@@ -138,36 +138,36 @@ void KviLinksWindow::connectionStateChange()
 	}
 }
 
-QPixmap * KviLinksWindow::myIconPtr()
+QPixmap * LinksWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_LINKS);
 }
 
-void KviLinksWindow::resizeEvent(QResizeEvent *)
+void LinksWindow::resizeEvent(QResizeEvent *)
 {
 	int hght2 = m_pTopSplitter->sizeHint().height();
 	m_pTopSplitter->setGeometry(0,0,width(),hght2);
 	m_pSplitter->setGeometry(0,hght2,width(),height() - hght2);
 }
 
-QSize KviLinksWindow::sizeHint() const
+QSize LinksWindow::sizeHint() const
 {
 	QSize ret(m_pSplitter->sizeHint().width(),
 		m_pSplitter->sizeHint().height() + m_pTopSplitter->sizeHint().height());
 	return ret;
 }
 
-void KviLinksWindow::fillCaptionBuffers()
+void LinksWindow::fillCaptionBuffers()
 {
 	KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Links for %Q [IRC Context %u]"),&m_szRootServer,m_pConsole->context()->id());
 }
 
-void KviLinksWindow::die()
+void LinksWindow::die()
 {
 	close();
 }
 
-void KviLinksWindow::control(int message)
+void LinksWindow::control(int message)
 {
 	switch(message)
 	{
@@ -176,7 +176,7 @@ void KviLinksWindow::control(int message)
 	}
 }
 
-void KviLinksWindow::endOfLinks()
+void LinksWindow::endOfLinks()
 {
 	m_pRequestButton->setEnabled(true);
 
@@ -313,7 +313,7 @@ void KviLinksWindow::endOfLinks()
 	m_pListView->repaint();
 }
 
-QTreeWidgetItem * KviLinksWindow::insertLink(KviLink *l)
+QTreeWidgetItem * LinksWindow::insertLink(KviLink *l)
 {
 	KVI_ASSERT(l->hops > 0);
 	QTreeWidgetItem * i = getItemByHost(l->parent.ptr(),0);
@@ -332,7 +332,7 @@ QTreeWidgetItem * KviLinksWindow::insertLink(KviLink *l)
 	return it;
 }
 
-QTreeWidgetItem * KviLinksWindow::getItemByHost(const char *host,QTreeWidgetItem * par)
+QTreeWidgetItem * LinksWindow::getItemByHost(const char *host,QTreeWidgetItem * par)
 {
 	KviCString tmp;
 	if(par)
@@ -356,7 +356,7 @@ QTreeWidgetItem * KviLinksWindow::getItemByHost(const char *host,QTreeWidgetItem
 	return 0;
 }
 
-void KviLinksWindow::showHostPopup(QTreeWidgetItem *i,const QPoint &p)
+void LinksWindow::showHostPopup(QTreeWidgetItem *i,const QPoint &p)
 {
 	if(!i)return;
 	KviCString host=i->text(0);
@@ -407,7 +407,7 @@ void KviLinksWindow::showHostPopup(QTreeWidgetItem *i,const QPoint &p)
 	m_pHostPopup->popup(p);
 }
 
-void KviLinksWindow::hostPopupClicked(int id)
+void LinksWindow::hostPopupClicked(int id)
 {
 	KviCString tmp = m_pHostPopup->text(id);
 	if(tmp.hasData())
@@ -417,13 +417,13 @@ void KviLinksWindow::hostPopupClicked(int id)
 	}
 }
 
-void KviLinksWindow::reset()
+void LinksWindow::reset()
 {
 	outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Reset"));
 	while(!m_pLinkList->isEmpty())m_pLinkList->removeFirst();
 }
 
-void KviLinksWindow::processData(KviIrcMessage *msg)
+void LinksWindow::processData(KviIrcMessage *msg)
 {
 	output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Processing link: %s"),msg->allParams());
 	KviLink * l = new KviLink;
@@ -458,7 +458,7 @@ void KviLinksWindow::processData(KviIrcMessage *msg)
 	m_pLinkList->append(l);
 }
 
-void KviLinksWindow::applyOptions()
+void LinksWindow::applyOptions()
 {
 	m_pListView->applyOptions();
 	m_pInfoLabel->applyOptions();
@@ -466,7 +466,7 @@ void KviLinksWindow::applyOptions()
 	KviWindow::applyOptions();
 }
 
-KviLinksListView::KviLinksListView(QWidget * par, KviWindow * wnd, const char * txt)
+LinksListView::LinksListView(QWidget * par, KviWindow * wnd, const char * txt)
 : KviThemedTreeWidget(par, wnd, txt)
 {
 	header()->setSortIndicatorShown(true);
@@ -478,7 +478,7 @@ KviLinksListView::KviLinksListView(QWidget * par, KviWindow * wnd, const char *
 	setAllColumnsShowFocus(true);
 }
 
-void KviLinksListView::mousePressEvent (QMouseEvent *e)
+void LinksListView::mousePressEvent (QMouseEvent *e)
 {
 	if (e->button() == Qt::RightButton)
 	{
@@ -489,5 +489,5 @@ void KviLinksListView::mousePressEvent (QMouseEvent *e)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_linkswindow.moc"
+#include "m_LinksWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/LinksWindow.h
index ee10aeb80..807596048 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/LinksWindow.h
@@ -2,7 +2,7 @@
 #define _LINKSWINDOW_H_
 //=============================================================================
 //
-//   File : linkswindow.h
+//   File : LinksWindow.h
 //   Creation date : Thu Dec 21 2000 12:42:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -45,28 +45,28 @@ typedef struct _KviLink
 	KviCString description;
 } KviLink;
 
-class KviLinksListView : public KviThemedTreeWidget
+class LinksListView : public KviThemedTreeWidget
 {
 	Q_OBJECT
 public:
-	KviLinksListView(QWidget * par, KviWindow * wnd, const char * txt);
-	~KviLinksListView(){};
+	LinksListView(QWidget * par, KviWindow * wnd, const char * txt);
+	~LinksListView(){};
 protected:
 	void mousePressEvent (QMouseEvent *e);
 signals:
 	void rightButtonPressed(QTreeWidgetItem *,QPoint);
 };
 
-class KviLinksWindow : public KviWindow, public KviExternalServerDataParser
+class LinksWindow : public KviWindow, public KviExternalServerDataParser
 {
 	Q_OBJECT
 public:
-	KviLinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole);
-	~KviLinksWindow();
+	LinksWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole);
+	~LinksWindow();
 protected:
 	QSplitter               * m_pVertSplitter;
 	QSplitter               * m_pTopSplitter;
-	KviLinksListView        * m_pListView;
+	LinksListView        * m_pListView;
 	KviPointerList<KviLink> * m_pLinkList;
 	KviTalPopupMenu         * m_pHostPopup;
 	QString                   m_szRootServer;
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index 5529e0528..caf5c205d 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -21,7 +21,7 @@
 //
 //=============================================================================
 
-#include "linkswindow.h"
+#include "LinksWindow.h"
 
 #include "KviModule.h"
 #include "KviMainWindow.h"
@@ -30,7 +30,7 @@
 
 #include <QSplitter>
 
-KviPointerList<KviLinksWindow> * g_pLinksWindowList = 0;
+KviPointerList<LinksWindow> * g_pLinksWindowList = 0;
 
 
 /*
@@ -66,7 +66,7 @@ static bool links_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 	if(!(c->window()->context()->linksWindow()))
 	{
-		KviLinksWindow *w = new KviLinksWindow(c->window()->frame(),c->window()->console());
+		LinksWindow *w = new LinksWindow(c->window()->frame(),c->window()->console());
 		c->window()->frame()->addWindow(w);
 	} else {
 		c->warning(__tr2qs("Links window alread open for this IRC context"));
@@ -77,7 +77,7 @@ static bool links_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 static bool links_module_init(KviModule * m)
 {
-	g_pLinksWindowList = new KviPointerList<KviLinksWindow>;
+	g_pLinksWindowList = new KviPointerList<LinksWindow>;
 	g_pLinksWindowList->setAutoDelete(false);
 
 
diff --git a/src/modules/list/CMakeLists.txt b/src/modules/list/CMakeLists.txt
index eb0ea0d56..43be14744 100644
--- a/src/modules/list/CMakeLists.txt
+++ b/src/modules/list/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/list
 
 SET(kvilist_MOC_HDRS
-	listwindow.h
+	ListWindow.h
 )
 
 SET(kvilist_SRCS
 	libkvilist.cpp
-	listwindow.cpp
+	ListWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/ListWindow.cpp
index 1ddcc233a..3e596cb3c 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : listwindow.cpp
+//   File : ListWindow.cpp
 //   Creation date : Thu Oct 7 2001 13:27:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "listwindow.h"
+#include "ListWindow.h"
 
 #include "kvi_debug.h"
 #include "KviIconManager.h"
@@ -54,21 +54,21 @@
 #include <QByteArray>
 #include <QTextDocument> // for Qt::escape
 
-extern KviPointerList<KviListWindow> * g_pListWindowList;
+extern KviPointerList<ListWindow> * g_pListWindowList;
 
-KviChannelTreeWidgetItemData::KviChannelTreeWidgetItemData(const QString & szChan, const QString & szUsers, const QString & szTopic)
+ChannelTreeWidgetItemData::ChannelTreeWidgetItemData(const QString & szChan, const QString & szUsers, const QString & szTopic)
 {
 	m_szChan = szChan;
 	m_szUsers = szUsers;
 	m_szTopic = szTopic;
 }
 
-KviChannelTreeWidgetItemData::~KviChannelTreeWidgetItemData()
+ChannelTreeWidgetItemData::~ChannelTreeWidgetItemData()
 {
 }
 
 
-KviChannelTreeWidgetItem::KviChannelTreeWidgetItem(QTreeWidget * v,KviChannelTreeWidgetItemData * pData)
+ChannelTreeWidgetItem::ChannelTreeWidgetItem(QTreeWidget * v,ChannelTreeWidgetItemData * pData)
 : QTreeWidgetItem(v), m_pData(pData)
 {
 	setToolTip(0, m_pData->m_szChan);
@@ -76,11 +76,11 @@ KviChannelTreeWidgetItem::KviChannelTreeWidgetItem(QTreeWidget * v,KviChannelTre
 	setToolTip(2, KviHtmlGenerator::convertToHtml(Qt::escape(m_pData->m_szTopic)));
 }
 
-KviChannelTreeWidgetItem::~KviChannelTreeWidgetItem()
+ChannelTreeWidgetItem::~ChannelTreeWidgetItem()
 {
 }
 
-int KviChannelTreeWidgetItem::width(const QFontMetrics & fm, const QTreeWidget *, int iColumn) const
+int ChannelTreeWidgetItem::width(const QFontMetrics & fm, const QTreeWidget *, int iColumn) const
 {
 	switch(iColumn)
 	{
@@ -100,38 +100,38 @@ int KviChannelTreeWidgetItem::width(const QFontMetrics & fm, const QTreeWidget *
 	}
 }
 
-bool KviChannelTreeWidgetItem::operator<(const QTreeWidgetItem & other) const
+bool ChannelTreeWidgetItem::operator<(const QTreeWidgetItem & other) const
 {
 	switch(treeWidget()->sortColumn())
 	{
 		case 0:
 			//channel
-			return m_pData->m_szChan.toUpper() < ((KviChannelTreeWidgetItem*)&other)->itemData()->m_szChan.toUpper();
+			return m_pData->m_szChan.toUpper() < ((ChannelTreeWidgetItem*)&other)->itemData()->m_szChan.toUpper();
 			break;
 		case 1:
 			//users
-			return m_pData->m_szUsers.toInt() < ((KviChannelTreeWidgetItem*)&other)->itemData()->m_szUsers.toInt();
+			return m_pData->m_szUsers.toInt() < ((ChannelTreeWidgetItem*)&other)->itemData()->m_szUsers.toInt();
 			break;
 		case 2:
 		default:
 			//topic
-			return KviMircCntrl::stripControlBytes(m_pData->m_szTopic.toUpper()) < KviMircCntrl::stripControlBytes(((KviChannelTreeWidgetItem*)&other)->itemData()->m_szTopic.toUpper());
+			return KviMircCntrl::stripControlBytes(m_pData->m_szTopic.toUpper()) < KviMircCntrl::stripControlBytes(((ChannelTreeWidgetItem*)&other)->itemData()->m_szTopic.toUpper());
 			break;
 	}
 }
 
-KviChannelTreeWidgetItemDelegate::KviChannelTreeWidgetItemDelegate(QTreeWidget * pWidget)
+ChannelTreeWidgetItemDelegate::ChannelTreeWidgetItemDelegate(QTreeWidget * pWidget)
 : QItemDelegate(pWidget)
 {
 }
 
-KviChannelTreeWidgetItemDelegate::~KviChannelTreeWidgetItemDelegate()
+ChannelTreeWidgetItemDelegate::~ChannelTreeWidgetItemDelegate()
 {
 }
 
-void KviChannelTreeWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index) const
+void ChannelTreeWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
-	KviChannelTreeWidgetItem* obj = static_cast<KviChannelTreeWidgetItem*>(index.internalPointer());
+	ChannelTreeWidgetItem* obj = static_cast<ChannelTreeWidgetItem*>(index.internalPointer());
 
 	if (option.state & QStyle::State_Selected)
 		p->fillRect(option.rect, option.palette.brush( QPalette::Highlight ) );
@@ -157,14 +157,14 @@ void KviChannelTreeWidgetItemDelegate::paint(QPainter * p, const QStyleOptionVie
 	}
 }
 
-KviListWindow::KviListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole)
+ListWindow::ListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_LIST,lpFrm,"list",lpConsole), KviExternalServerDataParser()
 {
 	g_pListWindowList->append(this);
 
 	m_pFlushTimer = 0;
 
-	m_pItemList = new KviPointerList<KviChannelTreeWidgetItemData>;
+	m_pItemList = new KviPointerList<ChannelTreeWidgetItemData>;
 	m_pItemList->setAutoDelete(false);
 
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
@@ -223,7 +223,7 @@ KviListWindow::KviListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole
 	m_pTreeWidget  = new KviThemedTreeWidget(m_pVertSplitter, this, "list_treewidget");
 	m_pTreeWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
-	m_pTreeWidget->setItemDelegate(new KviChannelTreeWidgetItemDelegate(m_pTreeWidget));
+	m_pTreeWidget->setItemDelegate(new ChannelTreeWidgetItemDelegate(m_pTreeWidget));
 	QStringList columnLabels;
 	columnLabels.append(__tr2qs("Channel"));
 	columnLabels.append(__tr2qs("Users"));
@@ -243,7 +243,7 @@ KviListWindow::KviListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole
 	connectionStateChange();
 }
 
-KviListWindow::~KviListWindow()
+ListWindow::~ListWindow()
 {
 	g_pListWindowList->removeRef(this);
 	m_pConsole->context()->setListWindowPointer(0);
@@ -254,12 +254,12 @@ KviListWindow::~KviListWindow()
 	delete m_pItemList;
 }
 
-void KviListWindow::getBaseLogFileName(QString & szBuffer)
+void ListWindow::getBaseLogFileName(QString & szBuffer)
 {
 	szBuffer.sprintf("LIST_%d",context()->id());
 }
 
-void KviListWindow::requestList()
+void ListWindow::requestList()
 {
 	if(m_pConsole->isConnected())
 	{
@@ -276,7 +276,7 @@ void KviListWindow::requestList()
 	}
 }
 
-void KviListWindow::stoplistdownload()
+void ListWindow::stoplistdownload()
 {
 	if(m_pConsole->isConnected())
 	{
@@ -287,7 +287,7 @@ void KviListWindow::stoplistdownload()
 	}
 }
 
-void KviListWindow::connectionStateChange()
+void ListWindow::connectionStateChange()
 {
 	KviIrcContext::State st = m_pConsole->context()->state();
 	m_pRequestButton->setEnabled(st == KviIrcContext::Connected);
@@ -304,34 +304,34 @@ void KviListWindow::connectionStateChange()
 	}
 }
 
-QPixmap * KviListWindow::myIconPtr()
+QPixmap * ListWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_LIST);
 }
 
-void KviListWindow::resizeEvent(QResizeEvent *)
+void ListWindow::resizeEvent(QResizeEvent *)
 {
 	int iHeight = m_pTopSplitter->sizeHint().height();
 	m_pTopSplitter->setGeometry(0,0,width(),iHeight);
 	m_pSplitter->setGeometry(0,iHeight,width(),height() - iHeight);
 }
 
-QSize KviListWindow::sizeHint() const
+QSize ListWindow::sizeHint() const
 {
 	return m_pSplitter->sizeHint();
 }
 
-void KviListWindow::fillCaptionBuffers()
+void ListWindow::fillCaptionBuffers()
 {
 	KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Channel List [IRC Context %u]"),m_pConsole->context()->id());
 }
 
-void KviListWindow::die()
+void ListWindow::die()
 {
 	close();
 }
 
-void KviListWindow::exportList()
+void ListWindow::exportList()
 {
 	if(!m_pTreeWidget->topLevelItemCount())
 	{
@@ -371,10 +371,10 @@ void KviListWindow::exportList()
 		KviConfigurationFile cfg(szFile,KviConfigurationFile::Write);
 		cfg.clear();
 
-		KviChannelTreeWidgetItem * it;
+		ChannelTreeWidgetItem * it;
 		for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++)
 		{
-			it = (KviChannelTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+			it = (ChannelTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 			cfg.setGroup(it->itemData()->m_szChan);
 			// Write properties
 			cfg.writeEntry("topic",it->itemData()->m_szTopic);
@@ -383,7 +383,7 @@ void KviListWindow::exportList()
 	}
 }
 
-void KviListWindow::importList()
+void ListWindow::importList()
 {
 	QString szFile;
 
@@ -403,7 +403,7 @@ void KviListWindow::importList()
 		{
 			cfg.setGroup(it.currentKey());
 			m_pItemList->append(
-					new KviChannelTreeWidgetItemData(
+					new ChannelTreeWidgetItemData(
 						it.currentKey(),
 						cfg.readEntry("users","0"),
 						cfg.readEntry("topic","")
@@ -415,7 +415,7 @@ void KviListWindow::importList()
 	}
 }
 
-void KviListWindow::control(int iMsg)
+void ListWindow::control(int iMsg)
 {
 	switch(iMsg)
 	{
@@ -431,12 +431,12 @@ void KviListWindow::control(int iMsg)
 	}
 }
 
-void KviListWindow::reset()
+void ListWindow::reset()
 {
 	outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Reset"));
 }
 
-void KviListWindow::endOfList()
+void ListWindow::endOfList()
 {
 	if(m_pFlushTimer)
 	{
@@ -448,7 +448,7 @@ void KviListWindow::endOfList()
 	flush(); // give it the last kick
 }
 
-void KviListWindow::startOfList()
+void ListWindow::startOfList()
 {
 	m_pItemList->setAutoDelete(true);
 	m_pItemList->clear();
@@ -459,14 +459,14 @@ void KviListWindow::startOfList()
 	m_pRequestButton->setEnabled(false);
 }
 
-void KviListWindow::liveSearch(const QString & szText)
+void ListWindow::liveSearch(const QString & szText)
 {
 	QRegExp res(szText,Qt::CaseInsensitive,QRegExp::Wildcard);
 
-	KviChannelTreeWidgetItem * pItem=0;
+	ChannelTreeWidgetItem * pItem=0;
 	for(int i=0; i<m_pTreeWidget->topLevelItemCount(); i++)
 	{
-		pItem = (KviChannelTreeWidgetItem*) m_pTreeWidget->topLevelItem(i);
+		pItem = (ChannelTreeWidgetItem*) m_pTreeWidget->topLevelItem(i);
 		if(pItem->itemData()->m_szChan.contains(res) ||
 			pItem->itemData()->m_szTopic.contains(res))
 		{
@@ -477,7 +477,7 @@ void KviListWindow::liveSearch(const QString & szText)
 	}
 }
 
-void KviListWindow::processData(KviIrcMessage * pMsg)
+void ListWindow::processData(KviIrcMessage * pMsg)
 {
 	if(!m_pFlushTimer)
 	{
@@ -490,7 +490,7 @@ void KviListWindow::processData(KviIrcMessage * pMsg)
 	if(m_pParamsEdit->text().isEmpty())
 	{
 		m_pItemList->append(
-			new KviChannelTreeWidgetItemData(
+			new ChannelTreeWidgetItemData(
 				pMsg->connection()->decodeText(pMsg->safeParam(1)),
 				pMsg->connection()->decodeText(pMsg->safeParam(2)),
 				pMsg->connection()->decodeText(pMsg->safeTrailing()))
@@ -504,7 +504,7 @@ void KviListWindow::processData(KviIrcMessage * pMsg)
 			)
 		{
 			m_pItemList->append(
-				new KviChannelTreeWidgetItemData(
+				new ChannelTreeWidgetItemData(
 					pMsg->connection()->decodeText(pMsg->safeParam(1)),
 					pMsg->connection()->decodeText(pMsg->safeParam(2)),
 					pMsg->connection()->decodeText(pMsg->safeTrailing())
@@ -520,21 +520,21 @@ void KviListWindow::processData(KviIrcMessage * pMsg)
 	}
 }
 
-void KviListWindow::flush()
+void ListWindow::flush()
 {
 	m_pTreeWidget->setUpdatesEnabled(true); /* for v_scroolbar */
-	while(KviChannelTreeWidgetItemData * d = m_pItemList->first())
+	while(ChannelTreeWidgetItemData * d = m_pItemList->first())
 	{
-		(void)new KviChannelTreeWidgetItem(m_pTreeWidget,d);
+		(void)new ChannelTreeWidgetItem(m_pTreeWidget,d);
 		m_pItemList->removeFirst();
 	}
 	m_pTreeWidget->setUpdatesEnabled(true);
 	m_pTreeWidget->viewport()->update();
 }
 
-void KviListWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
+void ListWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
 {
-	QString szText = ((KviChannelTreeWidgetItem*)it)->itemData()->m_szChan;
+	QString szText = ((ChannelTreeWidgetItem*)it)->itemData()->m_szChan;
 
 	if(szText.isEmpty()) return;
 	if(!connection()) return;
@@ -549,7 +549,7 @@ void KviListWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
 //
 //#warning "Load & save properties of this kind of window"
 
-//void KviListWindow::saveProperties()
+//void ListWindow::saveProperties()
 //{
 //	KviWindowProperty p;
 //	p.rect = externalGeometry();
@@ -566,7 +566,7 @@ void KviListWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
 //	g_pOptions->m_pWinPropertiesList->setProperty(caption(),&p);
 //}
 //
-//void KviListWindow::setProperties(KviWindowProperty *p)
+//void ListWindow::setProperties(KviWindowProperty *p)
 //{
 //	QValueList<int> l;
 //	l.append(p->splitWidth1);
@@ -576,7 +576,7 @@ void KviListWindow::itemDoubleClicked(QTreeWidgetItem * it, int)
 //	m_pIrcView->setShowImages(p->imagesVisible);
 //}
 
-void KviListWindow::applyOptions()
+void ListWindow::applyOptions()
 {
 	m_pTreeWidget->applyOptions();
 	m_pIrcView->applyOptions();
@@ -586,5 +586,5 @@ void KviListWindow::applyOptions()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "listwindow.moc"
+#include "ListWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/list/listwindow.h b/src/modules/list/ListWindow.h
index 0ee5eda83..cf8cf3d17 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/ListWindow.h
@@ -2,7 +2,7 @@
 #define _LISTWINDOW_H_
 //=============================================================================
 //
-//   File : listwindow.h
+//   File : ListWindow.h
 //   Creation date : Thu Oct 7 2001 13:27:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -41,48 +41,48 @@
 class KviThemedLabel;
 class KviThemedLineEdit;
 
-class KviChannelTreeWidgetItemDelegate : public QItemDelegate
+class ChannelTreeWidgetItemDelegate : public QItemDelegate
 {
 public:
-	KviChannelTreeWidgetItemDelegate(QTreeWidget * pWidget = 0);
-	~KviChannelTreeWidgetItemDelegate();
+	ChannelTreeWidgetItemDelegate(QTreeWidget * pWidget = 0);
+	~ChannelTreeWidgetItemDelegate();
 	void paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
 };
 
-class KviChannelTreeWidgetItemData
+class ChannelTreeWidgetItemData
 {
-	friend class KviChannelTreeWidgetItem;
-	friend class KviListWindow;
-	friend class KviChannelTreeWidgetItemDelegate;
+	friend class ChannelTreeWidgetItem;
+	friend class ListWindow;
+	friend class ChannelTreeWidgetItemDelegate;
 public:
-	KviChannelTreeWidgetItemData(const QString & szChan, const QString & szUsers, const QString & szTopic);
-	~KviChannelTreeWidgetItemData();
+	ChannelTreeWidgetItemData(const QString & szChan, const QString & szUsers, const QString & szTopic);
+	~ChannelTreeWidgetItemData();
 protected:
 	QString m_szChan;
 	QString m_szUsers;
 	QString m_szTopic;
 };
 
-class KviChannelTreeWidgetItem : public QTreeWidgetItem
+class ChannelTreeWidgetItem : public QTreeWidgetItem
 {
-	friend class KviListWindow;
+	friend class ListWindow;
 public:
-	KviChannelTreeWidgetItem(QTreeWidget * pWidget, KviChannelTreeWidgetItemData * pData);
-	~KviChannelTreeWidgetItem();
+	ChannelTreeWidgetItem(QTreeWidget * pWidget, ChannelTreeWidgetItemData * pData);
+	~ChannelTreeWidgetItem();
 private:
-	KviChannelTreeWidgetItemData * m_pData;
+	ChannelTreeWidgetItemData * m_pData;
 public:
 	int width (const QFontMetrics & fm, const QTreeWidget * pWidget, int iColumn) const;
 	bool operator<(const QTreeWidgetItem & other) const;
-	inline KviChannelTreeWidgetItemData * itemData() { return m_pData; }; 
+	inline ChannelTreeWidgetItemData * itemData() { return m_pData; }; 
 };
 
-class KviListWindow : public KviWindow, public KviExternalServerDataParser
+class ListWindow : public KviWindow, public KviExternalServerDataParser
 {
 	Q_OBJECT
 public:
-	KviListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole);
-	~KviListWindow();
+	ListWindow(KviMainWindow * lpFrm, KviConsoleWindow * lpConsole);
+	~ListWindow();
 protected:
 	QSplitter                                    * m_pVertSplitter;
 	QSplitter                                    * m_pTopSplitter;
@@ -94,7 +94,7 @@ protected:
 	QToolButton                                  * m_pSaveButton;
 	KviThemedLabel                               * m_pInfoLabel;
 	QTimer                                       * m_pFlushTimer;
-	KviPointerList<KviChannelTreeWidgetItemData> * m_pItemList;
+	KviPointerList<ChannelTreeWidgetItemData> * m_pItemList;
 public: // Methods
 	virtual void control(int iMsg);
 	virtual void processData(KviIrcMessage * pMsg);
diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp
index 1ea7a0d1a..9491b5bac 100644
--- a/src/modules/list/libkvilist.cpp
+++ b/src/modules/list/libkvilist.cpp
@@ -21,7 +21,7 @@
 //
 //=============================================================================
 
-#include "listwindow.h"
+#include "ListWindow.h"
 
 #include "KviModule.h"
 #include "KviMainWindow.h"
@@ -30,7 +30,7 @@
 
 #include <QSplitter>
 
-KviPointerList<KviListWindow> * g_pListWindowList = 0;
+KviPointerList<ListWindow> * g_pListWindowList = 0;
 
 
 /*
@@ -55,7 +55,7 @@ static bool list_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 	if(!(c->window()->context()->listWindow()))
 	{
-		KviListWindow * w = new KviListWindow(c->window()->frame(),c->window()->console());
+		ListWindow * w = new ListWindow(c->window()->frame(),c->window()->console());
 		c->window()->frame()->addWindow(w);
 	} else {
 		c->warning(__tr2qs("List window already open for this IRC context"));
@@ -66,7 +66,7 @@ static bool list_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 static bool list_module_init(KviModule * m)
 {
-	g_pListWindowList = new KviPointerList<KviListWindow>;
+	g_pListWindowList = new KviPointerList<ListWindow>;
 	g_pListWindowList->setAutoDelete(false);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",list_kvs_cmd_open);
diff --git a/src/modules/logview/CMakeLists.txt b/src/modules/logview/CMakeLists.txt
index 2848d5bf1..d413a069e 100644
--- a/src/modules/logview/CMakeLists.txt
+++ b/src/modules/logview/CMakeLists.txt
@@ -3,13 +3,13 @@
 SUBDIRS(caps)
 
 SET(kvilogview_MOC_HDRS
-	logviewmdiwindow.h
+	LogViewWindow.h
 )
 
 SET(kvilogview_SRCS
 	libkvilogview.cpp
-	logviewwidget.cpp
-	logviewmdiwindow.cpp
+	LogViewWidget.cpp
+	LogViewWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/LogViewWidget.cpp
index 3d8e8642e..094f22168 100644
--- a/src/modules/logview/logviewwidget.cpp
+++ b/src/modules/logview/LogViewWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : logviewwidget.cpp
+//   File : LogViewWidget.cpp
 //   Creation date : Thu Apr 23 2002 17:42:12 by Juanjo Alvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "logviewwidget.h"
+#include "LogViewWidget.h"
 
 //#include "kvi_debug.h"
 #include "KviLocale.h"
@@ -39,45 +39,45 @@
 	#include <zlib.h>
 #endif
 
-KviLogListViewItem::KviLogListViewItem(QTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
+LogListViewItem::LogListViewItem(QTreeWidgetItem * par, LogFile::KviLogTypes type, LogFile * fileData)
 : QTreeWidgetItem(par), m_type(type), m_pFileData(fileData)
 {
 	setText(0,m_pFileData ? m_pFileData->name() : QString());
 }
 
-KviLogListViewItem::KviLogListViewItem(QTreeWidget * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
+LogListViewItem::LogListViewItem(QTreeWidget * par, LogFile::KviLogTypes type, LogFile * fileData)
 : QTreeWidgetItem(par), m_type(type), m_pFileData(fileData)
 {
 	setText(0,m_pFileData ? m_pFileData->name() : QString());
 }
 
-KviLogListViewItemFolder::KviLogListViewItemFolder(QTreeWidgetItem * par, const QString& label)
-: KviLogListViewItem(par,KviLogFile::Other,0)
+LogListViewItemFolder::LogListViewItemFolder(QTreeWidgetItem * par, const QString& label)
+: LogListViewItem(par,LogFile::Other,0)
 {
 	setText(0,label);
 }
 
-KviLogListViewItemType::KviLogListViewItemType(QTreeWidget * par, KviLogFile::KviLogTypes type)
-: KviLogListViewItem(par,type,0)
+LogListViewItemType::LogListViewItemType(QTreeWidget * par, LogFile::KviLogTypes type)
+: LogListViewItem(par,type,0)
 {
 	QIcon icon;
 	QString text;
 
 	switch(m_type)
 	{
-		case KviLogFile::Channel:
+		case LogFile::Channel:
 			icon= QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL));
 			text = __tr2qs_ctx("Channel","logview");
 			break;
-		case KviLogFile::Query:
+		case LogFile::Query:
 			icon= QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_QUERY));
 			text = __tr2qs_ctx("Query","logview");
 			break;
-		case KviLogFile::DccChat:
+		case LogFile::DccChat:
 			icon= QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG));
 			text = __tr2qs_ctx("DCC Chat","logview");
 			break;
-		case KviLogFile::Console:
+		case LogFile::Console:
 			icon= QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE));
 			text = __tr2qs_ctx("Console","logview");
 			break;
@@ -91,12 +91,12 @@ KviLogListViewItemType::KviLogListViewItemType(QTreeWidget * par, KviLogFile::Kv
 	setText(0, text);
 }
 
-KviLogListViewLog::KviLogListViewLog(QTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData)
-: KviLogListViewItem(par,type,fileData)
+LogListViewLog::LogListViewLog(QTreeWidgetItem * par, LogFile::KviLogTypes type, LogFile * fileData)
+: LogListViewItem(par,type,fileData)
 {
 	setText(0, m_pFileData->date().toString("yyyy-MM-dd"));
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "logviewwidget.moc"
+#include "LogViewWidget.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/logview/logviewwidget.h b/src/modules/logview/LogViewWidget.h
index 9a0a46c34..c1f33e4ea 100644
--- a/src/modules/logview/logviewwidget.h
+++ b/src/modules/logview/LogViewWidget.h
@@ -2,7 +2,7 @@
 #define _LOGVIEWWIDGET_H_
 //=============================================================================
 //
-//   File : logviewwidget.h
+//   File : LogViewWidget.h
 //   Creation date : Thue Apr 23 2002 03:01:53 CET by Juanjo Alvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "logviewmdiwindow.h"
+#include "LogViewWindow.h"
 
 #include "KviWindow.h"
 #include "KviScriptEditor.h"
@@ -33,44 +33,44 @@
 
 class KviScriptEditor;
 
-class KviLogListViewItem : public QTreeWidgetItem
+class LogListViewItem : public QTreeWidgetItem
 {
 public:
-	KviLogListViewItem(QTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData);
-	KviLogListViewItem(QTreeWidget * par, KviLogFile::KviLogTypes type, KviLogFile * fileData);
-	~KviLogListViewItem() {};
+	LogListViewItem(QTreeWidgetItem * par, LogFile::KviLogTypes type, LogFile * fileData);
+	LogListViewItem(QTreeWidget * par, LogFile::KviLogTypes type, LogFile * fileData);
+	~LogListViewItem() {};
 public:
-	KviLogFile::KviLogTypes m_type;
-	KviLogFile*             m_pFileData;
+	LogFile::KviLogTypes m_type;
+	LogFile*             m_pFileData;
 	virtual QString fileName() const { return QString(); };
 };
 
-class KviLogListViewItemFolder : public KviLogListViewItem
+class LogListViewItemFolder : public LogListViewItem
 {
 public:
-	KviLogListViewItemFolder(QTreeWidgetItem * par, const QString& label);
-	~KviLogListViewItemFolder() {};
+	LogListViewItemFolder(QTreeWidgetItem * par, const QString& label);
+	~LogListViewItemFolder() {};
 public:
 };
 
-class KviLogListViewItemType : public KviLogListViewItem
+class LogListViewItemType : public LogListViewItem
 {
 public:
-	KviLogListViewItemType(QTreeWidget * par, KviLogFile::KviLogTypes type);
-	~KviLogListViewItemType() {};
+	LogListViewItemType(QTreeWidget * par, LogFile::KviLogTypes type);
+	~LogListViewItemType() {};
 };
 
 
-class KviLogListViewLog : public KviLogListViewItem
+class LogListViewLog : public LogListViewItem
 {
 public:
-	KviLogListViewLog(QTreeWidgetItem * par, KviLogFile::KviLogTypes type, KviLogFile * fileData);
-	~KviLogListViewLog() {};
+	LogListViewLog(QTreeWidgetItem * par, LogFile::KviLogTypes type, LogFile * fileData);
+	~LogListViewLog() {};
 	virtual QString fileName() const { return m_pFileData->fileName(); };
 protected:
 	bool operator<(const QTreeWidgetItem &other)const
 	{
-		return m_pFileData->date() < ((KviLogListViewLog*)&other)->m_pFileData->date();
+		return m_pFileData->date() < ((LogListViewLog*)&other)->m_pFileData->date();
 	}
 };
 
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/LogViewWindow.cpp
index 19fd41173..60a4e4da4 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : logviewmdiwindow.cpp
+//   File : LogViewWindow.cpp
 //   Creation date : Tue Apr 23 2002 18:08:22 by Juanjo Alvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,8 +23,8 @@
 //
 //=============================================================================
 
-#include "logviewmdiwindow.h"
-#include "logviewwidget.h"
+#include "LogViewWindow.h"
+#include "LogViewWidget.h"
 
 #include "KviIconManager.h"
 #include "KviLocale.h"
@@ -63,9 +63,9 @@
 
 #include <limits.h> //for INT_MAX
 
-extern KviLogViewMDIWindow * g_pLogViewWindow;
+extern LogViewWindow * g_pLogViewWindow;
 
-KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
+LogViewWindow::LogViewWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_LOGVIEW,lpFrm,"logview"), KviModuleExtension(d)
 {
 	g_pLogViewWindow = this;
@@ -86,9 +86,9 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviMai
 	m_pBottomLayout->setVisible(false);
 
 	m_pIndexTab  = new KviTalVBox(m_pTabWidget);
-	m_pTabWidget->addTab(m_pIndexTab,__tr2qs_ctx("Index","logview"));
+	m_pTabWidget->addTab(m_pIndexTab,__tr2qs_ctx("HelpIndex","logview"));
 
-	m_pListView = new KviLogViewListView(m_pIndexTab);
+	m_pListView = new LogViewListView(m_pIndexTab);
 
 	connect(m_pListView,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(itemSelected(QTreeWidgetItem *,QTreeWidgetItem *)));
 	connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *,QPoint)),
@@ -180,12 +180,12 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviMai
 	QTimer::singleShot( 0, this, SLOT(cacheFileList()) );
 }
 
-KviLogViewMDIWindow::~KviLogViewMDIWindow()
+LogViewWindow::~LogViewWindow()
 {
 	g_pLogViewWindow = 0;
 }
 
-void KviLogViewMDIWindow::keyPressEvent(QKeyEvent *e)
+void LogViewWindow::keyPressEvent(QKeyEvent *e)
 {
 //Make CtrlKey and CommandKey ("Apple") behave equally on MacOSX.
 //This way typical X11 and Apple shortcuts can be used simultanously within the input line.
@@ -200,38 +200,38 @@ void KviLogViewMDIWindow::keyPressEvent(QKeyEvent *e)
 	KviWindow::keyPressEvent(e);
 }
 
-void KviLogViewMDIWindow::applyFilter()
+void LogViewWindow::applyFilter()
 {
 	setupItemList();
 }
 
-QPixmap * KviLogViewMDIWindow::myIconPtr()
+QPixmap * LogViewWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_LOG);
 }
 
-void KviLogViewMDIWindow::resizeEvent(QResizeEvent *)
+void LogViewWindow::resizeEvent(QResizeEvent *)
 {
 	m_pSplitter->setGeometry(0,0,width(),height());
 }
 
-void KviLogViewMDIWindow::fillCaptionBuffers()
+void LogViewWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","logview");
 }
 
-void KviLogViewMDIWindow::die()
+void LogViewWindow::die()
 {
 	close();
 }
 
-QSize KviLogViewMDIWindow::sizeHint() const
+QSize LogViewWindow::sizeHint() const
 {
 	QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height());
 	return ret;
 }
 
-void KviLogViewMDIWindow::setupItemList()
+void LogViewWindow::setupItemList()
 {
 	if(m_logList.isEmpty())
 		return;
@@ -250,27 +250,27 @@ void KviLogViewMDIWindow::setupItemList()
 	m_pTimer->start(); //singleshot
 }
 
-void KviLogViewMDIWindow::abortFilter()
+void LogViewWindow::abortFilter()
 {
 	m_bAborted=true;
 }
 
-void KviLogViewMDIWindow::filterNext()
+void LogViewWindow::filterNext()
 {
 	QString szCurGroup;
-	KviLogFile * pFile=m_logList.current();
+	LogFile * pFile=m_logList.current();
 	if(!pFile)
 		goto filter_last;
 
-	if(pFile->type()==KviLogFile::Channel && !m_pShowChannelsCheck->isChecked())
+	if(pFile->type()==LogFile::Channel && !m_pShowChannelsCheck->isChecked())
 		goto filter_next;
-	if(pFile->type()==KviLogFile::Console && !m_pShowConsolesCheck->isChecked())
+	if(pFile->type()==LogFile::Console && !m_pShowConsolesCheck->isChecked())
 		goto filter_next;
-	if(pFile->type()==KviLogFile::DccChat && !m_pShowDccChatCheck->isChecked())
+	if(pFile->type()==LogFile::DccChat && !m_pShowDccChatCheck->isChecked())
 		goto filter_next;
-	if(pFile->type()==KviLogFile::Other && !m_pShowOtherCheck->isChecked())
+	if(pFile->type()==LogFile::Other && !m_pShowOtherCheck->isChecked())
 		goto filter_next;
-	if(pFile->type()==KviLogFile::Query && !m_pShowQueryesCheck->isChecked())
+	if(pFile->type()==LogFile::Query && !m_pShowQueryesCheck->isChecked())
 		goto filter_next;
 
 	if(m_pEnableFromFilter->isChecked())
@@ -296,9 +296,9 @@ void KviLogViewMDIWindow::filterNext()
 	if(m_pLastCategory)
 	{
 		if(m_pLastCategory->m_type!=pFile->type())
-			m_pLastCategory = new KviLogListViewItemType(m_pListView,pFile->type());
+			m_pLastCategory = new LogListViewItemType(m_pListView,pFile->type());
 	} else {
-		m_pLastCategory = new KviLogListViewItemType(m_pListView,pFile->type());
+		m_pLastCategory = new LogListViewItemType(m_pListView,pFile->type());
 	}
 
 	KviQString::sprintf(szCurGroup, __tr2qs_ctx("%Q on %Q","logview"), &(pFile->name()), &(pFile->network()));
@@ -306,10 +306,10 @@ void KviLogViewMDIWindow::filterNext()
 	if(m_szLastGroup!=szCurGroup)
 	{
 		m_szLastGroup=szCurGroup;
-		m_pLastGroupItem=new KviLogListViewItemFolder(m_pLastCategory,m_szLastGroup);
+		m_pLastGroupItem=new LogListViewItemFolder(m_pLastCategory,m_szLastGroup);
 	}
 
-	new KviLogListViewLog(m_pLastGroupItem,pFile->type(),pFile);
+	new LogListViewLog(m_pLastGroupItem,pFile->type(),pFile);
 
 filter_next:
 	pFile = m_logList.next();
@@ -327,7 +327,7 @@ filter_last:
 	}
 }
 
-void KviLogViewMDIWindow::cacheFileList()
+void LogViewWindow::cacheFileList()
 {
 	QStringList m_pFileNames = getFileNames();
 	m_pFileNames.sort();
@@ -338,23 +338,23 @@ void KviLogViewMDIWindow::cacheFileList()
 		szFname=(*it);
 		QFileInfo fi(szFname);
 		if(fi.suffix()=="gz" || fi.suffix()=="log")
-			m_logList.append(new KviLogFile(szFname));
+			m_logList.append(new LogFile(szFname));
 	}
 
 	setupItemList();
 }
 
-void KviLogViewMDIWindow::itemSelected(QTreeWidgetItem * it,QTreeWidgetItem *)
+void LogViewWindow::itemSelected(QTreeWidgetItem * it,QTreeWidgetItem *)
 {
 	//A parent node
 	m_pIrcView->clearBuffer();
-	if(!it || !it->parent() || !(((KviLogListViewItem *)it)->m_pFileData) )
+	if(!it || !it->parent() || !(((LogListViewItem *)it)->m_pFileData) )
 	{
 		return;
 	}
 
 	QString text;
-	((KviLogListViewItem *)it)->m_pFileData->getText(text,m_szLogDirectory);
+	((LogListViewItem *)it)->m_pFileData->getText(text,m_szLogDirectory);
 
 	QStringList lines= text.split('\n');
 	bool bOk;
@@ -370,7 +370,7 @@ void KviLogViewMDIWindow::itemSelected(QTreeWidgetItem * it,QTreeWidgetItem *)
 	m_pIrcView->repaint();
 }
 
-QStringList KviLogViewMDIWindow::getFileNames()
+QStringList LogViewWindow::getFileNames()
 {
 	QString logPath;
 	g_pApp->getLocalKvircDirectory(logPath,KviApplication::Log);
@@ -379,22 +379,22 @@ QStringList KviLogViewMDIWindow::getFileNames()
 	return logDir.entryList();
 }
 
-void KviLogViewMDIWindow::rightButtonClicked ( QTreeWidgetItem * it, const QPoint &)
+void LogViewWindow::rightButtonClicked ( QTreeWidgetItem * it, const QPoint &)
 {
 	if(!it) return;
 	m_pListView->setCurrentItem(it);
 
 	KviTalPopupMenu* popup = new KviTalPopupMenu(this);
-	if(((KviLogListViewItem *)it)->childCount())
+	if(((LogListViewItem *)it)->childCount())
 		popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove all these channel/query log files","logview"),this,SLOT(deleteCurrent()));
 	else popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,SLOT(deleteCurrent()));
 
 	popup->exec( QCursor::pos() );
 }
 
-void KviLogViewMDIWindow::deleteCurrent()
+void LogViewWindow::deleteCurrent()
 {
-	KviLogListViewItem* pItem = (KviLogListViewItem *)(m_pListView->currentItem());
+	LogListViewItem* pItem = (LogListViewItem *)(m_pListView->currentItem());
 	if(pItem)
 	{
 		if (pItem->childCount())
@@ -404,29 +404,29 @@ void KviLogViewMDIWindow::deleteCurrent()
 				__tr2qs("Confirm current user logs delete"),
 			"Do you really wish to delete all these channel/query logs?", __tr2qs("&Yes"), __tr2qs("&No"),0,1
 			) != 0) return;
-			KviPointerList <KviLogListViewItem> itemsList;
+			KviPointerList <LogListViewItem> itemsList;
 			itemsList.setAutoDelete(false);
 			for(int i=0;i<pItem->childCount();i++)
 			{
 				if (!pItem->child(i)->childCount())
 				{
-					itemsList.append((KviLogListViewItem*)pItem->child(i));
+					itemsList.append((LogListViewItem*)pItem->child(i));
 					continue;
 				}
-				KviLogListViewItem* pChild=(KviLogListViewItem*)pItem->child(i);
+				LogListViewItem* pChild=(LogListViewItem*)pItem->child(i);
 				for(int j=0;j<pChild->childCount();j++)
 				{
-					if (!(KviLogListViewItem*)pChild->child(j))
+					if (!(LogListViewItem*)pChild->child(j))
 					{
 						qDebug("Null pointer in logviewitem");
 						continue;
 					}
-					itemsList.append((KviLogListViewItem*)pChild->child(j));
+					itemsList.append((LogListViewItem*)pChild->child(j));
 				}
 			}
 			for(unsigned int i=0;i<itemsList.count();i++)
 			{
-				KviLogListViewItem *pCurItem=itemsList.at(i);
+				LogListViewItem *pCurItem=itemsList.at(i);
 				if(!pCurItem->fileName().isNull())
 				{
 					QString szFname;
@@ -449,7 +449,7 @@ void KviLogViewMDIWindow::deleteCurrent()
 	}
 }
 
-KviLogFile::KviLogFile(const QString & szName)
+LogFile::LogFile(const QString & szName)
 {
 	/*
 	Log is in the format
@@ -498,7 +498,7 @@ KviLogFile::KviLogFile(const QString & szName)
 	//qDebug("type=%i, name=%s, net=%s, date=%i %i %i",m_type,m_szName.ascii(),m_szNetwork.ascii(),iYear,iMonth,iDay);
 }
 
-void KviLogFile::getText(QString & text,const QString& logDir){
+void LogFile::getText(QString & text,const QString& logDir){
 	QString logName = logDir;
 	QFile logFile;
 	logName.append(fileName());
@@ -540,7 +540,7 @@ void KviLogFile::getText(QString & text,const QString& logDir){
 #endif
 }
 
-KviLogViewListView::KviLogViewListView(QWidget * par)
+LogViewListView::LogViewListView(QWidget * par)
 : QTreeWidget(par)
 {
 	header()->setSortIndicatorShown(true);
@@ -552,7 +552,7 @@ KviLogViewListView::KviLogViewListView(QWidget * par)
 	setAnimated(true);
 }
 
-void KviLogViewListView::mousePressEvent (QMouseEvent *e)
+void LogViewListView::mousePressEvent (QMouseEvent *e)
 {
 	if (e->button() == Qt::RightButton)
 	{
@@ -563,5 +563,5 @@ void KviLogViewListView::mousePressEvent (QMouseEvent *e)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "logviewmdiwindow.moc"
+#include "LogViewWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/LogViewWindow.h
index 41ed93285..34cf55e6b 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/LogViewWindow.h
@@ -2,7 +2,7 @@
 #define _LOGVIEWMDIWINDOW_H_
 //=============================================================================
 //
-//   File : logviewmdiwindow.h
+//   File : LogViewWindow.h
 //   Creation date : Tue Apr 23 2002 18:05:59 by Juanjo Alvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -41,10 +41,10 @@ class QStringList;
 class QLineEdit;
 class QDateEdit;
 class KviLogViewWidget;
-class KviLogListViewItem;
-class KviLogListViewItemFolder;
+class LogListViewItem;
+class LogListViewItemFolder;
 
-class KviLogFile {
+class LogFile {
 
 public:
 
@@ -56,7 +56,7 @@ public:
 		Other
 	};
 
-	KviLogFile(const QString& name);
+	LogFile(const QString& name);
 
 	const QString & fileName() const { return m_szFilename; };
 	const QString & name() const { return m_szName; };
@@ -75,28 +75,28 @@ private:
 	QDate        m_date;
 };
 
-class KviLogViewListView : public QTreeWidget
+class LogViewListView : public QTreeWidget
 {
 	Q_OBJECT
 public:
-	KviLogViewListView(QWidget*);
-	~KviLogViewListView(){};
+	LogViewListView(QWidget*);
+	~LogViewListView(){};
 protected:
 	void mousePressEvent (QMouseEvent *e);
 signals:
 	void rightButtonPressed(QTreeWidgetItem *,QPoint);
 };
 
-class KviLogViewMDIWindow : public KviWindow, public KviModuleExtension
+class LogViewWindow : public KviWindow, public KviModuleExtension
 {
     Q_OBJECT
 public:
-	KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm);
-	~KviLogViewMDIWindow();
+	LogViewWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm);
+	~LogViewWindow();
 protected:
-	KviPointerList<KviLogFile> m_logList;
+	KviPointerList<LogFile> m_logList;
 
-	KviLogViewListView     * m_pListView;
+	LogViewListView     * m_pListView;
 
 	// Type filter
 	QCheckBox          * m_pShowChannelsCheck;
@@ -125,8 +125,8 @@ protected:
 	QPushButton        * m_pCancelButton;
 	KviTalHBox         * m_pBottomLayout;
 	QProgressBar       * m_pProgressBar;
-	KviLogListViewItem * m_pLastCategory;
-	KviLogListViewItemFolder *m_pLastGroupItem;
+	LogListViewItem * m_pLastCategory;
+	LogListViewItemFolder *m_pLastGroupItem;
 	QString              m_szLastGroup;
 	bool                 m_bAborted;
 	QTimer             * m_pTimer;
diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index b7b88a71e..3148da280 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "logviewwidget.h"
-#include "logviewmdiwindow.h"
+#include "LogViewWidget.h"
+#include "LogViewWindow.h"
 
 #include "KviConfigurationFile.h"
 #include "KviModule.h"
@@ -33,7 +33,7 @@
 #include "KviApplication.h"
 
 static QRect                 g_rectLogViewGeometry;
-KviLogViewMDIWindow        * g_pLogViewWindow = 0;
+LogViewWindow        * g_pLogViewWindow = 0;
 
 #define LOGVIEW_MODULE_EXTENSION_NAME "Log viewer extension"
 
@@ -100,7 +100,7 @@ static KviModuleExtension * logview_extension_alloc(KviModuleExtensionAllocStruc
 			}
 		}
 
-		g_pLogViewWindow = new KviLogViewMDIWindow(s->pDescriptor,g_pFrame);
+		g_pLogViewWindow = new LogViewWindow(s->pDescriptor,g_pFrame);
 		g_pFrame->addWindow(g_pLogViewWindow,!bCreateMinimized);
 		if(bCreateMinimized)g_pLogViewWindow->minimize();
 		return g_pLogViewWindow;
diff --git a/src/modules/mediaplayer/CMakeLists.txt b/src/modules/mediaplayer/CMakeLists.txt
index 9ab400403..746132d46 100644
--- a/src/modules/mediaplayer/CMakeLists.txt
+++ b/src/modules/mediaplayer/CMakeLists.txt
@@ -2,12 +2,12 @@
 
 SET(kvimediaplayer_SRCS
 	libkvimediaplayer.cpp
-	mp_interface.cpp
-	mp_mp3.cpp
-	mp_winampinterface.cpp
-	mp_xmmsinterface.cpp
-	mp_amipinterface.cpp
-	mp_mprisinterface.cpp
+	MpInterface.cpp
+	MpMp3.cpp
+	MpWinampInterface.cpp
+	MpXmmsInterface.cpp
+	MpAmipInterface.cpp
+	MpMprisInterface.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/mediaplayer/mp_amipinterface.cpp b/src/modules/mediaplayer/MpAmipInterface.cpp
index df4e309cd..60c7390f0 100644
--- a/src/modules/mediaplayer/mp_amipinterface.cpp
+++ b/src/modules/mediaplayer/MpAmipInterface.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : mp_amipinterface.cpp
+//   File : MpAmipInterface.cpp
 //   Creation date : Sun 27 Mar 2005 16:55:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "mp_amipinterface.h"
+#include "MpAmipInterface.h"
 #include "KviOptions.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -102,7 +102,7 @@ static QTextCodec * mediaplayer_get_codec()
 }
 
 MP_IMPLEMENT_DESCRIPTOR(
-	KviAmipInterface,
+	MpAmipInterface,
 	"amip",
 	__tr2qs_ctx(
 		"An interface to the AMIP plug-in.\n" \
@@ -116,8 +116,8 @@ MP_IMPLEMENT_DESCRIPTOR(
 
 
 
-KviAmipInterface::KviAmipInterface()
-: KviMediaPlayerInterface()
+MpAmipInterface::MpAmipInterface()
+: MpInterface()
 {
 	if(!amip_dll) {
 		bool res = loadAmipDll();
@@ -129,7 +129,7 @@ KviAmipInterface::KviAmipInterface()
 	}
 }
 
-KviAmipInterface::~KviAmipInterface()
+MpAmipInterface::~MpAmipInterface()
 {
 	if(!amip_dll) return;
 	ac_uninit();
@@ -138,7 +138,7 @@ KviAmipInterface::~KviAmipInterface()
 }
 
 
-int KviAmipInterface::detect(bool bStart)
+int MpAmipInterface::detect(bool bStart)
 {
 	if(!amip_dll) return 0;
 	char host[AC_BUFFER_SIZE];
@@ -148,7 +148,7 @@ int KviAmipInterface::detect(bool bStart)
 }
 
 #define MP_AMIP_COMMAND(__cmdname,__acmd) \
-	bool KviAmipInterface::__cmdname() \
+	bool MpAmipInterface::__cmdname() \
 	{ \
 		return (ac_exec(__acmd) == AC_ERR_NOERROR); \
 	}
@@ -181,27 +181,27 @@ QString eval_str(const char *var)
 	return res;
 }
 
-int KviAmipInterface::length()
+int MpAmipInterface::length()
 {
 	return eval_int("var_sl") * 1000;
 }
 
-int KviAmipInterface::position()
+int MpAmipInterface::position()
 {
 	return eval_int("var_psec") * 1000;
 }
 
-int KviAmipInterface::bitRate()
+int MpAmipInterface::bitRate()
 {
 	return eval_int("var_br");
 }
 
-int KviAmipInterface::sampleRate()
+int MpAmipInterface::sampleRate()
 {
 	return eval_int("var_sr");
 }
 
-int KviAmipInterface::channels()
+int MpAmipInterface::channels()
 {
 	int ret = -1;
 	if(eval_str("var_typ").startsWith("Stereo"))
@@ -211,28 +211,28 @@ int KviAmipInterface::channels()
 	return ret;
 }
 
-KviMediaPlayerInterface::PlayerStatus KviAmipInterface::status()
+MpInterface::PlayerStatus MpAmipInterface::status()
 {
 	int ret = eval_int("var_stat");
 	switch(ret)
 	{
 		case 0:
-			return KviMediaPlayerInterface::Stopped;
+			return MpInterface::Stopped;
 		break;
 		case 3:
-			return KviMediaPlayerInterface::Paused;
+			return MpInterface::Paused;
 		break;
 		case 1:
-			return KviMediaPlayerInterface::Playing;
+			return MpInterface::Playing;
 		break;
 		default:
-			return KviMediaPlayerInterface::Unknown;
+			return MpInterface::Unknown;
 		break;
 	}
-	return KviMediaPlayerInterface::Unknown;
+	return MpInterface::Unknown;
 }
 
-QString KviAmipInterface::mrl()
+QString MpAmipInterface::mrl()
 {
 	QString ret;
 	QString fn = eval_str("var_fn");
@@ -255,42 +255,42 @@ QString getAmipString(const char * var)
 	return ret;
 }
 
-QString KviAmipInterface::nowPlaying()
+QString MpAmipInterface::nowPlaying()
 {
 	return getAmipString("var_s");
 }
 
-QString KviAmipInterface::artist()
+QString MpAmipInterface::artist()
 {
 	return getAmipString("var_1");
 }
 
-QString KviAmipInterface::title()
+QString MpAmipInterface::title()
 {
 	return getAmipString("var_2");
 }
 
-QString KviAmipInterface::album()
+QString MpAmipInterface::album()
 {
 	return getAmipString("var_4");
 }
 
-QString KviAmipInterface::year()
+QString MpAmipInterface::year()
 {
 	return getAmipString("var_5");
 }
 
-QString KviAmipInterface::comment()
+QString MpAmipInterface::comment()
 {
 	return getAmipString("var_6");
 }
 
-QString KviAmipInterface::genre()
+QString MpAmipInterface::genre()
 {
 	return getAmipString("var_7");
 }
 
-bool KviAmipInterface::setVol(kvs_int_t &iVol)
+bool MpAmipInterface::setVol(kvs_int_t &iVol)
 {
 	if(!amip_dll) return false;
 	char volcmd[AC_BUFFER_SIZE];
@@ -298,19 +298,19 @@ bool KviAmipInterface::setVol(kvs_int_t &iVol)
 	return (ac_exec(volcmd) == AC_ERR_NOERROR);
 }
 
-int KviAmipInterface::getVol()
+int MpAmipInterface::getVol()
 {
 	return eval_int("var_vol");
 }
 
-bool KviAmipInterface::jumpTo(kvs_int_t &iPos)
+bool MpAmipInterface::jumpTo(kvs_int_t &iPos)
 {
 	if(!amip_dll) return false;
 	char jmpcmd[AC_BUFFER_SIZE];
 	sprintf(jmpcmd, "jumptotime %d", iPos/1000);
 	return (ac_exec(jmpcmd) == AC_ERR_NOERROR);
 }
-bool KviAmipInterface::hide()
+bool MpAmipInterface::hide()
 {
 	HWND hWinamp = (HWND)eval_int("var_phwnd");
 	if(hWinamp && hWinamp != (HWND)-1)
@@ -321,7 +321,7 @@ bool KviAmipInterface::hide()
 	return false;
 }
 
-bool KviAmipInterface::show()
+bool MpAmipInterface::show()
 {
 	HWND hWinamp = (HWND)eval_int("var_phwnd");
 	if(hWinamp && hWinamp != (HWND)-1)
@@ -332,13 +332,13 @@ bool KviAmipInterface::show()
 	return false;
 }
 
-bool KviAmipInterface::minimize()
+bool MpAmipInterface::minimize()
 {
 	if(!amip_dll) return false;
 	return (ac_exec("control mimimize") == AC_ERR_NOERROR);
 }
 
-bool KviAmipInterface::setPlayListPos(kvs_int_t &iPos)
+bool MpAmipInterface::setPlayListPos(kvs_int_t &iPos)
 {
 	if(!amip_dll) return false;
 	char jmpcmd[AC_BUFFER_SIZE];
@@ -346,27 +346,27 @@ bool KviAmipInterface::setPlayListPos(kvs_int_t &iPos)
 	return (ac_exec(jmpcmd) == AC_ERR_NOERROR);
 }
 
-int KviAmipInterface::getPlayListPos()
+int MpAmipInterface::getPlayListPos()
 {
 	return eval_int("var_pos");
 }
 
-int KviAmipInterface::getListLength()
+int MpAmipInterface::getListLength()
 {
 	return eval_int("var_ll");
 }
 
-bool KviAmipInterface::getRepeat()
+bool MpAmipInterface::getRepeat()
 {
 	return eval_str("var_repeat").startsWith("on");
 }
 
-bool KviAmipInterface::getShuffle()
+bool MpAmipInterface::getShuffle()
 {
 	return eval_str("var_shuffle").startsWith("on");
 }
 
-bool KviAmipInterface::setShuffle(bool &bVal)
+bool MpAmipInterface::setShuffle(bool &bVal)
 {
 	if(!amip_dll) return false;
 	bool res;
@@ -377,7 +377,7 @@ bool KviAmipInterface::setShuffle(bool &bVal)
 	return res;
 }
 
-bool KviAmipInterface::setRepeat(bool &bVal)
+bool MpAmipInterface::setRepeat(bool &bVal)
 {
 	if(!amip_dll) return false;
 	bool res;
@@ -388,7 +388,7 @@ bool KviAmipInterface::setRepeat(bool &bVal)
 	return res;
 }
 
-bool KviAmipInterface::amipExec(const QString &cmd)
+bool MpAmipInterface::amipExec(const QString &cmd)
 {
 	if(!amip_dll) return false;
 	QTextCodec *c=mediaplayer_get_codec();
@@ -396,7 +396,7 @@ bool KviAmipInterface::amipExec(const QString &cmd)
 	return (ac_exec(szCmd) == AC_ERR_NOERROR);
 }
 
-QString KviAmipInterface::amipEval(const QString &cmd)
+QString MpAmipInterface::amipEval(const QString &cmd)
 {
 	QString ret;
 	if(!amip_dll) return ret;
diff --git a/src/modules/mediaplayer/mp_amipinterface.h b/src/modules/mediaplayer/MpAmipInterface.h
index f5eaf664d..e8a9fac34 100644
--- a/src/modules/mediaplayer/mp_amipinterface.h
+++ b/src/modules/mediaplayer/MpAmipInterface.h
@@ -2,7 +2,7 @@
 #define _MP_AMIPINTERFACE_H_
 //=============================================================================
 //
-//   File : mp_amipinterface.cpp
+//   File : MpAmipInterface.cpp
 //   Creation date : Sun 27 Mar 2005 16:55:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -28,13 +28,13 @@
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 
-	#include "mp_interface.h"
+	#include "MpInterface.h"
 
-	class KviAmipInterface : public KviMediaPlayerInterface
+	class MpAmipInterface : public MpInterface
 	{
 	public:
-		KviAmipInterface();
-		~KviAmipInterface();
+		MpAmipInterface();
+		~MpAmipInterface();
 	public:
 		virtual int detect(bool bStart);
 		virtual bool prev();
@@ -71,10 +71,10 @@
 		virtual bool setShuffle(bool &bVal);
 		virtual bool amipExec(const QString &cmd);
 		virtual QString amipEval(const QString &cmd);
-		virtual KviMediaPlayerInterface::PlayerStatus status();
+		virtual MpInterface::PlayerStatus status();
 	};
 
-	MP_DECLARE_DESCRIPTOR(KviAmipInterface)
+	MP_DECLARE_DESCRIPTOR(MpAmipInterface)
 
 #endif //COMPILE_ON_WINDOWS
 
diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/MpInterface.cpp
index 3993ff8e6..f5a1f569c 100644
--- a/src/modules/mediaplayer/mp_interface.cpp
+++ b/src/modules/mediaplayer/MpInterface.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : mp_interface.cpp
+//   File : MpInterface.cpp
 //   Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "mp_interface.h"
-#include "mp_mp3.h"
+#include "MpInterface.h"
+#include "MpMp3.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -38,48 +38,48 @@ static QTextCodec * mediaplayer_get_codec()
 
 }
 
-void KviMediaPlayerInterface::notImplemented()
+void MpInterface::notImplemented()
 {
 	setLastError(__tr2qs_ctx("Function not implemented","mediaplayer"));
 }
 
-int KviMediaPlayerInterface::position()
+int MpInterface::position()
 {
 	notImplemented();
 	return -1;
 }
 
-int KviMediaPlayerInterface::length()
+int MpInterface::length()
 {
 	notImplemented();
 	return -1;
 }
 
-bool KviMediaPlayerInterface::quit()
+bool MpInterface::quit()
 {
 	notImplemented();
 	return false;
 }
 
-bool KviMediaPlayerInterface::hide()
+bool MpInterface::hide()
 {
 	notImplemented();
 	return false;
 }
 
-bool KviMediaPlayerInterface::show()
+bool MpInterface::show()
 {
 	notImplemented();
 	return false;
 }
 
-bool KviMediaPlayerInterface::minimize()
+bool MpInterface::minimize()
 {
 	notImplemented();
 	return false;
 }
 
-QString KviMediaPlayerInterface::getLocalFile()
+QString MpInterface::getLocalFile()
 {
 	QString ret = mrl();
 	if(ret.isEmpty())return ret;
@@ -91,7 +91,7 @@ QString KviMediaPlayerInterface::getLocalFile()
 	return QString();
 }
 
-QString KviMediaPlayerInterface::amipEval(const QString &)
+QString MpInterface::amipEval(const QString &)
 {
 	return QString();
 }
@@ -111,157 +111,157 @@ QString KviMediaPlayerInterface::amipEval(const QString &)
 	if(!scan_mp3_file(f,&mp3))return -1;
 
 
-QString KviMediaPlayerInterface::artist()
+QString MpInterface::artist()
 {
 	SCAN_MP3_FILE
 	return pCodec->toUnicode(QByteArray(mp3.id3.artist));
 }
 
-QString KviMediaPlayerInterface::title()
+QString MpInterface::title()
 {
 	SCAN_MP3_FILE
 	return pCodec->toUnicode(QByteArray(mp3.id3.title));
 }
 
-QString KviMediaPlayerInterface::genre()
+QString MpInterface::genre()
 {
 	SCAN_MP3_FILE
 	return pCodec->toUnicode(QByteArray(get_typegenre(mp3.id3.genre[0])));
 }
 
-QString KviMediaPlayerInterface::comment()
+QString MpInterface::comment()
 {
 	SCAN_MP3_FILE
 	return pCodec->toUnicode(QByteArray(mp3.id3.comment));
 }
 
-QString KviMediaPlayerInterface::year()
+QString MpInterface::year()
 {
 	SCAN_MP3_FILE
 	return QString(mp3.id3.year);
 }
 
-QString KviMediaPlayerInterface::album()
+QString MpInterface::album()
 {
 	SCAN_MP3_FILE
 	return pCodec->toUnicode(QByteArray(mp3.id3.album));
 }
 
-bool KviMediaPlayerInterface::playMrl(const QString &)
+bool MpInterface::playMrl(const QString &)
 {
 	notImplemented();
 	return false;
 }
 
-bool KviMediaPlayerInterface::amipExec(const QString &)
+bool MpInterface::amipExec(const QString &)
 {
 	notImplemented();
 	return false;
 }
 
-bool KviMediaPlayerInterface::setVol(kvs_int_t &)
+bool MpInterface::setVol(kvs_int_t &)
 {
 	notImplemented();
 	return false;
 }
 
-int KviMediaPlayerInterface::getVol()
+int MpInterface::getVol()
 {
 	notImplemented();
 	return -1;
 }
 
-bool KviMediaPlayerInterface::mute()
+bool MpInterface::mute()
 {
 	notImplemented();
 	return false;
 }
 
-bool KviMediaPlayerInterface::jumpTo(kvs_int_t &)
+bool MpInterface::jumpTo(kvs_int_t &)
 {
 	notImplemented();
 	return false;
 }
 
-KviMediaPlayerInterface::PlayerStatus KviMediaPlayerInterface::status()
+MpInterface::PlayerStatus MpInterface::status()
 {
 	notImplemented();
-	return KviMediaPlayerInterface::Unknown;
+	return MpInterface::Unknown;
 }
 
-int KviMediaPlayerInterface::bitRate()
+int MpInterface::bitRate()
 {
 	SCAN_MP3_FILE_RET_INT
 	return header_bitrate(&(mp3.header));
 }
 
-int KviMediaPlayerInterface::sampleRate()
+int MpInterface::sampleRate()
 {
 	SCAN_MP3_FILE_RET_INT
 	return header_frequency(&(mp3.header));
 }
 
-int KviMediaPlayerInterface::channels()
+int MpInterface::channels()
 {
 	SCAN_MP3_FILE_RET_INT
 	return header_channels(&(mp3.header));
 }
 
-int KviMediaPlayerInterface::getPlayListPos()
+int MpInterface::getPlayListPos()
 {
 	notImplemented();
 	return -1;
 }
 
-bool KviMediaPlayerInterface::setPlayListPos(kvs_int_t &)
+bool MpInterface::setPlayListPos(kvs_int_t &)
 {
 	notImplemented();
 	return false;
 }
 
-int KviMediaPlayerInterface::getListLength()
+int MpInterface::getListLength()
 {
 	notImplemented();
 	return -1;
 }
 
-int KviMediaPlayerInterface::getEqData(kvs_int_t &)
+int MpInterface::getEqData(kvs_int_t &)
 {
 	notImplemented();
 	return -1;
 }
 
-bool KviMediaPlayerInterface::setEqData(kvs_int_t &, kvs_int_t &)
+bool MpInterface::setEqData(kvs_int_t &, kvs_int_t &)
 {
 	notImplemented();
 	return false;
 }
 
-bool KviMediaPlayerInterface::getRepeat()
+bool MpInterface::getRepeat()
 {
 	notImplemented();
 	return false;
 }
 
-bool KviMediaPlayerInterface::getShuffle()
+bool MpInterface::getShuffle()
 {
 	notImplemented();
 	return false;
 }
 
-bool KviMediaPlayerInterface::setRepeat(bool &)
+bool MpInterface::setRepeat(bool &)
 {
 	notImplemented();
 	return false;
 }
 
-bool KviMediaPlayerInterface::setShuffle(bool &)
+bool MpInterface::setShuffle(bool &)
 {
 	notImplemented();
 	return false;
 }
 
-QString KviMediaPlayerInterface::mediaType()
+QString MpInterface::mediaType()
 {
 	QString ret = mrl();
 	if(ret.endsWith(".mp3",Qt::CaseInsensitive))ret = "MPEG Layer 3";
diff --git a/src/modules/mediaplayer/mp_interface.h b/src/modules/mediaplayer/MpInterface.h
index 61cd53d47..9e205b4c9 100644
--- a/src/modules/mediaplayer/mp_interface.h
+++ b/src/modules/mediaplayer/MpInterface.h
@@ -2,7 +2,7 @@
 #define _MP_INTERFACE_H_
 //=============================================================================
 //
-//   File : mp_interface.h
+//   File : MpInterface.h
 //   Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,13 +28,13 @@
 #include "KviQString.h"
 #include "KviKvsTypes.h"
 
-class KviMediaPlayerInterface
+class MpInterface
 {
 public:
 	// don't do any initialization in the constructor
 	// implement lazy initialization in each function instead
-	KviMediaPlayerInterface(){};
-	virtual ~KviMediaPlayerInterface(){};
+	MpInterface(){};
+	virtual ~MpInterface(){};
 protected:
 	QString m_szLastError;
 public:
@@ -109,7 +109,7 @@ public:
 	virtual bool quit();
 	// return the current player status
 	enum PlayerStatus { Unknown, Stopped, Playing, Paused };
-	virtual KviMediaPlayerInterface::PlayerStatus status();
+	virtual MpInterface::PlayerStatus status();
 	// current position in the media (msecs)
 	// 0 if the player isn't playing anything and -1 if unknown
 	virtual int position();
@@ -178,20 +178,20 @@ protected:
 };
 
 
-class KviMediaPlayerInterfaceDescriptor
+class MpInterfaceDescriptor
 {
 public:
-	KviMediaPlayerInterfaceDescriptor(){};
-	virtual ~KviMediaPlayerInterfaceDescriptor(){};
+	MpInterfaceDescriptor(){};
+	virtual ~MpInterfaceDescriptor(){};
 public:
 	virtual const QString & name() = 0;
 	virtual const QString & description() = 0;
-	virtual KviMediaPlayerInterface * instance() = 0;
+	virtual MpInterface * instance() = 0;
 };
 
 
 #define MP_DECLARE_DESCRIPTOR(_interfaceclass) \
-	class _interfaceclass ## Descriptor : public KviMediaPlayerInterfaceDescriptor \
+	class _interfaceclass ## Descriptor : public MpInterfaceDescriptor \
 	{ \
 	public: \
 		_interfaceclass ## Descriptor(); \
@@ -203,12 +203,12 @@ public:
 	public: \
 		virtual const QString & name(); \
 		virtual const QString & description(); \
-		virtual KviMediaPlayerInterface * instance(); \
+		virtual MpInterface * instance(); \
 	};
 
 #define MP_IMPLEMENT_DESCRIPTOR(_interfaceclass,_name,_description) \
 	_interfaceclass ## Descriptor::_interfaceclass ## Descriptor() \
-	: KviMediaPlayerInterfaceDescriptor() \
+	: MpInterfaceDescriptor() \
 	{ \
 		m_pInstance = 0; \
 		m_szName = _name; \
@@ -226,7 +226,7 @@ public:
 	{ \
 		return m_szDescription; \
 	} \
-	KviMediaPlayerInterface * _interfaceclass ## Descriptor::instance() \
+	MpInterface * _interfaceclass ## Descriptor::instance() \
 	{ \
 		if(!m_pInstance)m_pInstance = new _interfaceclass(); \
 		return m_pInstance; \
diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/MpMp3.cpp
index efdc0b473..9f3e68cbe 100644
--- a/src/modules/mediaplayer/mp_mp3.cpp
+++ b/src/modules/mediaplayer/MpMp3.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : mp_mp3.cpp
+//   File : MpMp3.cpp
 //   Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -37,7 +37,7 @@
 //
 //=============================================================================
 
-#include "mp_mp3.h"
+#include "MpMp3.h"
 #include "KviOptions.h"
 
 #include <QFileInfo>
diff --git a/src/modules/mediaplayer/mp_mp3.h b/src/modules/mediaplayer/MpMp3.h
index 80dbda85c..b50c3e953 100644
--- a/src/modules/mediaplayer/mp_mp3.h
+++ b/src/modules/mediaplayer/MpMp3.h
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : mp_mp3.h
+//   File : MpMp3.h
 //   Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
diff --git a/src/modules/mediaplayer/mp_mprisinterface.cpp b/src/modules/mediaplayer/MpMprisInterface.cpp
index 3bc59730e..560d03c93 100644
--- a/src/modules/mediaplayer/mp_mprisinterface.cpp
+++ b/src/modules/mediaplayer/MpMprisInterface.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : mp_mprisinterface.cpp
+//   File : MpMprisInterface.cpp
 //   Creation date : Thu 06 Dec 2007 14:20:02 by Tomasz Moń
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "mp_mprisinterface.h"
+#include "MpMprisInterface.h"
 #if (defined(COMPILE_DBUS_SUPPORT) && !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW))
 #include "KviLocale.h"
 
@@ -60,17 +60,17 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, MPRISPlayerStatus
 	return argument;
 }
 
-KviMPRISInterface::KviMPRISInterface()
-: KviMediaPlayerInterface()
+MpMprisInterface::MpMprisInterface()
+: MpInterface()
 {
 	qDBusRegisterMetaType<MPRISPlayerStatus>();
 }
 
-KviMPRISInterface::~KviMPRISInterface()
+MpMprisInterface::~MpMprisInterface()
 {
 }
 
-int KviMPRISInterface::detect(bool)
+int MpMprisInterface::detect(bool)
 {
 	QDBusReply<QStringList> reply = QDBusConnection::sessionBus().interface()->registeredServiceNames();
 	if (!reply.isValid())		/* something fishy with dbus, it won't work */
@@ -94,32 +94,32 @@ int KviMPRISInterface::detect(bool)
 	} \
 	return TRUE;
 
-bool KviMPRISInterface::prev()
+bool MpMprisInterface::prev()
 {
 	MPRIS_SIMPLE_CALL("/Player", "Prev")
 }
 
-bool KviMPRISInterface::next()
+bool MpMprisInterface::next()
 {
 	MPRIS_SIMPLE_CALL("/Player", "Next")
 }
 
-bool KviMPRISInterface::play()
+bool MpMprisInterface::play()
 {
 	MPRIS_SIMPLE_CALL("/Player", "Play")
 }
 
-bool KviMPRISInterface::stop()
+bool MpMprisInterface::stop()
 {
 	MPRIS_SIMPLE_CALL("/Player", "Stop")
 }
 
-bool KviMPRISInterface::pause()
+bool MpMprisInterface::pause()
 {
 	MPRIS_SIMPLE_CALL("/Player", "Pause")
 }
 
-bool KviMPRISInterface::quit()
+bool MpMprisInterface::quit()
 {
 	MPRIS_SIMPLE_CALL("/", "Quit")
 }
@@ -135,7 +135,7 @@ bool KviMPRISInterface::quit()
 	}
 
 #define MPRIS_GET_METADATA_FIELD(__field, __return_type, __return_if_fail) \
-	if (this->status() != KviMediaPlayerInterface::Playing) \
+	if (this->status() != MpInterface::Playing) \
 		return __return_if_fail; \
 	MPRIS_CALL_METHOD("GetMetadata", __return_if_fail) \
 	foreach (QVariant v, reply.arguments()) { \
@@ -161,28 +161,28 @@ bool KviMPRISInterface::quit()
                 return __return_if_fail; \
         }
 
-KviMediaPlayerInterface::PlayerStatus KviMPRISInterface::status()
+MpInterface::PlayerStatus MpMprisInterface::status()
 {
-	MPRIS_CALL_METHOD("GetStatus", KviMediaPlayerInterface::Unknown)
+	MPRIS_CALL_METHOD("GetStatus", MpInterface::Unknown)
 
 	MPRISPlayerStatus status;
 
 	if(reply.arguments().isEmpty())
-		return KviMediaPlayerInterface::Unknown;
+		return MpInterface::Unknown;
 
 	status = qdbus_cast<MPRISPlayerStatus>(reply.arguments().first());
 
 	switch (status.Play) {
-		case 0: return KviMediaPlayerInterface::Playing;
-		case 1: return KviMediaPlayerInterface::Paused;
-		case 2: return KviMediaPlayerInterface::Stopped;
-		default: return KviMediaPlayerInterface::Unknown;
+		case 0: return MpInterface::Playing;
+		case 1: return MpInterface::Paused;
+		case 2: return MpInterface::Stopped;
+		default: return MpInterface::Unknown;
 	}
 }
 
-QString KviMPRISInterface::nowPlaying()
+QString MpMprisInterface::nowPlaying()
 {
-	if (this->status() != KviMediaPlayerInterface::Playing)
+	if (this->status() != MpInterface::Playing)
 		return "";
 
 	MPRIS_CALL_METHOD("GetMetadata", "")
@@ -209,7 +209,7 @@ QString KviMPRISInterface::nowPlaying()
 		return "";
 }
 
-QString KviMPRISInterface::mrl()
+QString MpMprisInterface::mrl()
 {
 	MPRIS_CALL_METHOD("GetMetadata", "")
 
@@ -227,53 +227,53 @@ QString KviMPRISInterface::mrl()
 	return "";
 }
 
-QString KviMPRISInterface::title()
+QString MpMprisInterface::title()
 {
 	MPRIS_GET_METADATA_FIELD("title", QString, "")
 }
 
-QString KviMPRISInterface::artist()
+QString MpMprisInterface::artist()
 {
 	MPRIS_GET_METADATA_FIELD("artist", QString, "")
 }
 
-QString KviMPRISInterface::genre()
+QString MpMprisInterface::genre()
 {
 	MPRIS_GET_METADATA_FIELD("genre", QString, "")
 }
 
-QString KviMPRISInterface::comment()
+QString MpMprisInterface::comment()
 {
 	MPRIS_GET_METADATA_FIELD("comment", QString, "")
 }
 
-QString KviMPRISInterface::year()
+QString MpMprisInterface::year()
 {
 	MPRIS_GET_METADATA_FIELD("year", QString, "")
 }
 
-QString KviMPRISInterface::album()
+QString MpMprisInterface::album()
 {
 	MPRIS_GET_METADATA_FIELD("album", QString, "")
 }
 
-int KviMPRISInterface::bitRate()
+int MpMprisInterface::bitRate()
 {
 	MPRIS_GET_METADATA_FIELD("audio-bitrate", int, -1)
 }
 
-int KviMPRISInterface::sampleRate()
+int MpMprisInterface::sampleRate()
 {
 	MPRIS_GET_METADATA_FIELD("audio-samplerate", int, -1)
 }
 
-bool KviMPRISInterface::setVol(kvs_int_t &iVol)
+bool MpMprisInterface::setVol(kvs_int_t &iVol)
 {
 	MPRIS_CALL_METHOD_WITH_ARG("VolumeSet", QVariant((int)(100*iVol/255)), false);
 	return true;
 }
 
-int KviMPRISInterface::getVol()
+int MpMprisInterface::getVol()
 {
 	MPRIS_CALL_METHOD("VolumeGet", -1)
 
@@ -281,13 +281,13 @@ int KviMPRISInterface::getVol()
 	return iVol * 255 /100;
 }
 
-int KviMPRISInterface::position()
+int MpMprisInterface::position()
 {
 	MPRIS_CALL_METHOD("PositionGet", -1)
 	return reply.arguments().first().toInt();
 }
 
-int KviMPRISInterface::length()
+int MpMprisInterface::length()
 {
 	MPRIS_CALL_METHOD("GetMetadata", -1)
 
@@ -306,7 +306,7 @@ int KviMPRISInterface::length()
 	return -1;
 }
 
-bool KviMPRISInterface::jumpTo(kvs_int_t &iPos)
+bool MpMprisInterface::jumpTo(kvs_int_t &iPos)
 {
 	MPRIS_CALL_METHOD_WITH_ARG("PositionSet", QVariant((int)iPos), false)
 	return true;
@@ -314,7 +314,7 @@ bool KviMPRISInterface::jumpTo(kvs_int_t &iPos)
 
 /* audacious interface */
 MP_IMPLEMENT_DESCRIPTOR(
-	KviAudaciousInterface,
+	MpAudaciousInterface,
 	"audacious",
 	__tr2qs_ctx(
 		"An interface to the popular audacious media player.\n" \
@@ -324,13 +324,13 @@ MP_IMPLEMENT_DESCRIPTOR(
 	)
 )
 
-KviAudaciousInterface::KviAudaciousInterface()
-: KviMPRISInterface()
+MpAudaciousInterface::MpAudaciousInterface()
+: MpMprisInterface()
 {
 	m_szServiceName = "org.mpris.audacious";
 }
 
-int KviAudaciousInterface::getPlayListPos()
+int MpAudaciousInterface::getPlayListPos()
 {
 	QDBusInterface dbus_iface("org.mpris.audacious", "/org/atheme/audacious",
 				"org.atheme.audacious", QDBusConnection::sessionBus());
@@ -339,16 +339,16 @@ int KviAudaciousInterface::getPlayListPos()
 }
 
 
-bool KviAudaciousInterface::quit()
+bool MpAudaciousInterface::quit()
 {
-	if (KviMPRISInterface::quit())
+	if (MpMprisInterface::quit())
 		return TRUE;
 
 	/* compability with older versions */
 	MPRIS_SIMPLE_CALL("/Player", "Quit")
 }
 
-QString KviAudaciousInterface::mrl()
+QString MpAudaciousInterface::mrl()
 {
 	MPRIS_CALL_METHOD("GetMetadata", "")
 
@@ -371,32 +371,32 @@ QString KviAudaciousInterface::mrl()
 	return "";
 }
 
-KviMediaPlayerInterface::PlayerStatus KviAudaciousInterface::status()
+MpInterface::PlayerStatus MpAudaciousInterface::status()
 {
-	KviMediaPlayerInterface::PlayerStatus status;
-	status = KviMPRISInterface::status();
-	if (status != KviMediaPlayerInterface::Unknown)
+	MpInterface::PlayerStatus status;
+	status = MpMprisInterface::status();
+	if (status != MpInterface::Unknown)
 		return status;
 
 	/* compability with older versions */
 	QDBusInterface dbus_iface(m_szServiceName, "/Player",
 				"org.freedesktop.MediaPlayer", QDBusConnection::sessionBus());
 	if (!dbus_iface.isValid())
-		return KviMediaPlayerInterface::Unknown;
+		return MpInterface::Unknown;
 
 	QDBusMessage reply = dbus_iface.call(QDBus::Block, "GetStatus");
 
 	switch (reply.arguments().first().toInt()) {
-		case 0: return KviMediaPlayerInterface::Playing;
-		case 1: return KviMediaPlayerInterface::Paused;
-		case 2: return KviMediaPlayerInterface::Stopped;
-		default: return KviMediaPlayerInterface::Unknown;
+		case 0: return MpInterface::Playing;
+		case 1: return MpInterface::Paused;
+		case 2: return MpInterface::Stopped;
+		default: return MpInterface::Unknown;
 	}
 }
 
-int KviAudaciousInterface::length()
+int MpAudaciousInterface::length()
 {
-	int length = KviMPRISInterface::length();
+	int length = MpMprisInterface::length();
 	if (length != -1)
 		return length;
 
@@ -419,7 +419,7 @@ int KviAudaciousInterface::length()
 }
 
 #define AUDACIOUS_GET_TUPLE_FIELD(__field) \
-	if (this->status() != KviMediaPlayerInterface::Playing) \
+	if (this->status() != MpInterface::Playing) \
 		return ""; \
 	QDBusInterface dbus_iface("org.mpris.audacious", "/org/atheme/audacious", \
 				"org.atheme.audacious", QDBusConnection::sessionBus()); \
@@ -428,19 +428,19 @@ int KviAudaciousInterface::length()
 	QDBusReply<QDBusVariant> reply = dbus_iface.callWithArgumentList(QDBus::Block, "SongTuple", args); \
 	return reply.value().variant().toString(); \
 
-QString KviAudaciousInterface::year()
+QString MpAudaciousInterface::year()
 {
 	AUDACIOUS_GET_TUPLE_FIELD("year")
 }
 
-QString KviAudaciousInterface::mediaType()
+QString MpAudaciousInterface::mediaType()
 {
 	AUDACIOUS_GET_TUPLE_FIELD("codec")
 }
 
 /* BMPx interface */
 MP_IMPLEMENT_DESCRIPTOR(
-	KviBmpxInterface,
+	MpBmpxInterface,
 	"bmpx",
 	__tr2qs_ctx(
 		"An interface to BMPx.\n" \
@@ -450,21 +450,21 @@ MP_IMPLEMENT_DESCRIPTOR(
 	)
 )
 
-KviBmpxInterface::KviBmpxInterface()
-: KviMPRISInterface()
+MpBmpxInterface::MpBmpxInterface()
+: MpMprisInterface()
 {
 	m_szServiceName = "org.mpris.bmp";
 }
 
 /* BMPx doesn't provide GetStatus method, always assume Playing status */
-KviMediaPlayerInterface::PlayerStatus KviBmpxInterface::status()
+MpInterface::PlayerStatus MpBmpxInterface::status()
 {
-	return KviMediaPlayerInterface::Playing;
+	return MpInterface::Playing;
 }
 
 /* Amarok2 interface */
 MP_IMPLEMENT_DESCRIPTOR(
-	KviAmarok2Interface,
+	MpAmarok2Interface,
 	"amarok2",
 	__tr2qs_ctx(
 		"An interface to Amarok2.\n" \
@@ -474,15 +474,15 @@ MP_IMPLEMENT_DESCRIPTOR(
 	)
 )
 
-KviAmarok2Interface::KviAmarok2Interface()
-: KviMPRISInterface()
+MpAmarok2Interface::MpAmarok2Interface()
+: MpMprisInterface()
 {
 	m_szServiceName = "org.mpris.amarok";
 }
 
 /* Qmmp interface */
 MP_IMPLEMENT_DESCRIPTOR(
-        KviQmmpInterface,
+        MpQmmpInterface,
         "Qmmp",
         __tr2qs_ctx(
                 "An interface to Qmmp.\n" \
@@ -492,15 +492,15 @@ MP_IMPLEMENT_DESCRIPTOR(
         )
 )
 
-KviQmmpInterface::KviQmmpInterface()
-: KviMPRISInterface()
+MpQmmpInterface::MpQmmpInterface()
+: MpMprisInterface()
 {
         m_szServiceName = "org.mpris.qmmp";
 }
 
 /* xmms2 interface */
 MP_IMPLEMENT_DESCRIPTOR(
-	KviXmms2Interface,
+	MpXmms2Interface,
 	"xmms2",
 	__tr2qs_ctx(
 		"An interface to the Xmms2 media player.\n" \
@@ -509,15 +509,15 @@ MP_IMPLEMENT_DESCRIPTOR(
 	)
 )
 
-KviXmms2Interface::KviXmms2Interface()
-: KviMPRISInterface()
+MpXmms2Interface::MpXmms2Interface()
+: MpMprisInterface()
 {
 	m_szServiceName = "org.mpris.xmms2";
 }
 
 /* mozilla songbird interface */
 MP_IMPLEMENT_DESCRIPTOR(
-	KviSongbirdInterface,
+	MpSongbirdInterface,
 	"songbird",
 	__tr2qs_ctx(
 		"An interface to the Mozilla Songbird media player.\n" \
@@ -528,20 +528,20 @@ MP_IMPLEMENT_DESCRIPTOR(
 	)
 )
 
-KviSongbirdInterface::KviSongbirdInterface()
-: KviMPRISInterface()
+MpSongbirdInterface::MpSongbirdInterface()
+: MpMprisInterface()
 {
 	m_szServiceName = "org.mpris.songbird";
 }
 
-KviMediaPlayerInterface::PlayerStatus KviSongbirdInterface::status()
+MpInterface::PlayerStatus MpSongbirdInterface::status()
 {
-	return KviMediaPlayerInterface::Playing;
+	return MpInterface::Playing;
 }
 
 /* Totem interface */
 MP_IMPLEMENT_DESCRIPTOR(
-	KviTotemInterface,
+	MpTotemInterface,
 	"totem",
 	__tr2qs_ctx(
 		"An interface to Totem.\n" \
@@ -551,15 +551,15 @@ MP_IMPLEMENT_DESCRIPTOR(
 	)
 )
 
-KviTotemInterface::KviTotemInterface()
-: KviMPRISInterface()
+MpTotemInterface::MpTotemInterface()
+: MpMprisInterface()
 {
 	m_szServiceName = "org.mpris.Totem";
 }
 
 /* Vlc interface */
 MP_IMPLEMENT_DESCRIPTOR(
-	KviVlcInterface,
+	MpVlcInterface,
 	"vlc",
 	__tr2qs_ctx(
 		"An interface to Vlc.\n" \
@@ -571,8 +571,8 @@ MP_IMPLEMENT_DESCRIPTOR(
 	)
 )
 
-KviVlcInterface::KviVlcInterface()
-: KviMPRISInterface()
+MpVlcInterface::MpVlcInterface()
+: MpMprisInterface()
 {
 	m_szServiceName = "org.mpris.vlc";
 }
diff --git a/src/modules/mediaplayer/mp_mprisinterface.h b/src/modules/mediaplayer/MpMprisInterface.h
index f86af3b27..51767390c 100644
--- a/src/modules/mediaplayer/mp_mprisinterface.h
+++ b/src/modules/mediaplayer/MpMprisInterface.h
@@ -2,7 +2,7 @@
 #define _MP_AUDACIOUSINTERFACE_H_
 //=============================================================================
 //
-//   File : mp_mprisinterface.h
+//   File : MpMprisInterface.h
 //   Creation date : Thu 06 Dec 2007 14:20:02 by Tomasz Moń
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -24,18 +24,18 @@
 //
 //=============================================================================
 
-#include "mp_interface.h"
+#include "MpInterface.h"
 
 #include "kvi_settings.h"
 
 #if (defined(COMPILE_DBUS_SUPPORT) && !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW))
 	#include <QtDBus/QtDBus>
 
-	class KviMPRISInterface : public KviMediaPlayerInterface
+	class MpMprisInterface : public MpInterface
 	{
 	public:
-		KviMPRISInterface();
-		virtual ~KviMPRISInterface();
+		MpMprisInterface();
+		virtual ~MpMprisInterface();
 	public:
 		QString m_szServiceName;
 		virtual int detect(bool bStart);
@@ -45,7 +45,7 @@
 		virtual bool stop();
 		virtual bool pause();
 		virtual bool quit();
-		virtual KviMediaPlayerInterface::PlayerStatus status();
+		virtual MpInterface::PlayerStatus status();
 		virtual QString nowPlaying();
 		virtual QString mrl();
 		virtual QString title();
@@ -63,13 +63,13 @@
 		virtual bool jumpTo(kvs_int_t &iPos);
 	};
 
-	class KviAudaciousInterface : public KviMPRISInterface
+	class MpAudaciousInterface : public MpMprisInterface
 	{
 	public:
-		KviAudaciousInterface();
+		MpAudaciousInterface();
 	public:
 		virtual bool quit();
-		virtual KviMediaPlayerInterface::PlayerStatus status();
+		virtual MpInterface::PlayerStatus status();
 		virtual QString mrl();
 		virtual int length();
 
@@ -78,58 +78,58 @@
 		virtual QString mediaType();
 	};
 
-	class KviBmpxInterface : public KviMPRISInterface
+	class MpBmpxInterface : public MpMprisInterface
 	{
 	public:
-		KviBmpxInterface();
-		virtual KviMediaPlayerInterface::PlayerStatus status();
+		MpBmpxInterface();
+		virtual MpInterface::PlayerStatus status();
 	};
 
-	class KviAmarok2Interface : public KviMPRISInterface
+	class MpAmarok2Interface : public MpMprisInterface
 	{
 	public:
-		KviAmarok2Interface();
+		MpAmarok2Interface();
 	};
 
-	class KviQmmpInterface : public KviMPRISInterface
+	class MpQmmpInterface : public MpMprisInterface
 	{
 	public:
-		KviQmmpInterface();
+		MpQmmpInterface();
 	};
 
-	class KviXmms2Interface : public KviMPRISInterface
+	class MpXmms2Interface : public MpMprisInterface
 	{
 	public:
-		KviXmms2Interface();
+		MpXmms2Interface();
 	};
 
-	class KviSongbirdInterface : public KviMPRISInterface
+	class MpSongbirdInterface : public MpMprisInterface
 	{
 	public:
-		KviSongbirdInterface();
-		virtual KviMediaPlayerInterface::PlayerStatus status();
+		MpSongbirdInterface();
+		virtual MpInterface::PlayerStatus status();
 	};
 
-	class KviTotemInterface : public KviMPRISInterface
+	class MpTotemInterface : public MpMprisInterface
 	{
 	public:
-		KviTotemInterface();
+		MpTotemInterface();
 	};
 
-	class KviVlcInterface : public KviMPRISInterface
+	class MpVlcInterface : public MpMprisInterface
 	{
 	public:
-		KviVlcInterface();
+		MpVlcInterface();
 	};
 
-	MP_DECLARE_DESCRIPTOR(KviAudaciousInterface)
-	MP_DECLARE_DESCRIPTOR(KviBmpxInterface)
-	MP_DECLARE_DESCRIPTOR(KviAmarok2Interface)
-	MP_DECLARE_DESCRIPTOR(KviQmmpInterface)
-	MP_DECLARE_DESCRIPTOR(KviXmms2Interface)
-	MP_DECLARE_DESCRIPTOR(KviSongbirdInterface)
-	MP_DECLARE_DESCRIPTOR(KviTotemInterface)
-	MP_DECLARE_DESCRIPTOR(KviVlcInterface)
+	MP_DECLARE_DESCRIPTOR(MpAudaciousInterface)
+	MP_DECLARE_DESCRIPTOR(MpBmpxInterface)
+	MP_DECLARE_DESCRIPTOR(MpAmarok2Interface)
+	MP_DECLARE_DESCRIPTOR(MpQmmpInterface)
+	MP_DECLARE_DESCRIPTOR(MpXmms2Interface)
+	MP_DECLARE_DESCRIPTOR(MpSongbirdInterface)
+	MP_DECLARE_DESCRIPTOR(MpTotemInterface)
+	MP_DECLARE_DESCRIPTOR(MpVlcInterface)
 #endif //COMPILE_ON_WINDOWS
 
 #endif //_MP_AUDACIOUSINTERFACE_H_
diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/MpWinampInterface.cpp
index b52f37550..1fe06d234 100644
--- a/src/modules/mediaplayer/mp_winampinterface.cpp
+++ b/src/modules/mediaplayer/MpWinampInterface.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : mp_winampinterface.cpp
+//   File : MpWinampInterface.cpp
 //   Creation date : Mon 28 Mar 2005 23:41:50 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "mp_winampinterface.h"
+#include "MpWinampInterface.h"
 #include "KviOptions.h"
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -204,7 +204,7 @@ MP_IMPLEMENT_DESCRIPTOR(
 
 
 KviWinampInterface::KviWinampInterface()
-: KviMediaPlayerInterface()
+: MpInterface()
 {
 }
 
@@ -280,7 +280,7 @@ int KviWinampInterface::channels()
 	return ret;
 }
 
-KviMediaPlayerInterface::PlayerStatus KviWinampInterface::status()
+MpInterface::PlayerStatus KviWinampInterface::status()
 {
 	HWND hWinamp = find_winamp(this);
 	int ret = 1000;
@@ -288,19 +288,19 @@ KviMediaPlayerInterface::PlayerStatus KviWinampInterface::status()
 	switch(ret)
 	{
 		case 0:
-			return KviMediaPlayerInterface::Stopped;
+			return MpInterface::Stopped;
 		break;
 		case 3:
-			return KviMediaPlayerInterface::Paused;
+			return MpInterface::Paused;
 		break;
 		case 1:
-			return KviMediaPlayerInterface::Playing;
+			return MpInterface::Playing;
 		break;
 		default:
-			return KviMediaPlayerInterface::Unknown;
+			return MpInterface::Unknown;
 		break;
 	}
-	return KviMediaPlayerInterface::Unknown;
+	return MpInterface::Unknown;
 }
 
 QString KviWinampInterface::mrl()
diff --git a/src/modules/mediaplayer/mp_winampinterface.h b/src/modules/mediaplayer/MpWinampInterface.h
index 648c3c581..623e5f7fe 100644
--- a/src/modules/mediaplayer/mp_winampinterface.h
+++ b/src/modules/mediaplayer/MpWinampInterface.h
@@ -2,7 +2,7 @@
 #define _MP_WINAMPINTERFACE_H_
 //=============================================================================
 //
-//   File : mp_winampinterface.h
+//   File : MpWinampInterface.h
 //   Creation date : Mon 28 Mar 2005 23:41:50 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -28,9 +28,9 @@
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 
-	#include "mp_interface.h"
+	#include "MpInterface.h"
 
-	class KviWinampInterface : public KviMediaPlayerInterface
+	class KviWinampInterface : public MpInterface
 	{
 	public:
 		KviWinampInterface();
@@ -66,7 +66,7 @@
 		virtual bool getShuffle();
 		virtual bool setRepeat(bool &bVal);
 		virtual bool setShuffle(bool &bVal);
-		virtual KviMediaPlayerInterface::PlayerStatus status();
+		virtual MpInterface::PlayerStatus status();
 	};
 
 	MP_DECLARE_DESCRIPTOR(KviWinampInterface)
diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/MpXmmsInterface.cpp
index 23eddf03b..24890f9dc 100644
--- a/src/modules/mediaplayer/mp_xmmsinterface.cpp
+++ b/src/modules/mediaplayer/MpXmmsInterface.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : mp_xmmsinterface.cpp
+//   File : MpXmmsInterface.cpp
 //   Creation date : Fri 25 Mar 2005 20:04:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "mp_xmmsinterface.h"
+#include "MpXmmsInterface.h"
 
 #if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW))
 
@@ -78,7 +78,7 @@ static const char *audacious_lib_names[] =
 
 
 KviXmmsInterface::KviXmmsInterface()
-: KviMediaPlayerInterface()
+: MpInterface()
 {
 	m_pPlayerLibrary = 0;
 	m_szPlayerLibraryName = "libxmms.so";
@@ -259,21 +259,21 @@ bool KviXmmsInterface::setShuffle(bool &bVal)
 	return true;
 }
 
-KviMediaPlayerInterface::PlayerStatus KviXmmsInterface::status()
+MpInterface::PlayerStatus KviXmmsInterface::status()
 {
 	bool (*sym1)(int) = (bool (*)(int))lookupSymbol("xmms_remote_is_paused");
 	if(sym1)
 	{
-		if(sym1(0))return KviMediaPlayerInterface::Paused;
+		if(sym1(0))return MpInterface::Paused;
 		bool (*sym2)(int) = (bool (*)(int))lookupSymbol("xmms_remote_is_playing");
 		if(sym2)
 		{
-			if(sym2(0))return KviMediaPlayerInterface::Playing;
-			else return KviMediaPlayerInterface::Stopped;
+			if(sym2(0))return MpInterface::Playing;
+			else return MpInterface::Stopped;
 		}
 	}
 
-	return KviMediaPlayerInterface::Unknown;
+	return MpInterface::Unknown;
 }
 
 bool KviXmmsInterface::playMrl(const QString &mrl)
diff --git a/src/modules/mediaplayer/mp_xmmsinterface.h b/src/modules/mediaplayer/MpXmmsInterface.h
index df6eb04b8..3c49c036b 100644
--- a/src/modules/mediaplayer/mp_xmmsinterface.h
+++ b/src/modules/mediaplayer/MpXmmsInterface.h
@@ -2,7 +2,7 @@
 #define _MP_XMMSINTERFACE_H_
 //=============================================================================
 //
-//   File : mp_xmmsinterface.h
+//   File : MpXmmsInterface.h
 //   Creation date : Fri 25 Mar 2005 20:04:54 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -27,14 +27,14 @@
 //
 //=============================================================================
 
-#include "mp_interface.h"
+#include "MpInterface.h"
 
 #include "kvi_settings.h"
 
 #include <QLibrary>
 
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
-	class KviXmmsInterface : public KviMediaPlayerInterface
+	class KviXmmsInterface : public MpInterface
 	{
 	public:
 		KviXmmsInterface();
@@ -54,7 +54,7 @@
 		virtual bool jumpTo(kvs_int_t &iPos);
 		virtual bool setVol(kvs_int_t &iVol);
 		virtual int getVol();
-		virtual KviMediaPlayerInterface::PlayerStatus status();
+		virtual MpInterface::PlayerStatus status();
 		virtual QString nowPlaying();
 		virtual bool playMrl(const QString &mrl);
 		virtual QString mrl();
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index 9da76e490..c20fb421c 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -24,11 +24,11 @@
 //
 //=============================================================================
 
-#include "mp_interface.h"
-#include "mp_amipinterface.h"
-#include "mp_mprisinterface.h"
-#include "mp_winampinterface.h"
-#include "mp_xmmsinterface.h"
+#include "MpInterface.h"
+#include "MpAmipInterface.h"
+#include "MpMprisInterface.h"
+#include "MpWinampInterface.h"
+#include "MpXmmsInterface.h"
 
 #include "KviModule.h"
 #include "KviOptions.h"
@@ -36,19 +36,19 @@
 #include "kvi_out.h"
 #include <QUrl>
 
-static KviPointerList<KviMediaPlayerInterfaceDescriptor> * g_pDescriptorList = 0;
+static KviPointerList<MpInterfaceDescriptor> * g_pDescriptorList = 0;
 
-static KviMediaPlayerInterface * g_pMPInterface = 0;
+static MpInterface * g_pMPInterface = 0;
 
-static KviMediaPlayerInterface * auto_detect_player(KviWindow * pOut = 0)
+static MpInterface * auto_detect_player(KviWindow * pOut = 0)
 {
 	int iBest = 0;
-	KviMediaPlayerInterface * pBest = 0;
-	KviMediaPlayerInterfaceDescriptor * d;
-	KviMediaPlayerInterfaceDescriptor * pDBest = 0;
+	MpInterface * pBest = 0;
+	MpInterfaceDescriptor * d;
+	MpInterfaceDescriptor * pDBest = 0;
 	for(d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
 	{
-		KviMediaPlayerInterface * i = d->instance();
+		MpInterface * i = d->instance();
 		if(i)
 		{
 			int iScore = i->detect(false);
@@ -74,7 +74,7 @@ static KviMediaPlayerInterface * auto_detect_player(KviWindow * pOut = 0)
 		// no sure player found... try again with a destructive test
 		for(d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
 		{
-			KviMediaPlayerInterface * i = d->instance();
+			MpInterface * i = d->instance();
 			if(i)
 			{
 				int iScore = i->detect(true);
@@ -460,7 +460,7 @@ MP_KVS_COMMAND(setPlayer)
 		KVSM_PARAMETER("player",KVS_PT_STRING,0,szPlayer)
 	KVSM_PARAMETERS_END(c)
 
-	for(KviMediaPlayerInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
+	for(MpInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
 	{
 		if(d->name() == szPlayer)
 		{
@@ -523,7 +523,7 @@ MP_KVS_FUNCTION(playerList)
 	KviKvsArray* pArray = new KviKvsArray();
 	int id=0;
 
-	for(KviMediaPlayerInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
+	for(MpInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
 	{
 		pArray->set(id++,new KviKvsVariant(d->name()));
 	}
@@ -1456,16 +1456,16 @@ MP_KVS_FUNCTION(status)
 // 	KVSM_PARAMETERS_END(c)
 
 	MP_KVS_FAIL_ON_NO_INTERFACE
-	KviMediaPlayerInterface::PlayerStatus eStat = g_pMPInterface->status();
+	MpInterface::PlayerStatus eStat = g_pMPInterface->status();
 	switch(eStat)
 	{
-		case KviMediaPlayerInterface::Stopped:
+		case MpInterface::Stopped:
 			c->returnValue()->setString("stopped");
 		break;
-		case KviMediaPlayerInterface::Playing:
+		case MpInterface::Playing:
 			c->returnValue()->setString("playing");
 		break;
-		case KviMediaPlayerInterface::Paused:
+		case MpInterface::Paused:
 			c->returnValue()->setString("paused");
 		break;
 		default:
@@ -1606,24 +1606,24 @@ MP_KVS_COMMAND(setShuffle)
 
 static bool mediaplayer_module_init( KviModule * m )
 {
-	g_pDescriptorList = new KviPointerList<KviMediaPlayerInterfaceDescriptor>;
+	g_pDescriptorList = new KviPointerList<MpInterfaceDescriptor>;
 	g_pDescriptorList->setAutoDelete(true);
 
 #if (defined(COMPILE_DBUS_SUPPORT) && !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC) && !defined(COMPILE_ON_MINGW))
-	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAudaciousInterface));
+	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpAudaciousInterface));
 	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAudaciousClassicInterface));
 	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviXmmsInterface));
-	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviXmms2Interface));
-	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviBmpxInterface));
-	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAmarok2Interface));
-	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviQmmpInterface));
-	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviSongbirdInterface));
-	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviTotemInterface));
-	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviVlcInterface));
+	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpXmms2Interface));
+	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpBmpxInterface));
+	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpAmarok2Interface));
+	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpQmmpInterface));
+	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpSongbirdInterface));
+	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpTotemInterface));
+	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpVlcInterface));
 #endif
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAmipInterface));
+	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(MpAmipInterface));
 	g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviWinampInterface));
 #endif
 	g_pMPInterface = 0;
@@ -1632,7 +1632,7 @@ static bool mediaplayer_module_init( KviModule * m )
 	{
 		g_pMPInterface = auto_detect_player();
 	} else {
-		for(KviMediaPlayerInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
+		for(MpInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
 		{
 			if(d->name() == KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer))
 			{
@@ -1724,7 +1724,7 @@ static bool mediaplayer_module_ctrl(KviModule *,const char * operation,void * pa
 	{
 		// we expect param to be a pointer to QStringList
 		QStringList * l = (QStringList *)param;
-		for(KviMediaPlayerInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
+		for(MpInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
 		{
 			l->append(d->name());
 		}
diff --git a/src/modules/my/CMakeLists.txt b/src/modules/my/CMakeLists.txt
index 89248553d..b1b498504 100644
--- a/src/modules/my/CMakeLists.txt
+++ b/src/modules/my/CMakeLists.txt
@@ -1,14 +1,14 @@
 # CMakeLists for src/modules/my
 
 SET(kvimy_MOC_HDRS
-	idle.h
+	Idle.h
 )
 
 SET(kvimy_SRCS
 	libkvimy.cpp
-	idle_x11.cpp
-	idle_mac.cpp
-	idle.cpp
+	Idle_x11.cpp
+	Idle_mac.cpp
+	Idle.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/my/idle.cpp b/src/modules/my/Idle.cpp
index e7fd4fd5c..4dd6f3cb1 100644
--- a/src/modules/my/idle.cpp
+++ b/src/modules/my/Idle.cpp
@@ -1,5 +1,5 @@
 /*
- * idle.cpp - detect desktop idle time
+ * Idle.cpp - detect desktop idle time
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -18,7 +18,7 @@
  *
  */
 
-#include"idle.h"
+#include"Idle.h"
 
 #include <QCursor>
 #include <QDateTime>
@@ -131,5 +131,5 @@ void Idle::doCheck()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "idle.moc"
+#include "Idle.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/my/idle.h b/src/modules/my/Idle.h
index 798f59a10..1f434f1b9 100644
--- a/src/modules/my/idle.h
+++ b/src/modules/my/Idle.h
@@ -1,7 +1,7 @@
 #ifndef _IDLE_H_
 #define _IDLE_H_
 /*
- * idle.h - detect desktop idle time
+ * Idle.h - detect desktop idle time
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
diff --git a/src/modules/my/idle_mac.cpp b/src/modules/my/Idle_mac.cpp
index 4dc8fb480..543b1c326 100644
--- a/src/modules/my/idle_mac.cpp
+++ b/src/modules/my/Idle_mac.cpp
@@ -1,5 +1,5 @@
 /*
- * idle_mac.cpp - detect desktop idle time
+ * Idle_mac.cpp - detect desktop idle time
  * Copyright (C) 2003  Tarkvara Design Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
 
 #ifdef COMPILE_ON_MAC
 
-	#include "idle.h"
+	#include "Idle.h"
 	#include <Carbon/Carbon.h>
 
 	// Why does Apple have to make this so complicated?
diff --git a/src/modules/my/idle_win.cpp b/src/modules/my/Idle_win.cpp
index 3a1469928..3317d255d 100644
--- a/src/modules/my/idle_win.cpp
+++ b/src/modules/my/Idle_win.cpp
@@ -1,5 +1,5 @@
 /*
- * idle_win.cpp - detect desktop idle time
+ * Idle_win.cpp - detect desktop idle time
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
  */
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 
-	#include "idle.h"
+	#include "Idle.h"
 
 	#include <QLibrary>
 	#include< windows.h>
diff --git a/src/modules/my/idle_x11.cpp b/src/modules/my/Idle_x11.cpp
index 41dc87017..9b4c4a062 100644
--- a/src/modules/my/idle_x11.cpp
+++ b/src/modules/my/Idle_x11.cpp
@@ -1,5 +1,5 @@
 /*
- * idle_x11.cpp - detect desktop idle time
+ * Idle_x11.cpp - detect desktop idle time
  * Copyright (C) 2003  Justin Karneges
  *
  * This library is free software; you can redistribute it and/or
@@ -20,7 +20,7 @@
 #ifndef COMPILE_ON_MAC
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 
-#include"idle.h"
+#include"Idle.h"
 
 #ifndef COMPILE_XSS_SUPPORT
 	IdlePlatform::IdlePlatform() {}
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index ee0e1b4d0..00972553b 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -32,7 +32,7 @@
 #include "KviIrcConnectionServerInfo.h"
 #include "KviIrcServer.h"
 
-#include "idle.h"
+#include "Idle.h"
 Idle* g_pIdle;
 
 #define GET_KVS_CONSOLE \
diff --git a/src/modules/notifier/CMakeLists.txt b/src/modules/notifier/CMakeLists.txt
index 2453bfdb1..78a1d0b5c 100644
--- a/src/modules/notifier/CMakeLists.txt
+++ b/src/modules/notifier/CMakeLists.txt
@@ -1,16 +1,16 @@
 # CMakeLists for src/modules/notifier
 
 SET(kvinotifier_MOC_HDRS
-	notifierwindow.h
-	notifierwindowtab.h
+	NotifierWindow.h
+	NotifierWindowTab.h
 )
 
 SET(kvinotifier_SRCS
 	libkvinotifier.cpp
-	notifierwindow.cpp
-	notifiermessage.cpp
-	notifierwindowtab.cpp
-	notifierwindowborder.cpp
+	NotifierWindow.cpp
+	NotifierMessage.cpp
+	NotifierWindowTab.cpp
+	NotifierWindowBorder.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/notifier/notifiermessage.cpp b/src/modules/notifier/NotifierMessage.cpp
index 67c43a244..6dc7977d7 100644
--- a/src/modules/notifier/notifiermessage.cpp
+++ b/src/modules/notifier/NotifierMessage.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : notifiermessage.cpp
+//   File : NotifierMessage.cpp
 //   Creation date : Mar 02 Nov 2004 02:41:18 by Iacopo Palazzi
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,8 +23,8 @@
 //
 //=============================================================================
 
-#include "notifiermessage.h"
-#include "notifiersettings.h"
+#include "NotifierMessage.h"
+#include "NotifierSettings.h"
 
 #include "KviHtmlGenerator.h"
 #include "KviOptions.h"
@@ -32,7 +32,7 @@
 #include <QRect>
 #include <QResizeEvent>
 
-KviNotifierMessage::KviNotifierMessage(QPixmap * pPixmap, const QString & szText)
+NotifierMessage::NotifierMessage(QPixmap * pPixmap, const QString & szText)
 {
 	m_pLabel0 = 0;
 	m_pLabel1 = 0;
@@ -51,7 +51,7 @@ KviNotifierMessage::KviNotifierMessage(QPixmap * pPixmap, const QString & szText
 	updateGui();
 }
 
-KviNotifierMessage::~KviNotifierMessage()
+NotifierMessage::~NotifierMessage()
 {
 	if(m_pLabel0)
 		m_pLabel0->deleteLater();
@@ -61,7 +61,7 @@ KviNotifierMessage::~KviNotifierMessage()
 		m_pHBox->deleteLater();
 }
 
-void KviNotifierMessage::updateGui()
+void NotifierMessage::updateGui()
 {
 	bool bShowImages = KVI_OPTION_BOOL(KviOption_boolIrcViewShowImages);
 
diff --git a/src/modules/notifier/notifiermessage.h b/src/modules/notifier/NotifierMessage.h
index 518a15098..025e5a11d 100644
--- a/src/modules/notifier/notifiermessage.h
+++ b/src/modules/notifier/NotifierMessage.h
@@ -2,7 +2,7 @@
 #define _NOTIFIERMESSAGE_H_
 //=============================================================================
 //
-//   File : notifiermessage.h
+//   File : NotifierMessage.h
 //   Creation date : Mar 02 Nov 2004 02:41:18 by Iacopo Palazzi
 //
 //   This file is part of the KVIrc distribution
@@ -33,28 +33,28 @@
 #include <QWidget>
 
 /**
-* \class KviNotifierMessage
+* \class NotifierMessage
 * \brief A single message in a notifier window
 *
 * This is basically a single message that can appear in a notifier window
 * It's made up of an icon and a rich text content
 * This class is basically a QLabel with a method that translates a raw irc message to html code.
 */
-class KviNotifierMessage : public QWidget
+class NotifierMessage : public QWidget
 {
-	friend class KviNotifierWindow;
+	friend class NotifierWindow;
 public:
 	/**
-	* \brief Constructs the KviNotifierMessage object
+	* \brief Constructs the NotifierMessage object
 	* \param pPixmap pointer to a message icon, can be null 
 	* \param szText const reference to message text in irc format
-	* \return KviNotifierMessage
+	* \return NotifierMessage
 	*/
-	KviNotifierMessage(QPixmap * pPixmap, const QString &szText);
+	NotifierMessage(QPixmap * pPixmap, const QString &szText);
 	/**
-	* \brief Destroys the KviNotifierMessage object
+	* \brief Destroys the NotifierMessage object
 	*/
-	~KviNotifierMessage();
+	~NotifierMessage();
 private:
 	/// The message text
 	QString       m_szText;
diff --git a/src/modules/notifier/notifiersettings.h b/src/modules/notifier/NotifierSettings.h
index 1a0a29e42..28e53ef3b 100644
--- a/src/modules/notifier/notifiersettings.h
+++ b/src/modules/notifier/NotifierSettings.h
@@ -2,7 +2,7 @@
 #define _NOTIFIER_SETTINGS_H_
 //=============================================================================
 //
-//   File : notifiersettings.h
+//   File : NotifierSettings.h
 //   Creation date : Thu 30 Dev 2004 21:21:33 by Iacopo Palazzi
 //
 //   This file is part of the Notifier - KVIrc Distribution distribution
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/NotifierWindow.cpp
index f46b87c2d..07b3f86bb 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/NotifierWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : notifierwindow.cpp
+//   File : NotifierWindow.cpp
 //   Creation date : Tue Jul 6 2004 20:25:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,10 +23,10 @@
 //=============================================================================
 #include "kvi_settings.h"
 
-#include "notifiermessage.h"
-#include "notifierwindow.h"
-#include "notifierwindowborder.h"
-#include "notifierwindowtab.h"
+#include "NotifierMessage.h"
+#include "NotifierWindow.h"
+#include "NotifierWindowBorder.h"
+#include "NotifierWindowTab.h"
 
 #include "KviIconManager.h"
 #include "KviConfigurationFile.h"
@@ -50,9 +50,9 @@
 #include <QPaintEvent>
 #include <QMouseEvent>
 
-extern KviNotifierWindow * g_pNotifierWindow;
+extern NotifierWindow * g_pNotifierWindow;
 
-KviNotifierWindow::KviNotifierWindow()
+NotifierWindow::NotifierWindow()
 : QWidget(0,
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	Qt::FramelessWindowHint |
@@ -79,7 +79,7 @@ KviNotifierWindow::KviNotifierWindow()
 	m_tStartedAt=0;
 	m_pAutoHideTimer = 0;
 
-	m_pWndBorder = new KviNotifierWindowBorder();
+	m_pWndBorder = new NotifierWindowBorder();
 
 	setFocusPolicy(Qt::NoFocus);
 	setMouseTracking(true);
@@ -148,7 +148,7 @@ KviNotifierWindow::KviNotifierWindow()
 	QTimer::singleShot(0,this,SLOT(updateGui()));
 }
 
-KviNotifierWindow::~KviNotifierWindow()
+NotifierWindow::~NotifierWindow()
 {
 	stopShowHideTimer();
 	stopBlinkTimer();
@@ -157,7 +157,7 @@ KviNotifierWindow::~KviNotifierWindow()
 	m_pWndTabs->deleteLater();
 }
 
-void KviNotifierWindow::updateGui()
+void NotifierWindow::updateGui()
 {
 	setFont(KVI_OPTION_FONT(KviOption_fontNotifier));
 	QPalette palette=m_pLineEdit->palette();
@@ -167,12 +167,12 @@ void KviNotifierWindow::updateGui()
 	
 	for(int i=0; i<m_pWndTabs->count();++i)
 	{
-		((KviNotifierWindowTab*)m_pWndTabs->widget(i))->updateGui();
+		((NotifierWindowTab*)m_pWndTabs->widget(i))->updateGui();
 	}
 
 }
 
-void KviNotifierWindow::addMessage(KviWindow * pWnd, const QString & szImageId, const QString & szText, unsigned int uMessageTime)
+void NotifierWindow::addMessage(KviWindow * pWnd, const QString & szImageId, const QString & szText, unsigned int uMessageTime)
 {
 	QPixmap * pIcon;
 	QString szMessage = szText;
@@ -182,13 +182,13 @@ void KviNotifierWindow::addMessage(KviWindow * pWnd, const QString & szImageId,
 	else
 		pIcon = g_pIconManager->getImage(szImageId);
 
-	KviNotifierMessage * pMessage = new KviNotifierMessage(pIcon ? new QPixmap(*pIcon) : 0,szMessage);
+	NotifierMessage * pMessage = new NotifierMessage(pIcon ? new QPixmap(*pIcon) : 0,szMessage);
 
 	//search for an existing tab
-	KviNotifierWindowTab * pTab = 0, * pTmp = 0;
+	NotifierWindowTab * pTab = 0, * pTmp = 0;
 	for(int i=0; i < m_pWndTabs->count();++i)
 	{
-		pTmp = (KviNotifierWindowTab*)m_pWndTabs->widget(i);
+		pTmp = (NotifierWindowTab*)m_pWndTabs->widget(i);
 		if(pTmp->wnd() == pWnd)
 		{
 			pTab = pTmp;
@@ -198,7 +198,7 @@ void KviNotifierWindow::addMessage(KviWindow * pWnd, const QString & szImageId,
 
 	if(!pTab)
 	{
-		pTab = new KviNotifierWindowTab(pWnd, m_pWndTabs);
+		pTab = new NotifierWindowTab(pWnd, m_pWndTabs);
 	}
 
 	//if the notifier is already visible, don't steal the focus from the current tab!
@@ -236,7 +236,7 @@ void KviNotifierWindow::addMessage(KviWindow * pWnd, const QString & szImageId,
 		update();
 }
 
-void KviNotifierWindow::stopShowHideTimer()
+void NotifierWindow::stopShowHideTimer()
 {
 	if(!m_pShowHideTimer)
 		return;
@@ -244,7 +244,7 @@ void KviNotifierWindow::stopShowHideTimer()
 	m_pShowHideTimer = 0;
 }
 
-void KviNotifierWindow::stopBlinkTimer()
+void NotifierWindow::stopBlinkTimer()
 {
 	if(!m_pBlinkTimer)
 		return;
@@ -252,7 +252,7 @@ void KviNotifierWindow::stopBlinkTimer()
 	m_pBlinkTimer = 0;
 }
 
-void KviNotifierWindow::stopAutoHideTimer()
+void NotifierWindow::stopAutoHideTimer()
 {
 	if(!m_pAutoHideTimer)
 		return;
@@ -307,7 +307,7 @@ void KviNotifierWindow::stopAutoHideTimer()
 	#endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW
 #endif // COMPILE_KDE_SUPPORT
 
-void KviNotifierWindow::doShow(bool bDoAnimate)
+void NotifierWindow::doShow(bool bDoAnimate)
 {
 	if(!KVI_OPTION_BOOL(KviOption_boolEnableNotifier))
 		return;
@@ -374,11 +374,11 @@ void KviNotifierWindow::doShow(bool bDoAnimate)
 	}
 }
 
-bool KviNotifierWindow::shouldHideIfMainWindowGotAttention()
+bool NotifierWindow::shouldHideIfMainWindowGotAttention()
 {
 	if(m_bDisableHideOnMainWindowGotAttention)
 		return false;
-	KviNotifierWindowTab * pTab = (KviNotifierWindowTab *) m_pWndTabs->currentWidget();
+	NotifierWindowTab * pTab = (NotifierWindowTab *) m_pWndTabs->currentWidget();
 	if(!pTab)
 		return false;
 	if(!pTab->wnd())
@@ -386,7 +386,7 @@ bool KviNotifierWindow::shouldHideIfMainWindowGotAttention()
 	return pTab->wnd()->hasAttention();
 }
 
-void KviNotifierWindow::heartbeat()
+void NotifierWindow::heartbeat()
 {
 	bool bIncreasing;
 	double targetOpacity = 0;
@@ -475,7 +475,7 @@ void KviNotifierWindow::heartbeat()
 	}
 }
 
-void KviNotifierWindow::hideNow()
+void NotifierWindow::hideNow()
 {
 	stopBlinkTimer();
 	stopShowHideTimer();
@@ -486,7 +486,7 @@ void KviNotifierWindow::hideNow()
 	hide();
 }
 
-void KviNotifierWindow::doHide(bool bDoAnimate)
+void NotifierWindow::doHide(bool bDoAnimate)
 {
 	stopAutoHideTimer();
 	switch(m_eState)
@@ -539,12 +539,12 @@ void KviNotifierWindow::doHide(bool bDoAnimate)
 	}
 }
 
-void KviNotifierWindow::showEvent(QShowEvent *)
+void NotifierWindow::showEvent(QShowEvent *)
 {
  	setGeometry(m_wndRect);
 }
 
-void KviNotifierWindow::hideEvent(QHideEvent *)
+void NotifierWindow::hideEvent(QHideEvent *)
 {
 	if(m_bCrashShowWorkAround)
 		return;
@@ -556,7 +556,7 @@ void KviNotifierWindow::hideEvent(QHideEvent *)
 	m_bDisableHideOnMainWindowGotAttention = false;
 }
 
-void KviNotifierWindow::startBlinking()
+void NotifierWindow::startBlinking()
 {
 	stopBlinkTimer();
 	m_bBlinkOn = false;
@@ -570,7 +570,7 @@ void KviNotifierWindow::startBlinking()
 	}
 }
 
-void KviNotifierWindow::startAutoHideTimer()
+void NotifierWindow::startAutoHideTimer()
 {
 	stopAutoHideTimer();
 	m_tStartedAt = kvi_unixTime();
@@ -586,7 +586,7 @@ void KviNotifierWindow::startAutoHideTimer()
 	m_pAutoHideTimer->start(100);
 }
 
-void KviNotifierWindow::blink()
+void NotifierWindow::blink()
 {
 	m_iBlinkCount++;
 	m_bBlinkOn = !m_bBlinkOn;
@@ -608,7 +608,7 @@ void KviNotifierWindow::blink()
 	update();
 }
 
-void KviNotifierWindow::paintEvent(QPaintEvent * e)
+void NotifierWindow::paintEvent(QPaintEvent * e)
 {
 	QPainter * pPaint = new QPainter(this);
 
@@ -626,7 +626,7 @@ void KviNotifierWindow::paintEvent(QPaintEvent * e)
 	pPaint->setFont(KVI_OPTION_FONT(KviOption_fontNotifierTitle));
 
 	QString szTitle = "KVIrc - ";
-	KviNotifierWindowTab * pTab = (KviNotifierWindowTab *)m_pWndTabs->currentWidget();
+	NotifierWindowTab * pTab = (NotifierWindowTab *)m_pWndTabs->currentWidget();
 	if(pTab)
 	{
 		if(pTab->wnd())
@@ -644,7 +644,7 @@ void KviNotifierWindow::paintEvent(QPaintEvent * e)
 	e->ignore();
 }
 
-void KviNotifierWindow::mouseMoveEvent(QMouseEvent * e)
+void NotifierWindow::mouseMoveEvent(QMouseEvent * e)
 {
 	if(!m_bLeftButtonIsPressed)
 	{
@@ -684,7 +684,7 @@ sartelo:
 	}
 }
 
-void KviNotifierWindow::mousePressEvent(QMouseEvent * e)
+void NotifierWindow::mousePressEvent(QMouseEvent * e)
 {
 	// stop blinking first of all :)
 	bool bWasBlinkOn = m_bBlinkOn;
@@ -737,7 +737,7 @@ void KviNotifierWindow::mousePressEvent(QMouseEvent * e)
 		update();
 }
 
-void KviNotifierWindow::mouseReleaseEvent(QMouseEvent * e)
+void NotifierWindow::mouseReleaseEvent(QMouseEvent * e)
 {
 	m_bWriteDown = false;
 	m_bNextDown = false;
@@ -765,7 +765,7 @@ void KviNotifierWindow::mouseReleaseEvent(QMouseEvent * e)
 	setCursor(-1);
 }
 
-void KviNotifierWindow::keyPressEvent(QKeyEvent * e)
+void NotifierWindow::keyPressEvent(QKeyEvent * e)
 {
 	if(e->key() == Qt::Key_Escape)
 	{
@@ -774,7 +774,7 @@ void KviNotifierWindow::keyPressEvent(QKeyEvent * e)
 	}
 }
 
-bool KviNotifierWindow::checkResizing(QPoint e)
+bool NotifierWindow::checkResizing(QPoint e)
 {
 	if(e.y() < WDG_BORDER_THICKNESS)
 	{
@@ -863,7 +863,7 @@ bool KviNotifierWindow::checkResizing(QPoint e)
 	return m_bResizing;
 }
 
-void KviNotifierWindow::resize(QPoint, bool)
+void NotifierWindow::resize(QPoint, bool)
 {
 	if(m_whereResizing == WDG_UPSX || m_whereResizing == WDG_SX || m_whereResizing == WDG_DWNSX)
 	{
@@ -901,7 +901,7 @@ void KviNotifierWindow::resize(QPoint, bool)
 	setGeometry(m_wndRect);
 }
 
-inline void KviNotifierWindow::setCursor(int iCur)
+inline void NotifierWindow::setCursor(int iCur)
 {
 	if(m_cursor.shape() != iCur)
 	{
@@ -916,7 +916,7 @@ inline void KviNotifierWindow::setCursor(int iCur)
 	}
 }
 
-void KviNotifierWindow::enterEvent(QEvent *)
+void NotifierWindow::enterEvent(QEvent *)
 {
 	if(!m_pShowHideTimer)
 	{
@@ -927,7 +927,7 @@ void KviNotifierWindow::enterEvent(QEvent *)
 	m_pShowHideTimer->start(40);
 }
 
-void KviNotifierWindow::leaveEvent(QEvent *)
+void NotifierWindow::leaveEvent(QEvent *)
 {
 	// Leaving the widget area, restore default cursor
 	m_pWndBorder->resetIcons();
@@ -947,7 +947,7 @@ void KviNotifierWindow::leaveEvent(QEvent *)
 	}
 }
 
-void KviNotifierWindow::contextPopup(const QPoint & pos)
+void NotifierWindow::contextPopup(const QPoint & pos)
 {
 	if(!m_pContextPopup)
 	{
@@ -959,7 +959,7 @@ void KviNotifierWindow::contextPopup(const QPoint & pos)
 	m_pContextPopup->popup(pos);
 }
 
-void KviNotifierWindow::fillContextPopup()
+void NotifierWindow::fillContextPopup()
 {
 	m_pContextPopup->clear();
 	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITOR)),__tr2qs_ctx("Show/Hide input line","notifier"),this,SLOT(toggleLineEdit()));
@@ -978,7 +978,7 @@ void KviNotifierWindow::fillContextPopup()
 	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Disable","notifier"),m_pDisablePopup);
 }
 
-void KviNotifierWindow::disableFor15Minutes()
+void NotifierWindow::disableFor15Minutes()
 {
 	kvi_time_t tNow = kvi_unixTime();
 	g_tNotifierDisabledUntil = tNow + (60 * 15);
@@ -986,7 +986,7 @@ void KviNotifierWindow::disableFor15Minutes()
 	hideNow();
 }
 
-void KviNotifierWindow::disableFor5Minutes()
+void NotifierWindow::disableFor5Minutes()
 {
 	kvi_time_t tNow = kvi_unixTime();
 	g_tNotifierDisabledUntil = tNow + (60 * 5);
@@ -995,7 +995,7 @@ void KviNotifierWindow::disableFor5Minutes()
 }
 
 
-void KviNotifierWindow::disableFor1Minute()
+void NotifierWindow::disableFor1Minute()
 {
 	kvi_time_t tNow = kvi_unixTime();
 	g_tNotifierDisabledUntil = tNow + 60;
@@ -1003,7 +1003,7 @@ void KviNotifierWindow::disableFor1Minute()
 	hideNow();
 }
 
-void KviNotifierWindow::disableFor30Minutes()
+void NotifierWindow::disableFor30Minutes()
 {
 	kvi_time_t tNow = kvi_unixTime();
 	g_tNotifierDisabledUntil = tNow + (60 * 30);
@@ -1011,7 +1011,7 @@ void KviNotifierWindow::disableFor30Minutes()
 	hideNow();
 }
 
-void KviNotifierWindow::disableFor60Minutes()
+void NotifierWindow::disableFor60Minutes()
 {
 	kvi_time_t tNow = kvi_unixTime();
 	g_tNotifierDisabledUntil = tNow + (60 * 60);
@@ -1019,7 +1019,7 @@ void KviNotifierWindow::disableFor60Minutes()
 	hideNow();
 }
 
-void KviNotifierWindow::disableUntilKVIrcRestarted()
+void NotifierWindow::disableUntilKVIrcRestarted()
 {
 	kvi_time_t tNow = kvi_unixTime();
 	// in fact we just disable for one year
@@ -1029,30 +1029,30 @@ void KviNotifierWindow::disableUntilKVIrcRestarted()
 	hideNow();
 }
 
-void KviNotifierWindow::disablePermanently()
+void NotifierWindow::disablePermanently()
 {
 	KVI_OPTION_BOOL(KviOption_boolEnableNotifier) = false;
 	hideNow();
 }
 
-void KviNotifierWindow::toggleLineEdit()
+void NotifierWindow::toggleLineEdit()
 {
 	showLineEdit(!m_pLineEdit->isVisible());
 }
 
-void KviNotifierWindow::showLineEdit(bool bShow)
+void NotifierWindow::showLineEdit(bool bShow)
 {
 	if(bShow)
 	{
 		if(m_pLineEdit->isVisible())
 			return;
-		if(!((KviNotifierWindowTab *)m_pWndTabs->currentWidget())->wnd())
+		if(!((NotifierWindowTab *)m_pWndTabs->currentWidget())->wnd())
 			return;
 		m_pLineEdit->setToolTip("");
 		
 		QString szTip = __tr2qs_ctx("Write text or commands to window","notifier");
 		szTip += " \"";
-		szTip += ((KviNotifierWindowTab *)m_pWndTabs->currentWidget())->wnd()->plainTextCaption();
+		szTip += ((NotifierWindowTab *)m_pWndTabs->currentWidget())->wnd()->plainTextCaption();
 		szTip += "\"";
 		m_pLineEdit->setToolTip(szTip);
 		m_pLineEdit->show();
@@ -1067,7 +1067,7 @@ void KviNotifierWindow::showLineEdit(bool bShow)
 	}
 }
 
-bool KviNotifierWindow::eventFilter(QObject * pEdit, QEvent * e)
+bool NotifierWindow::eventFilter(QObject * pEdit, QEvent * e)
 {
 	if(pEdit != (QObject *)m_pLineEdit)
 		return false; // huh ?
@@ -1097,12 +1097,12 @@ bool KviNotifierWindow::eventFilter(QObject * pEdit, QEvent * e)
 	return false;
 }
 
-void KviNotifierWindow::returnPressed()
+void NotifierWindow::returnPressed()
 {
 	if(!m_pLineEdit->isVisible())
 		return;
 
-	KviNotifierWindowTab * pTab = (KviNotifierWindowTab *) m_pWndTabs->currentWidget();
+	NotifierWindowTab * pTab = (NotifierWindowTab *) m_pWndTabs->currentWidget();
 	if(!pTab)
 		return;
 	if(!pTab->wnd())
@@ -1121,7 +1121,7 @@ void KviNotifierWindow::returnPressed()
 	KviUserInput::parse(szTxt,pTab->wnd(),QString(),1);
 }
 
-void KviNotifierWindow::progressUpdate()
+void NotifierWindow::progressUpdate()
 {
 	kvi_time_t now = kvi_unixTime();
 	int iProgress = (int)(100/(m_tAutoHideAt - m_tStartedAt)*(now - m_tStartedAt));
@@ -1134,11 +1134,11 @@ void KviNotifierWindow::progressUpdate()
 	}
 }
 
-void KviNotifierWindow::slotTabCloseRequested(int iIndex)
+void NotifierWindow::slotTabCloseRequested(int iIndex)
 {
 	if(m_pWndTabs)
 	{
-		KviNotifierWindowTab * pTab = (KviNotifierWindowTab *) m_pWndTabs->widget(iIndex);
+		NotifierWindowTab * pTab = (NotifierWindowTab *) m_pWndTabs->widget(iIndex);
 		m_pWndTabs->removeTab(iIndex);
 		if(pTab)
 			pTab->deleteLater();
@@ -1149,5 +1149,5 @@ void KviNotifierWindow::slotTabCloseRequested(int iIndex)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_notifierwindow.moc"
+#include "m_NotifierWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/NotifierWindow.h
index 10e1b8c6a..d58cde2ae 100644
--- a/src/modules/notifier/notifierwindow.h
+++ b/src/modules/notifier/NotifierWindow.h
@@ -2,7 +2,7 @@
 #define _NOTIFIERWINDOW_H_
 //=============================================================================
 //
-//   File : notifierwindow.h
+//   File : NotifierWindow.h
 //   Creation date : Tue Jul 6 2004 20:25:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "notifiersettings.h"
+#include "NotifierSettings.h"
 
 #include "kvi_settings.h"
 #include "KviQString.h"
@@ -47,19 +47,19 @@
 
 class QPainter;
 class KviWindow;
-class KviNotifierMessage;
-class KviNotifierWindowBorder;
+class NotifierMessage;
+class NotifierWindowBorder;
 class KviNotifierWindowTabs;
 class KviThemedLineEdit;
 
 extern kvi_time_t g_tNotifierDisabledUntil;
 
-class KviNotifierWindow : public QWidget
+class NotifierWindow : public QWidget
 {
 	Q_OBJECT
 public:
-	KviNotifierWindow();
-	~KviNotifierWindow();
+	NotifierWindow();
+	~NotifierWindow();
 protected:
 	QTimer * m_pShowHideTimer;
 	QTimer * m_pBlinkTimer;
@@ -76,7 +76,7 @@ protected:
 
 	QRect	m_wndRect;
 
-	KviNotifierMessage * m_pCurrentMessage;
+	NotifierMessage * m_pCurrentMessage;
 	KviThemedLineEdit * m_pLineEdit;
 
 	bool	m_bDragging;
@@ -102,7 +102,7 @@ protected:
 
 	QTabWidget 			* m_pWndTabs;
 	QProgressBar			* m_pProgressBar;
-	KviNotifierWindowBorder 	* m_pWndBorder;
+	NotifierWindowBorder 	* m_pWndBorder;
 public:
 	void doShow(bool bDoAnimate);
 	void doHide(bool bDoAnimate);
diff --git a/src/modules/notifier/notifierwindowborder.cpp b/src/modules/notifier/NotifierWindowBorder.cpp
index c8c94c3f5..a47d3a64c 100644
--- a/src/modules/notifier/notifierwindowborder.cpp
+++ b/src/modules/notifier/NotifierWindowBorder.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : notifierwindowborder.cpp
+//   File : NotifierWindowBorder.cpp
 //   Creation date : Mon 03 Jan 2005 02:27:22 by Iacopo Palazzi
 //
 //   This file is part of the KVIrc distribution
@@ -22,24 +22,24 @@
 //
 //=============================================================================
 
-#include "notifierwindowborder.h"
-#include "notifierwindowtab.h"
+#include "NotifierWindowBorder.h"
+#include "NotifierWindowTab.h"
 
 #include "KviIconManager.h"
 
 #include <QPainter>
 
-KviNotifierWindowBorder::KviNotifierWindowBorder(QSize s)
+NotifierWindowBorder::NotifierWindowBorder(QSize s)
 {
 	loadImages();
 	resize(s);
 }
 
-KviNotifierWindowBorder::~KviNotifierWindowBorder()
+NotifierWindowBorder::~NotifierWindowBorder()
 {
 }
 
-void KviNotifierWindowBorder::loadImages()
+void NotifierWindowBorder::loadImages()
 {
 	// Normal Border
 
@@ -103,7 +103,7 @@ void KviNotifierWindowBorder::loadImages()
 
 }
 
-void KviNotifierWindowBorder::setPics(bool b)
+void NotifierWindowBorder::setPics(bool b)
 {
 	if (b) {
 		m_pixSX = &m_pixSX_HL;
@@ -132,19 +132,19 @@ void KviNotifierWindowBorder::setPics(bool b)
 	}
 }
 
-void KviNotifierWindowBorder::setWidth(int w)
+void NotifierWindowBorder::setWidth(int w)
 {
 	m_iRctWidth = w;
 	recalculatePositions();
 }
 
-void KviNotifierWindowBorder::setHeight(int h)
+void NotifierWindowBorder::setHeight(int h)
 {
 	m_iRctHeight = h;
 	recalculatePositions();
 }
 
-void KviNotifierWindowBorder::recalculatePositions()
+void NotifierWindowBorder::recalculatePositions()
 {
 	m_rct.setHeight(m_iRctHeight);
 	m_rct.setWidth(m_iRctWidth);
@@ -166,7 +166,7 @@ void KviNotifierWindowBorder::recalculatePositions()
 
 }
 
-void KviNotifierWindowBorder::setCloseIcon(int state)
+void NotifierWindowBorder::setCloseIcon(int state)
 {
 	m_eIconState = state;
 	switch (m_eIconState) {
@@ -176,12 +176,12 @@ void KviNotifierWindowBorder::setCloseIcon(int state)
 	};
 }
 
-void KviNotifierWindowBorder::resetIcons()
+void NotifierWindowBorder::resetIcons()
 {
 	setCloseIcon(WDG_ICON_OUT);
 }
 
-void KviNotifierWindowBorder::draw(QPainter * p, bool b)
+void NotifierWindowBorder::draw(QPainter * p, bool b)
 {
 	setPics(b);
 	setCloseIcon(m_eIconState);
diff --git a/src/modules/notifier/notifierwindowborder.h b/src/modules/notifier/NotifierWindowBorder.h
index d5a6bbcb0..b59d90b74 100644
--- a/src/modules/notifier/notifierwindowborder.h
+++ b/src/modules/notifier/NotifierWindowBorder.h
@@ -2,7 +2,7 @@
 #define _KVINOTIFIERWINDOWBORDER_H_
 //=============================================================================
 //
-//   File : notifierwindowborder.h
+//   File : NotifierWindowBorder.h
 //   Creation date : Mon 03 Jan 2005 02:27:22 by Iacopo Palazzi
 //
 //   This file is part of the KVIrc distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "notifiersettings.h"
+#include "NotifierSettings.h"
 
 #include <QSize>
 #include <QRect>
@@ -32,11 +32,11 @@
 
 class QPainter;
 
-class KviNotifierWindowBorder
+class NotifierWindowBorder
 {
 public:
-	KviNotifierWindowBorder(QSize = QSize(WDG_MIN_WIDTH,WDG_MIN_HEIGHT));
-	~KviNotifierWindowBorder();
+	NotifierWindowBorder(QSize = QSize(WDG_MIN_WIDTH,WDG_MIN_HEIGHT));
+	~NotifierWindowBorder();
 
 // ================================
 // Put members declaration below...
diff --git a/src/modules/notifier/notifierwindowtab.cpp b/src/modules/notifier/NotifierWindowTab.cpp
index 7f48d15f6..dc47a3535 100644
--- a/src/modules/notifier/notifierwindowtab.cpp
+++ b/src/modules/notifier/NotifierWindowTab.cpp
@@ -1,7 +1,7 @@
 //=============================================================================
 //
-//   File : notifierwindowtab.cpp
-//   File : notifierwindowtab.h
+//   File : NotifierWindowTab.cpp
+//   File : NotifierWindowTab.h
 //   Creation date : Tue 07 Jul 2009 10:28 by Fabio Bas
 //
 //   This file is part of the KVIrc distribution
@@ -23,10 +23,10 @@
 //
 //=============================================================================
 
-#include "notifiermessage.h"
-#include "notifierwindowtab.h"
-#include "notifierwindow.h"
-#include "notifiersettings.h"
+#include "NotifierMessage.h"
+#include "NotifierWindowTab.h"
+#include "NotifierWindow.h"
+#include "NotifierSettings.h"
 
 #include "KviApplication.h"
 #include "KviConfigurationFile.h"
@@ -48,9 +48,9 @@
 	extern KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground;
 #endif
 
-extern KviNotifierWindow * g_pNotifierWindow;
+extern NotifierWindow * g_pNotifierWindow;
 
-KviNotifierWindowTab::KviNotifierWindowTab(KviWindow * pWnd, QTabWidget * pParent)
+NotifierWindowTab::NotifierWindowTab(KviWindow * pWnd, QTabWidget * pParent)
 : QScrollArea(pParent)
 {
 	m_pWnd = pWnd;
@@ -88,7 +88,7 @@ KviNotifierWindowTab::KviNotifierWindowTab(KviWindow * pWnd, QTabWidget * pParen
 	setWidget(m_pVWidget);
 }
 
-KviNotifierWindowTab::~KviNotifierWindowTab()
+NotifierWindowTab::~NotifierWindowTab()
 {
 	if(m_pVBox)
 		m_pVBox->deleteLater();
@@ -96,7 +96,7 @@ KviNotifierWindowTab::~KviNotifierWindowTab()
 		m_pVWidget->deleteLater();
 }
 
-void KviNotifierWindowTab::appendMessage(KviNotifierMessage * pMessage)
+void NotifierWindowTab::appendMessage(NotifierMessage * pMessage)
 {
 	m_pVBox->addWidget(pMessage);
 	pMessage->setFixedWidth(viewport()->width());
@@ -104,31 +104,31 @@ void KviNotifierWindowTab::appendMessage(KviNotifierMessage * pMessage)
 	while(m_pVBox->count() > MAX_MESSAGES_IN_WINDOW)
 	{
 		QLayoutItem * pTmp = m_pVBox->takeAt(0);
-		KviNotifierMessage * pTmp2 = (KviNotifierMessage*)pTmp->widget();
+		NotifierMessage * pTmp2 = (NotifierMessage*)pTmp->widget();
 		if(pTmp2)
 			pTmp2->deleteLater();
 	}
 }
 
-void KviNotifierWindowTab::updateGui()
+void NotifierWindowTab::updateGui()
 {
 	for(int i=0; i<m_pVBox->count(); ++i)
 	{
 		QLayoutItem * pTmp = m_pVBox->itemAt(i);
-		KviNotifierMessage * pTmp2 = (KviNotifierMessage*)pTmp->widget();
+		NotifierMessage * pTmp2 = (NotifierMessage*)pTmp->widget();
 		if(pTmp2)
 			pTmp2->updateGui();
 	}
 }
 
-void KviNotifierWindowTab::scrollRangeChanged(int, int)
+void NotifierWindowTab::scrollRangeChanged(int, int)
 {
 	//this is the autoscroll
 	if(verticalScrollBar())
 		verticalScrollBar()->triggerAction(QAbstractSlider::SliderToMaximum);
 }
 
-void KviNotifierWindowTab::labelChanged()
+void NotifierWindowTab::labelChanged()
 {
 	if(!m_pWnd || !m_pParent)
 		return;
@@ -139,7 +139,7 @@ void KviNotifierWindowTab::labelChanged()
 		m_pParent->setTabText(iIdx, m_szLabel);
 }
 
-void KviNotifierWindowTab::mouseDoubleClickEvent(QMouseEvent *)
+void NotifierWindowTab::mouseDoubleClickEvent(QMouseEvent *)
 {
 	if(!m_pWnd || !g_pNotifierWindow)
 		return;
@@ -160,7 +160,7 @@ void KviNotifierWindowTab::mouseDoubleClickEvent(QMouseEvent *)
 	m_pWnd->frame()->setActiveWindow(m_pWnd);
 }
 
-void KviNotifierWindowTab::closeMe()
+void NotifierWindowTab::closeMe()
 {
 	//our window has been closed
 	if(m_pParent && g_pNotifierWindow)
@@ -173,22 +173,22 @@ void KviNotifierWindowTab::closeMe()
 	}
 }
 
-void KviNotifierWindowTab::resizeEvent(QResizeEvent *)
+void NotifierWindowTab::resizeEvent(QResizeEvent *)
 {
 	if(m_pVBox)
 	{
 		int iWidth = viewport()->width();
-		KviNotifierMessage * pMessage;
+		NotifierMessage * pMessage;
 		for(int i=0; i < m_pVBox->count(); i++)
 		{
-			pMessage = (KviNotifierMessage *)m_pVBox->itemAt(i)->widget();
+			pMessage = (NotifierMessage *)m_pVBox->itemAt(i)->widget();
 			if(pMessage)
 				pMessage->setFixedWidth(iWidth);
 		}
 	}
 }
 
-void KviNotifierWindowTab::paintEvent(QPaintEvent * e)
+void NotifierWindowTab::paintEvent(QPaintEvent * e)
 {
 	QPainter * pPainter = new QPainter(viewport());
 
@@ -226,5 +226,5 @@ void KviNotifierWindowTab::paintEvent(QPaintEvent * e)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_notifierwindowtab.moc"
+#include "m_NotifierWindowTab.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/notifier/notifierwindowtab.h b/src/modules/notifier/NotifierWindowTab.h
index 0e6edcdbe..5a07f387d 100644
--- a/src/modules/notifier/notifierwindowtab.h
+++ b/src/modules/notifier/NotifierWindowTab.h
@@ -2,7 +2,7 @@
 #define _KVINOTIFIERWINDOWTAB_H_
 //=============================================================================
 //
-//   File : notifierwindowtab.h
+//   File : NotifierWindowTab.h
 //   Creation date : Tue 07 Jul 2009 10:28 by Fabio Bas
 //
 //   This file is part of the KVIrc distribution
@@ -25,12 +25,12 @@
 //=============================================================================
 
 /**
-* \file notifierwindowtab.h
+* \file NotifierWindowTab.h
 * \author Fabio Bas
 * \brief Defines the tab page for the notifier object
 */
 
-#include "notifiermessage.h"
+#include "NotifierMessage.h"
 
 #include "kvi_settings.h"
 
@@ -43,10 +43,10 @@ class QPainter;
 class KviWindow;
 
 /**
-* \class KviNotifierWindowTab
+* \class NotifierWindowTab
 * \brief Defines an object for every single tab about the tabs area
 */
-class KviNotifierWindowTab : public QScrollArea
+class NotifierWindowTab : public QScrollArea
 {
 	Q_OBJECT
 public:
@@ -54,14 +54,14 @@ public:
 	* \brief Creates the tab object
 	* \param pWnd The name of the window represented by the tab
 	* \param pParent The parent area container
-	* \return KviNotifierWindowTab
+	* \return NotifierWindowTab
 	*/
-	KviNotifierWindowTab(KviWindow * pWnd, QTabWidget * pParent);
+	NotifierWindowTab(KviWindow * pWnd, QTabWidget * pParent);
 	
 	/**
 	* \brief Destroys the tab object
 	*/
-	~KviNotifierWindowTab();
+	~NotifierWindowTab();
 private:
 	QString       m_szLabel;
 	KviWindow   * m_pWnd;
@@ -74,7 +74,7 @@ public:
 	* \param pMessage The message received to append
 	* \return void
 	*/
-	void appendMessage(KviNotifierMessage * pMessage);
+	void appendMessage(NotifierMessage * pMessage);
 	
 	/**
 	* \brief Updates the GUI
diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp
index 0b71a6450..1943faffc 100644
--- a/src/modules/notifier/libkvinotifier.cpp
+++ b/src/modules/notifier/libkvinotifier.cpp
@@ -23,8 +23,8 @@
 //
 //=============================================================================
 
-#include "notifierwindow.h"
-#include "notifiermessage.h"
+#include "NotifierWindow.h"
+#include "NotifierMessage.h"
 
 #include "KviModule.h"
 #include "KviKvsVariant.h"
@@ -38,7 +38,7 @@
 
 #include <QSplitter>
 
-KviNotifierWindow * g_pNotifierWindow = 0;
+NotifierWindow * g_pNotifierWindow = 0;
 kvi_time_t g_tNotifierDisabledUntil = 0;
 
 /*
@@ -119,7 +119,7 @@ static bool notifier_kvs_cmd_message(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 
 	if(!g_pNotifierWindow)
-		g_pNotifierWindow = new KviNotifierWindow();
+		g_pNotifierWindow = new NotifierWindow();
 
 	QString szIco="";
 	QString szWnd="";
@@ -293,7 +293,7 @@ static bool notifier_module_ctrl(KviModule *, const char * pcOperation, void * p
 		return false;
 
 	if(!g_pNotifierWindow)
-		g_pNotifierWindow = new KviNotifierWindow();
+		g_pNotifierWindow = new NotifierWindow();
 
 	g_pNotifierWindow->addMessage(p->pWindow,p->szIcon,p->szMessage,p->uMessageLifetime);
 	g_pNotifierWindow->doShow(KVI_OPTION_BOOL(KviOption_boolNotifierFading) ? true : false);
diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt
index 694cde24c..da456fe1b 100644
--- a/src/modules/objects/CMakeLists.txt
+++ b/src/modules/objects/CMakeLists.txt
@@ -8,84 +8,84 @@ IF(WIN32)
 ENDIF()
 
 SET(kviobjects_MOC_HDRS
-	class_button.h
-	class_checkbox.h
-	class_combobox.h
-	class_datetimeedit.h
-	class_dockwindow.h
-	class_ftp.h
-	class_http.h
-	class_lineedit.h
-	class_listwidget.h
-	class_multilineedit.h
-	class_painter.h
-	class_pixmap.h
-	class_popupmenu.h
-	class_process.h
-	class_radiobutton.h
-	class_slider.h
-	class_socket.h
-	class_spinbox.h
-	class_tabwidget.h
-	class_tablewidget.h
-	class_trayicon.h
-	class_tbrowser.h
-	class_toolbutton.h
-	class_treewidget.h
-	class_widget.h
-	class_window.h
-	class_wizard.h
+	KvsObject_button.h
+	KvsObject_checkBox.h
+	KvsObject_comboBox.h
+	KvsObject_dateTimeEdit.h
+	KvsObject_dockWindow.h
+	KvsObject_ftp.h
+	KvsObject_http.h
+	KvsObject_lineEdit.h
+	KvsObject_listWidget.h
+	KvsObject_multiLineEdit.h
+	KvsObject_painter.h
+	KvsObject_pixmap.h
+	KvsObject_popupMenu.h
+	KvsObject_process.h
+	KvsObject_radioButton.h
+	KvsObject_slider.h
+	KvsObject_socket.h
+	KvsObject_spinBox.h
+	KvsObject_tabWidget.h
+	KvsObject_tableWidget.h
+	KvsObject_trayIcon.h
+	KvsObject_textBrowser.h
+	KvsObject_toolButton.h
+	KvsObject_treeWidget.h
+	KvsObject_widget.h
+	KvsObject_window.h
+	KvsObject_wizard.h
 )
 
 SET(kviobjects_SRCS
 	libkviobjects.cpp
-	class_button.cpp
-	class_buttongroup.cpp
-	class_checkbox.cpp
-	class_combobox.cpp
-	class_datetimeedit.cpp
-	class_dialog.cpp
-	class_dockwindow.cpp
-	class_file.cpp
-	class_ftp.cpp
-	class_groupbox.cpp
-	class_hbox.cpp
-	class_http.cpp
-	class_label.cpp
-	class_layout.cpp
-	class_lcd.cpp
-	class_lineedit.cpp
-	class_list.cpp
-	class_listwidget.cpp
-	class_mainwindow.cpp
-	class_memorybuffer.cpp
-	class_menubar.cpp
-	class_multilineedit.cpp
-	class_painter.cpp
-	class_pixmap.cpp
-	class_popupmenu.cpp
-	class_process.cpp
-	class_progressbar.cpp
-	class_radiobutton.cpp
-	class_slider.cpp
-	class_socket.cpp
-	class_spinbox.cpp
-	class_sql.cpp
-	class_tabwidget.cpp
-	class_tablewidget.cpp
-	class_trayicon.cpp
-	class_tbrowser.cpp
-	class_toolbar.cpp
-	class_toolbutton.cpp
-	class_treewidget.cpp
-	class_treewidgetitem.cpp
-	class_vbox.cpp
-	class_widget.cpp
-	class_window.cpp
-	class_wizard.cpp
-	class_workspace.cpp
-	class_wrapper.cpp
-	class_xmlreader.cpp
+	KvsObject_button.cpp
+	KvsObject_buttonGroup.cpp
+	KvsObject_checkBox.cpp
+	KvsObject_comboBox.cpp
+	KvsObject_dateTimeEdit.cpp
+	KvsObject_dialog.cpp
+	KvsObject_dockWindow.cpp
+	KvsObject_file.cpp
+	KvsObject_ftp.cpp
+	KvsObject_groupBox.cpp
+	KvsObject_hBox.cpp
+	KvsObject_http.cpp
+	KvsObject_label.cpp
+	KvsObject_layout.cpp
+	KvsObject_lcd.cpp
+	KvsObject_lineEdit.cpp
+	KvsObject_list.cpp
+	KvsObject_listWidget.cpp
+	KvsObject_mainWindow.cpp
+	KvsObject_memoryBuffer.cpp
+	KvsObject_menuBar.cpp
+	KvsObject_multiLineEdit.cpp
+	KvsObject_painter.cpp
+	KvsObject_pixmap.cpp
+	KvsObject_popupMenu.cpp
+	KvsObject_process.cpp
+	KvsObject_progressBar.cpp
+	KvsObject_radioButton.cpp
+	KvsObject_slider.cpp
+	KvsObject_socket.cpp
+	KvsObject_spinBox.cpp
+	KvsObject_sql.cpp
+	KvsObject_tabWidget.cpp
+	KvsObject_tableWidget.cpp
+	KvsObject_trayIcon.cpp
+	KvsObject_textBrowser.cpp
+	KvsObject_toolBar.cpp
+	KvsObject_toolButton.cpp
+	KvsObject_treeWidget.cpp
+	KvsObject_treeWidgeteItem.cpp
+	KvsObject_vBox.cpp
+	KvsObject_widget.cpp
+	KvsObject_window.cpp
+	KvsObject_wizard.cpp
+	KvsObject_workspace.cpp
+	KvsObject_wrapper.cpp
+	KvsObject_xmlreader.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/KvsObject_button.cpp
index 285bea331..1730379ae 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/KvsObject_button.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_button.cpp
+//   File : KvsObject_button.cpp
 //   Creation date : Wed 13 Sep 2000 02:42:05 CEST by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -29,8 +29,8 @@
 #include "KviIconManager.h"
 #include "KviFile.h"
 
-#include "class_button.h"
-#include "class_pixmap.h"
+#include "KvsObject_button.h"
+#include "KvsObject_pixmap.h"
 
 #include <QIcon>
 #include <QPushButton>
@@ -70,25 +70,25 @@
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_button,"button","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_button,"button","widget")
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_button,setText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_button,text)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_button,clickEvent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_button,setImage)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_button,setText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_button,text)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_button,clickEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_button,setImage)
 
-KVSO_END_REGISTERCLASS(KviKvsObject_button)
+KVSO_END_REGISTERCLASS(KvsObject_button)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_button,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_button,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_button)
+KVSO_END_CONSTRUCTOR(KvsObject_button)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_button)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_button)
 
-KVSO_END_DESTRUCTOR(KviKvsObject_button)
+KVSO_END_DESTRUCTOR(KvsObject_button)
 
-bool KviKvsObject_button::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_button::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QPushButton);
         connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked()));
@@ -136,7 +136,7 @@ KVSO_CLASS_FUNCTION(button,setImage)
 			return true;
 		}
 		if(pObject->inheritsClass("pixmap"))
-			((QPushButton *)widget())->setIcon(QIcon(*((KviKvsObject_pixmap *)pObject)->getPixmap()));
+			((QPushButton *)widget())->setIcon(QIcon(*((KvsObject_pixmap *)pObject)->getPixmap()));
 		else
 			c->warning(__tr2qs_ctx("Object Pixmap required!","object"));
 		return true;
@@ -155,7 +155,7 @@ KVSO_CLASS_FUNCTION(button,clickEvent)
 }
 
 // slots
-void KviKvsObject_button::slotClicked()
+void KvsObject_button::slotClicked()
 {
 	KviKvsVariantList *params=0;
 	callFunction(this,"clickEvent",params);
@@ -163,5 +163,5 @@ void KviKvsObject_button::slotClicked()
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_button.moc"
+#include "m_KvsObject_button.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_button.h b/src/modules/objects/KvsObject_button.h
index 3abfd3048..8fb8ce8c4 100644
--- a/src/modules/objects/class_button.h
+++ b/src/modules/objects/KvsObject_button.h
@@ -2,7 +2,7 @@
 #define _CLASS_BUTTON_H_
 //=============================================================================
 //
-//   File : class_button.h
+//   File : KvsObject_button.h
 //   Creation date : Wed 13 Sep 2000 02:42:05 CEST by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -27,14 +27,14 @@
 
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_button : public KviKvsObject_widget
+class KvsObject_button : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_button)
+	KVSO_DECLARE_OBJECT(KvsObject_button)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/KvsObject_buttonGroup.cpp
index 80449981d..82f4c1f89 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/KvsObject_buttonGroup.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_buttongroup.cpp
+//   File : KvsObject_buttonGroup.cpp
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -24,7 +24,7 @@
 //=============================================================================
 
 
-#include "class_buttongroup.h"
+#include "KvsObject_buttonGroup.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -54,25 +54,25 @@
 		Returns the button group's checked button, or 0 if no buttons are checked.
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_buttongroup,"buttongroup","object")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_buttongroup,addButton)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_buttongroup,checkedButton)
-KVSO_END_REGISTERCLASS(KviKvsObject_buttongroup)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_buttonGroup,"buttongroup","object")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_buttonGroup,addButton)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_buttonGroup,checkedButton)
+KVSO_END_REGISTERCLASS(KvsObject_buttonGroup)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_buttongroup,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_buttonGroup,KviKvsObject)
 	m_iId=0;
 	btnDict.setAutoDelete(false);
 	m_pButtonGroup=new QButtonGroup();
-KVSO_END_CONSTRUCTOR(KviKvsObject_buttongroup)
+KVSO_END_CONSTRUCTOR(KvsObject_buttonGroup)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_buttongroup)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_buttonGroup)
 btnDict.clear();
 delete m_pButtonGroup;
-KVSO_END_CONSTRUCTOR(KviKvsObject_buttongroup)
+KVSO_END_CONSTRUCTOR(KvsObject_buttonGroup)
 
 
-KVSO_CLASS_FUNCTION(buttongroup,addButton)
+KVSO_CLASS_FUNCTION(buttonGroup,addButton)
 {
 	CHECK_INTERNAL_POINTER(m_pButtonGroup)
 	KviKvsObject * pObject;
@@ -96,7 +96,7 @@ KVSO_CLASS_FUNCTION(buttongroup,addButton)
 	}
 	return true;
 }
-KVSO_CLASS_FUNCTION(buttongroup,checkedButton)
+KVSO_CLASS_FUNCTION(buttonGroup,checkedButton)
 {
 	CHECK_INTERNAL_POINTER(m_pButtonGroup)
 	int id=m_pButtonGroup->checkedId();
diff --git a/src/modules/objects/class_buttongroup.h b/src/modules/objects/KvsObject_buttonGroup.h
index c413425cf..a7d44cc91 100644
--- a/src/modules/objects/class_buttongroup.h
+++ b/src/modules/objects/KvsObject_buttonGroup.h
@@ -2,7 +2,7 @@
 #define	_CLASS_BUTTONGROUP_H_
 //=============================================================================
 //
-//   File : class_buttongroup.cpp
+//   File : KvsObject_buttonGroup.cpp
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -30,10 +30,10 @@
 #include <QButtonGroup>
 #include "object_macros.h"
 
-class KviKvsObject_buttongroup : public KviKvsObject
+class KvsObject_buttonGroup : public KviKvsObject
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_buttongroup)
+	KVSO_DECLARE_OBJECT(KvsObject_buttonGroup)
 protected:
 	QButtonGroup *m_pButtonGroup;
 	int m_iId;
diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/KvsObject_checkBox.cpp
index a4fab362b..53f11fda7 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/KvsObject_checkBox.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_checkbox.cpp
+//   File : KvsObject_checkBox.cpp
 //   Creation date : Wed 13 Sep 2000 02:42:05 CEST by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -27,7 +27,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "class_checkbox.h"
+#include "KvsObject_checkBox.h"
 
 #include <QCheckBox>
 
@@ -62,22 +62,22 @@
 
 //---------------------------------------------------------------------------------
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_checkbox,"checkbox","button")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_checkbox,setChecked)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_checkbox,isChecked)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_checkbox,toggleEvent)
-KVSO_END_REGISTERCLASS(KviKvsObject_checkbox)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_checkBox,"checkbox","button")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_checkBox,setChecked)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_checkBox,isChecked)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_checkBox,toggleEvent)
+KVSO_END_REGISTERCLASS(KvsObject_checkBox)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_checkbox,KviKvsObject_button)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_checkBox,KvsObject_button)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_checkbox)
+KVSO_END_CONSTRUCTOR(KvsObject_checkBox)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_checkbox)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_checkBox)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_checkbox)
+KVSO_END_CONSTRUCTOR(KvsObject_checkBox)
 
-bool KviKvsObject_checkbox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_checkBox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	QCheckBox  * cb = new QCheckBox(parentScriptWidget());
 	cb->setObjectName(getName().toUtf8().data());
@@ -87,14 +87,14 @@ bool KviKvsObject_checkbox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(checkbox,isChecked)
+KVSO_CLASS_FUNCTION(checkBox,isChecked)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((QCheckBox *)widget())->isChecked());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(checkbox,setChecked)
+KVSO_CLASS_FUNCTION(checkBox,setChecked)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bChecked;
@@ -105,7 +105,7 @@ KVSO_CLASS_FUNCTION(checkbox,setChecked)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(checkbox,setText)
+KVSO_CLASS_FUNCTION(checkBox,setText)
 {
         CHECK_INTERNAL_POINTER(widget())
         QString szText;
@@ -116,14 +116,14 @@ KVSO_CLASS_FUNCTION(checkbox,setText)
         return true;
 }
 
-KVSO_CLASS_FUNCTION(checkbox,toggleEvent)
+KVSO_CLASS_FUNCTION(checkBox,toggleEvent)
 {
 	emitSignal("toggled",c,c->params());
 	return true;
 }
 
 //slots
-void KviKvsObject_checkbox::toggled(bool b)
+void KvsObject_checkBox::toggled(bool b)
 {
 	KviKvsVariantList params(new KviKvsVariant(b));
 	callFunction(this,"toggleEvent",&params);
@@ -131,6 +131,6 @@ void KviKvsObject_checkbox::toggled(bool b)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_checkbox.moc"
+#include "m_KvsObject_checkBox.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_checkbox.h b/src/modules/objects/KvsObject_checkBox.h
index a983840d3..a1cc15087 100644
--- a/src/modules/objects/class_checkbox.h
+++ b/src/modules/objects/KvsObject_checkBox.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : class_checkbox.h
+//   File : KvsObject_checkBox.h
 //   Creation date : Wed 13 Sep 2000 02:42:05 CEST by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,14 +28,14 @@
 
 
 
-#include "class_button.h"
+#include "KvsObject_button.h"
 #include "object_macros.h"
 
-class KviKvsObject_checkbox : public KviKvsObject_button
+class KvsObject_checkBox : public KvsObject_button
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_checkbox)
+	KVSO_DECLARE_OBJECT(KvsObject_checkBox)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/KvsObject_comboBox.cpp
index b54689942..83dfc51ab 100644
--- a/src/modules/objects/class_combobox.cpp
+++ b/src/modules/objects/KvsObject_comboBox.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_combobox.cpp
+//   File : KvsObject_comboBox.cpp
 //   Creation date : Wed 13 Sep 2000 02:42:05 CEST by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -27,8 +27,8 @@
 #include "KviError.h"
 #include "KviLocale.h"
 #include "kvi_debug.h"
-#include "class_list.h"
-#include "class_combobox.h"
+#include "KvsObject_list.h"
+#include "KvsObject_comboBox.h"
 
 #include <QLineEdit>
 #include <QString>
@@ -98,40 +98,40 @@
 		This signal is emitted by the default implementation of [classfnc]$activatedEvent[/classfnc]().
 
 */
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_combobox,"combobox","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,insertItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,changeItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,removeItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,clear)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setMaxCount)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,maxCount)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,count)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,current)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,currentItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setEditable);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,editable)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setEditText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,textAt)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,textLineEdit)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setTextLineEdit)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setCurrentItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,popup)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,setInsertionPolicy)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,textChangedEvent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_combobox,activatedEvent)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_comboBox,"combobox","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,insertItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,changeItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,removeItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,clear)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,setMaxCount)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,maxCount)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,count)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,current)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,currentItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,setEditable);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,editable)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,setEditText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,textAt)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,textLineEdit)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,setTextLineEdit)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,setCurrentItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,popup)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,setInsertionPolicy)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,textChangedEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_comboBox,activatedEvent)
 
-KVSO_END_REGISTERCLASS(KviKvsObject_combobox)
+KVSO_END_REGISTERCLASS(KvsObject_comboBox)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_combobox,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_comboBox,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_combobox)
+KVSO_END_CONSTRUCTOR(KvsObject_comboBox)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_combobox)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_comboBox)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_combobox)
+KVSO_END_CONSTRUCTOR(KvsObject_comboBox)
 
-bool KviKvsObject_combobox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_comboBox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QComboBox);
 	connect (((QComboBox *)widget()),SIGNAL(activated( int )),this,SLOT(slotActivated( int )));
@@ -139,7 +139,7 @@ bool KviKvsObject_combobox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(combobox,insertItem)
+KVSO_CLASS_FUNCTION(comboBox,insertItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iIndex;
@@ -154,13 +154,13 @@ KVSO_CLASS_FUNCTION(combobox,insertItem)
 		((QComboBox *)widget())->insertItem( iIndex,szItem);
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,clear)
+KVSO_CLASS_FUNCTION(comboBox,clear)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QComboBox *)widget())->clear();
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,changeItem)
+KVSO_CLASS_FUNCTION(comboBox,changeItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uIndex,cnt;
@@ -180,7 +180,7 @@ KVSO_CLASS_FUNCTION(combobox,changeItem)
 	return true;
 
 }
-KVSO_CLASS_FUNCTION(combobox,removeItem)
+KVSO_CLASS_FUNCTION(comboBox,removeItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uIndex,cnt;
@@ -199,7 +199,7 @@ KVSO_CLASS_FUNCTION(combobox,removeItem)
 	return true;
 
 }
-KVSO_CLASS_FUNCTION(combobox,setMaxCount)
+KVSO_CLASS_FUNCTION(comboBox,setMaxCount)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iMax;
@@ -210,38 +210,38 @@ KVSO_CLASS_FUNCTION(combobox,setMaxCount)
 	((QComboBox *)widget())->setMaxCount(iMax);
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,maxCount)
+KVSO_CLASS_FUNCTION(comboBox,maxCount)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QComboBox *)widget())->maxCount());
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,count)
+KVSO_CLASS_FUNCTION(comboBox,count)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QComboBox *)widget())->count());
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,current)
+KVSO_CLASS_FUNCTION(comboBox,current)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setString(((QComboBox *)widget())->currentText());
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,currentItem)
+KVSO_CLASS_FUNCTION(comboBox,currentItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QComboBox *)widget())->currentIndex());
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,textLineEdit)
+KVSO_CLASS_FUNCTION(comboBox,textLineEdit)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setString(((QComboBox *)widget())->lineEdit()->text());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(combobox,setEditable)
+KVSO_CLASS_FUNCTION(comboBox,setEditable)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bFlag;
@@ -251,7 +251,7 @@ KVSO_CLASS_FUNCTION(combobox,setEditable)
 	((QComboBox *)widget())->setEditable(bFlag);
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,setTextLineEdit)
+KVSO_CLASS_FUNCTION(comboBox,setTextLineEdit)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szText;
@@ -262,13 +262,13 @@ KVSO_CLASS_FUNCTION(combobox,setTextLineEdit)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(combobox,editable)
+KVSO_CLASS_FUNCTION(comboBox,editable)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((QComboBox *)widget())->isEditable());
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,setEditText)
+KVSO_CLASS_FUNCTION(comboBox,setEditText)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szText;
@@ -281,7 +281,7 @@ KVSO_CLASS_FUNCTION(combobox,setEditText)
 	((QComboBox *)widget())->setEditText(szText);
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,textAt)
+KVSO_CLASS_FUNCTION(comboBox,textAt)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uIndex;
@@ -291,7 +291,7 @@ KVSO_CLASS_FUNCTION(combobox,textAt)
 	c->returnValue()->setString(((QComboBox *)widget())->itemText(uIndex));
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,setCurrentItem)
+KVSO_CLASS_FUNCTION(comboBox,setCurrentItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uIndex;
@@ -301,7 +301,7 @@ KVSO_CLASS_FUNCTION(combobox,setCurrentItem)
 	((QComboBox *)widget())->setCurrentIndex(uIndex);
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,popup)
+KVSO_CLASS_FUNCTION(comboBox,popup)
 {
 	Q_UNUSED(c);
 
@@ -309,7 +309,7 @@ KVSO_CLASS_FUNCTION(combobox,popup)
 	   ((QComboBox *)widget())->showPopup();
 	return true;
 }
-KVSO_CLASS_FUNCTION(combobox,setInsertionPolicy)
+KVSO_CLASS_FUNCTION(comboBox,setInsertionPolicy)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szPolicy;
@@ -332,7 +332,7 @@ KVSO_CLASS_FUNCTION(combobox,setInsertionPolicy)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(combobox,textChangedEvent)
+KVSO_CLASS_FUNCTION(comboBox,textChangedEvent)
 {
 	emitSignal("textChanged",c,c->params());
 	return true;
@@ -340,20 +340,20 @@ KVSO_CLASS_FUNCTION(combobox,textChangedEvent)
 
 
 
-KVSO_CLASS_FUNCTION(combobox,activatedEvent)
+KVSO_CLASS_FUNCTION(comboBox,activatedEvent)
 {
 	emitSignal("activated",c,c->params());
 	return true;
 }
 
 //slots
-void KviKvsObject_combobox::editTextChanged(const QString &text)
+void KvsObject_comboBox::editTextChanged(const QString &text)
 {
 	KviKvsVariantList params(new KviKvsVariant(text));
 	callFunction(this,"textChangedEvent",&params);
 }
 
-void KviKvsObject_combobox::slotActivated(int i)
+void KvsObject_comboBox::slotActivated(int i)
 {
         KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i));
 	callFunction(this,"activatedEvent",&params);
@@ -361,6 +361,6 @@ void KviKvsObject_combobox::slotActivated(int i)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_combobox.moc"
+#include "m_KvsObject_comboBox.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_combobox.h b/src/modules/objects/KvsObject_comboBox.h
index 85ff6b4dd..a10ac6c29 100644
--- a/src/modules/objects/class_combobox.h
+++ b/src/modules/objects/KvsObject_comboBox.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : class_combobox.h
+//   File : KvsObject_comboBox.h
 //   Creation date : Wed 13 Sep 2000 02:42:05 CEST by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,14 +28,14 @@
 
 
 #include <qcombobox.h>
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_combobox : public KviKvsObject_widget
+class KvsObject_comboBox : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_combobox)
+	KVSO_DECLARE_OBJECT(KvsObject_comboBox)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_datetimeedit.cpp b/src/modules/objects/KvsObject_dateTimeEdit.cpp
index ee87d85d3..e992d69d7 100644
--- a/src/modules/objects/class_datetimeedit.cpp
+++ b/src/modules/objects/KvsObject_dateTimeEdit.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_datetimeedit.cpp
+//   File : KvsObject_dateTimeEdit.cpp
 //   Creation date : Wed 30 Gen 2009 09:30:05 CEST by Carbone Alessandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,8 +28,8 @@
 #include "KviIconManager.h"
 #include "KviFile.h"
 
-#include "class_datetimeedit.h"
-#include "class_pixmap.h"
+#include "KvsObject_dateTimeEdit.h"
+#include "KvsObject_pixmap.h"
 
  #include <QDateTimeEdit>
 
@@ -77,25 +77,25 @@
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_datetimeedit,"datetimeedit","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_dateTimeEdit,"datetimeedit","widget")
 
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,date)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,setDate)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,setTime)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_datetimeedit,time)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_dateTimeEdit,date)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_dateTimeEdit,setDate)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_dateTimeEdit,setTime)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_dateTimeEdit,time)
 
-KVSO_END_REGISTERCLASS(KviKvsObject_datetimeedit)
+KVSO_END_REGISTERCLASS(KvsObject_dateTimeEdit)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_datetimeedit,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_dateTimeEdit,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_datetimeedit)
+KVSO_END_CONSTRUCTOR(KvsObject_dateTimeEdit)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_datetimeedit)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_dateTimeEdit)
 
-KVSO_END_DESTRUCTOR(KviKvsObject_datetimeedit)
+KVSO_END_DESTRUCTOR(KvsObject_dateTimeEdit)
 
-bool KviKvsObject_datetimeedit::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_dateTimeEdit::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
         QDateTimeEdit *obj=new QDateTimeEdit(QDate::currentDate(),parentScriptWidget());
         obj->setObjectName(getName());
@@ -103,7 +103,7 @@ bool KviKvsObject_datetimeedit::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(datetimeedit,date)
+KVSO_CLASS_FUNCTION(dateTimeEdit,date)
 {
 
         CHECK_INTERNAL_POINTER(widget())
@@ -116,7 +116,7 @@ KVSO_CLASS_FUNCTION(datetimeedit,date)
 
         return true;
 }
-KVSO_CLASS_FUNCTION(datetimeedit,setDate)
+KVSO_CLASS_FUNCTION(dateTimeEdit,setDate)
 {
 
         CHECK_INTERNAL_POINTER(widget())
@@ -130,7 +130,7 @@ KVSO_CLASS_FUNCTION(datetimeedit,setDate)
         ((QDateTimeEdit *)widget())->setDate(date);
         return true;
 }
-KVSO_CLASS_FUNCTION(datetimeedit,time)
+KVSO_CLASS_FUNCTION(dateTimeEdit,time)
 {
 
         CHECK_INTERNAL_POINTER(widget())
@@ -143,7 +143,7 @@ KVSO_CLASS_FUNCTION(datetimeedit,time)
 
         return true;
 }
-KVSO_CLASS_FUNCTION(datetimeedit,setTime)
+KVSO_CLASS_FUNCTION(dateTimeEdit,setTime)
 {
 
         CHECK_INTERNAL_POINTER(widget())
@@ -158,5 +158,5 @@ KVSO_CLASS_FUNCTION(datetimeedit,setTime)
         return true;
 }
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_datetimeedit.moc"
+#include "m_KvsObject_dateTimeEdit.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_datetimeedit.h b/src/modules/objects/KvsObject_dateTimeEdit.h
index 24fc43397..fc2963a8f 100644
--- a/src/modules/objects/class_datetimeedit.h
+++ b/src/modules/objects/KvsObject_dateTimeEdit.h
@@ -2,7 +2,7 @@
 #define _CLASS_datetimeedit_H_
 //=============================================================================
 //
-//   File : class_datetimeedit.h
+//   File : KvsObject_dateTimeEdit.h
 //   Creation date : Wed 30 Gen 2009 09:30:05 CEST by Carbone Alessandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -26,14 +26,14 @@
 
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_datetimeedit : public KviKvsObject_widget
+class KvsObject_dateTimeEdit : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-        KVSO_DECLARE_OBJECT(KviKvsObject_datetimeedit)
+        KVSO_DECLARE_OBJECT(KvsObject_dateTimeEdit)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/KvsObject_dialog.cpp
index dabcf0904..85835cac0 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/KvsObject_dialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_dialog.cpp
+//   File : KvsObject_dialog.cpp
 //   Creation date : Sun Apr 10 22:51:48 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "class_dialog.h"
+#include "KvsObject_dialog.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -54,20 +54,20 @@
 	@functions:
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_dialog,"dialog","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_dialog,setModal)
-KVSO_END_REGISTERCLASS(KviKvsObject_dialog)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_dialog,"dialog","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_dialog,setModal)
+KVSO_END_REGISTERCLASS(KvsObject_dialog)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_dialog,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_dialog,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_dialog)
+KVSO_END_CONSTRUCTOR(KvsObject_dialog)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_dialog)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_dialog)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_dialog)
+KVSO_END_CONSTRUCTOR(KvsObject_dialog)
 
-bool KviKvsObject_dialog::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_dialog::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	QWidget * w = g_pApp->activeModalWidget();
 	if(!w)w = g_pFrame;
diff --git a/src/modules/objects/class_dialog.h b/src/modules/objects/KvsObject_dialog.h
index 20f12dda7..602de8756 100644
--- a/src/modules/objects/class_dialog.h
+++ b/src/modules/objects/KvsObject_dialog.h
@@ -2,7 +2,7 @@
 #define _CLASS_DIALOG_H_
 //=============================================================================
 //
-//   File : class_dialog.h
+//   File : KvsObject_dialog.h
 //   Creation date : Sun Apr 10 22:51:48 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,14 +24,14 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_dialog : public KviKvsObject_widget
+class KvsObject_dialog : public KvsObject_widget
 {
 
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_dialog)
+	KVSO_DECLARE_OBJECT(KvsObject_dialog)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/KvsObject_dockWindow.cpp
index bce939af9..8a9eb15a7 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/KvsObject_dockWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_dockwindow.cpp
+//   File : KvsObject_dockWindow.cpp
 //   Creation date : Thu 29 Dec 2005 23:45:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "class_dockwindow.h"
+#include "KvsObject_dockWindow.h"
 
 #include "KviMainWindow.h"
 #include "KviLocale.h"
@@ -59,23 +59,23 @@
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_dockwindow,"dockwindow","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_dockwindow,addWidget)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_dockwindow,setAllowedDockAreas)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_dockwindow,dock)
-KVSO_END_REGISTERCLASS(KviKvsObject_dockwindow)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_dockWindow,"dockwindow","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_dockWindow,addWidget)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_dockWindow,setAllowedDockAreas)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_dockWindow,dock)
+KVSO_END_REGISTERCLASS(KvsObject_dockWindow)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_dockwindow,KviKvsObject_widget)
-KVSO_END_CONSTRUCTOR(KviKvsObject_dockwindow)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_dockWindow,KvsObject_widget)
+KVSO_END_CONSTRUCTOR(KvsObject_dockWindow)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_dockwindow)
-KVSO_END_DESTRUCTOR(KviKvsObject_dockwindow)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_dockWindow)
+KVSO_END_DESTRUCTOR(KvsObject_dockWindow)
 
 #define _pDockWindow ((QDockWidget *)widget())
 
-bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_dockWindow::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	QDockWidget * pWidget = new QDockWidget(g_pFrame);
 	pWidget->setObjectName(getName());
@@ -83,7 +83,7 @@ bool KviKvsObject_dockwindow::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(dockwindow,addWidget)
+KVSO_CLASS_FUNCTION(dockWindow,addWidget)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_hobject_t hWidget;
@@ -126,7 +126,7 @@ KVSO_CLASS_FUNCTION(dockwindow,addWidget)
 }
 
 
-KVSO_CLASS_FUNCTION(dockwindow,setAllowedDockAreas)
+KVSO_CLASS_FUNCTION(dockWindow,setAllowedDockAreas)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szFlags;
@@ -156,7 +156,7 @@ KVSO_CLASS_FUNCTION(dockwindow,setAllowedDockAreas)
 }
 
 
-KVSO_CLASS_FUNCTION(dockwindow,dock)
+KVSO_CLASS_FUNCTION(dockWindow,dock)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szDock;
@@ -176,6 +176,6 @@ KVSO_CLASS_FUNCTION(dockwindow,dock)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_dockwindow.moc"
+#include "m_KvsObject_dockWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_dockwindow.h b/src/modules/objects/KvsObject_dockWindow.h
index f194e4a56..df6a4a6e1 100644
--- a/src/modules/objects/class_dockwindow.h
+++ b/src/modules/objects/KvsObject_dockWindow.h
@@ -2,7 +2,7 @@
 #define _CLASS_DOCKWINDOW_H_
 //=============================================================================
 //
-//   File : class_dockwindow.h
+//   File : KvsObject_dockWindow.h
 //   Creation date : Thu 29 Dec 2005 23:45:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -26,13 +26,13 @@
 
 #include "kvi_settings.h"
 #include "object_macros.h"
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 
-class KviKvsObject_dockwindow : public KviKvsObject_widget
+class KvsObject_dockWindow : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_dockwindow)
+	KVSO_DECLARE_OBJECT(KvsObject_dockWindow)
 protected:
 	virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams);
 
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/KvsObject_file.cpp
index 273c29e29..909b1c552 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/KvsObject_file.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_file.cpp
+//   File : KvsObject_file.cpp
 //   Creation date : Fri Mar 18 21:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -24,13 +24,13 @@
 //=============================================================================
 
 
-#include "class_file.h"
+#include "KvsObject_file.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
 #include "KviError.h"
 #include "KviFile.h"
 #include "KviFileUtils.h"
-#include "class_memorybuffer.h"
+#include "KvsObject_memoryBuffer.h"
 
 #include <QStringList>
 //#include <QFile>
@@ -150,53 +150,53 @@ const QIODevice::OpenMode mod_cod[] = {
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_file,"file","object")
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"setName",setName)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"name",name)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_file,"file","object")
+	KVSO_REGISTER_HANDLER(KvsObject_file,"setName",setName)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"name",name)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"open",open)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"isOpen",isOpen)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"close",close)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"flush",flush)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"open",open)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"isOpen",isOpen)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"close",close)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"flush",flush)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"size",size)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"resize",resize)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"size",size)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"resize",resize)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"atEnd",atEnd)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"where",where)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"seek",seek)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"atEnd",atEnd)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"where",where)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"seek",seek)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"putch",putch)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"getch",getch)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"ungetch",unGetch)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"readByte",readByte)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"putch",putch)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"getch",getch)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"ungetch",unGetch)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"readByte",readByte)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"readBlock",readBlock)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"writeBlock", writeBlock)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"readBlock",readBlock)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"writeBlock", writeBlock)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"readHexBlock",readHexBlock)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"writeHexBlock",writeHexBlock)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"readHexBlock",readHexBlock)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"writeHexBlock",writeHexBlock)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"readLine",readLine)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"writeLine",writeLine)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"readLine",readLine)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"writeLine",writeLine)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"write",write)
-	KVSO_REGISTER_HANDLER(KviKvsObject_file,"read",read)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"write",write)
+	KVSO_REGISTER_HANDLER(KvsObject_file,"read",read)
 
 
-KVSO_END_REGISTERCLASS(KviKvsObject_file)
+KVSO_END_REGISTERCLASS(KvsObject_file)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_file,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_file,KvsObject_widget)
 	m_pFile = new KviFile();
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_file)
+KVSO_END_CONSTRUCTOR(KvsObject_file)
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_file)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_file)
 
 	if (m_pFile) delete m_pFile;
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_file)
+KVSO_END_CONSTRUCTOR(KvsObject_file)
 
 KVSO_CLASS_FUNCTION(file,setName)
 {
@@ -401,7 +401,7 @@ KVSO_CLASS_FUNCTION(file,readBlock)
 			return true;
 		}
 		//m_pFile->flush();
-		((KviKvsObject_memorybuffer *)pObject)->pBuffer()->append(m_pFile->read(uLen));
+		((KvsObject_memoryBuffer *)pObject)->pBuffer()->append(m_pFile->read(uLen));
 		return true;
 	}
 	else
@@ -519,14 +519,14 @@ KVSO_CLASS_FUNCTION(file,writeBlock)
 			{
 				if (!uLen)
 				{
-					if (((KviKvsObject_memorybuffer *)pObject)->pBuffer()->size())
-						uLen=((KviKvsObject_memorybuffer *)pObject)->pBuffer()->size();
+					if (((KvsObject_memoryBuffer *)pObject)->pBuffer()->size())
+						uLen=((KvsObject_memoryBuffer *)pObject)->pBuffer()->size();
 					else
 					{
 						c->warning(__tr2qs_ctx("The memoryBuffer object is empty: nothing will be saved","objects"));
 					}
 				}
-				const char *pData=((KviKvsObject_memorybuffer *)pObject)->pBuffer()->data();
+				const char *pData=((KvsObject_memoryBuffer *)pObject)->pBuffer()->data();
 				int rlen=m_pFile->write(pData,uLen);
 				c->returnValue()->setInteger(rlen);
 				//m_pFile->flush();
diff --git a/src/modules/objects/class_file.h b/src/modules/objects/KvsObject_file.h
index cc1c00e5b..b226c10b0 100644
--- a/src/modules/objects/class_file.h
+++ b/src/modules/objects/KvsObject_file.h
@@ -2,7 +2,7 @@
 #define _CLASS_FILE_H_
 //=============================================================================
 //
-//   File : class_memorybuffer.h
+//   File : KvsObject_memoryBuffer.h
 //   Creation date : Fri Mar 18 21:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -26,14 +26,14 @@
 //=============================================================================
 
 #include "object_macros.h"
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "KviFile.h"
 
 
-class KviKvsObject_file : public KviKvsObject_widget
+class KvsObject_file : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_file)
+	KVSO_DECLARE_OBJECT(KvsObject_file)
 protected:
 	KviFile * m_pFile;
 public:
diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp
index fc9cdf11a..9face909f 100644
--- a/src/modules/objects/class_ftp.cpp
+++ b/src/modules/objects/KvsObject_ftp.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_ftp.cpp
+//   File : KvsObject_ftp.cpp
 //   Creation date : Mon Sep 1 08:13:45 2008 GMT by Carbone Alesssandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 
 #include "kvi_debug.h"
 #include "KviError.h"
-#include "class_ftp.h"
+#include "KvsObject_ftp.h"
 #include "KviLocale.h"
 
 #include <QFtp>
@@ -83,23 +83,23 @@
 		This signal is emitted by the default implementation of [classfnc]$dataTransferProgressEvent[/classfnc]()
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_ftp,"ftp","object")
-	KVSO_REGISTER_HANDLER(KviKvsObject_ftp,"connect",functionConnect)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,abort)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,close)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,close)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,login)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,get)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,cd)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,list)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,commandFinishedEvent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,listInfoEvent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,stateChangedEvent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_ftp,dataTransferProgressEvent)
-KVSO_END_REGISTERCLASS(KviKvsObject_ftp)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_ftp,"ftp","object")
+	KVSO_REGISTER_HANDLER(KvsObject_ftp,"connect",functionConnect)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_ftp,abort)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_ftp,close)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_ftp,close)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_ftp,login)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_ftp,get)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_ftp,cd)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_ftp,list)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_ftp,commandFinishedEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_ftp,listInfoEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_ftp,stateChangedEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_ftp,dataTransferProgressEvent)
+KVSO_END_REGISTERCLASS(KvsObject_ftp)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_ftp,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_ftp,KviKvsObject)
 	m_pFtp = new QFtp();
         m_bAbort=false;
 	connect(m_pFtp,SIGNAL(commandFinished(int,bool)),this,SLOT(slotCommandFinished(int,bool)));
@@ -109,9 +109,9 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_ftp,KviKvsObject)
 	connect(m_pFtp,SIGNAL(listInfo(const QUrlInfo)),this,SLOT(slotListInfo(const QUrlInfo)));
 	connect(m_pFtp,SIGNAL(readyRead()),this,SLOT(slotReadyRead()));
 	connect(m_pFtp,SIGNAL(stateChanged(int)),this,SLOT(slotStateChanged(int)));
-KVSO_END_CONSTRUCTOR(KviKvsObject_ftp)
+KVSO_END_CONSTRUCTOR(KvsObject_ftp)
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_ftp)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_ftp)
 	QHashIterator<int,QFile *> t(getDict);
 	while (t.hasNext())
 	{
@@ -123,7 +123,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_ftp)
 	}
 	getDict.clear();
 	delete m_pFtp;
-KVSO_END_DESTRUCTOR(KviKvsObject_ftp)
+KVSO_END_DESTRUCTOR(KvsObject_ftp)
 //----------------------
 
 
@@ -222,7 +222,7 @@ KVSO_CLASS_FUNCTION(ftp,commandFinishedEvent)
 	return true;
 }
 
-void KviKvsObject_ftp::slotCommandFinished ( int id, bool error )
+void KvsObject_ftp::slotCommandFinished ( int id, bool error )
 {
 	QString status="";
 	if (m_bAbort)
@@ -259,11 +259,11 @@ void KviKvsObject_ftp::slotCommandFinished ( int id, bool error )
 	callFunction(this,"commandFinishedEvent",0,&lParams);
 }
 
-void KviKvsObject_ftp::slotCommandStarted ( int )
+void KvsObject_ftp::slotCommandStarted ( int )
 {
 }
 
-void KviKvsObject_ftp::slotDataTransferProgress ( qint64 done, qint64 total )
+void KvsObject_ftp::slotDataTransferProgress ( qint64 done, qint64 total )
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t) done));
@@ -277,11 +277,11 @@ KVSO_CLASS_FUNCTION(ftp,dataTransferProgressEvent)
 	return true;
 }
 
-void KviKvsObject_ftp::slotDone ( bool )
+void KvsObject_ftp::slotDone ( bool )
 {
 }
 
-void KviKvsObject_ftp::slotListInfo ( const QUrlInfo & i )
+void KvsObject_ftp::slotListInfo ( const QUrlInfo & i )
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(i.name()));
@@ -294,15 +294,15 @@ KVSO_CLASS_FUNCTION(ftp,listInfoEvent)
 	return true;
 }
 
-void KviKvsObject_ftp::slotReadyRead ()
+void KvsObject_ftp::slotReadyRead ()
 {
 }
 
-void KviKvsObject_ftp::slotRawCommandReply (int, const QString & )
+void KvsObject_ftp::slotRawCommandReply (int, const QString & )
 {
 }
 
-void KviKvsObject_ftp::slotStateChanged (int state)
+void KvsObject_ftp::slotStateChanged (int state)
 {
 	QString szState="";
 	if (state==QFtp::Unconnected) szState="Unconnected";
@@ -323,5 +323,5 @@ KVSO_CLASS_FUNCTION(ftp,stateChangedEvent)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_ftp.moc"
+#include "m_KvsObject_ftp.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_ftp.h b/src/modules/objects/KvsObject_ftp.h
index 9cc6f35bd..c50942fd1 100644
--- a/src/modules/objects/class_ftp.h
+++ b/src/modules/objects/KvsObject_ftp.h
@@ -2,7 +2,7 @@
 #define _CLASS_FTP_H_
 //=============================================================================
 //
-//   File : class_ftp.h
+//   File : KvsObject_ftp.h
 //   Creation date : Mon Sep 1 08:13:45 2008 GMT by Carbone Alesssandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,11 +30,11 @@
 #include <QHash>
 #include <QFile>
 
-class KviKvsObject_ftp : public KviKvsObject
+class KvsObject_ftp : public KviKvsObject
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_ftp)
+	KVSO_DECLARE_OBJECT(KvsObject_ftp)
 protected:
 	QFtp *m_pFtp;
 	QHash<int, QFile*> getDict;
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/KvsObject_groupBox.cpp
index fbef4fad5..03042d795 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/KvsObject_groupBox.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_groupbox.cpp
+//   File : KvsObject_groupBox.cpp
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -24,7 +24,7 @@
 //=============================================================================
 
 #include <KviTalGroupBox.h>
-#include "class_groupbox.h"
+#include "KvsObject_groupBox.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 
@@ -134,36 +134,36 @@ const int align_cod[] = {
 
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_groupbox,"groupbox","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setTitle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,title)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setFlat)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,isFlat)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setCheckable)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,isCheckable)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setInsideMargin)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,insideMargin)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setInsideSpacing)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,insideSpacing)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,addSpace)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,alignment)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setAlignment)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setOrientation)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,isChecked)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_groupbox,setChecked)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_groupBox,"groupbox","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,setTitle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,title)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,setFlat)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,isFlat)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,setCheckable)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,isCheckable)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,setInsideMargin)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,insideMargin)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,setInsideSpacing)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,insideSpacing)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,addSpace)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,alignment)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,setAlignment)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,setOrientation)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,isChecked)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_groupBox,setChecked)
 
-KVSO_END_REGISTERCLASS(KviKvsObject_groupbox)
+KVSO_END_REGISTERCLASS(KvsObject_groupBox)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_groupbox,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_groupBox,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_groupbox)
+KVSO_END_CONSTRUCTOR(KvsObject_groupBox)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_groupbox)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_groupBox)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_groupbox)
+KVSO_END_CONSTRUCTOR(KvsObject_groupBox)
 
-bool KviKvsObject_groupbox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_groupBox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	KviTalGroupBox *groupbox=new KviTalGroupBox(getName(),parentScriptWidget());
 
@@ -173,7 +173,7 @@ bool KviKvsObject_groupbox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(groupbox,setTitle)
+KVSO_CLASS_FUNCTION(groupBox,setTitle)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szTitle;
@@ -183,13 +183,13 @@ KVSO_CLASS_FUNCTION(groupbox,setTitle)
 	((KviTalGroupBox *)widget())->setTitle(szTitle);
 	return true;
 }
-KVSO_CLASS_FUNCTION(groupbox,title)
+KVSO_CLASS_FUNCTION(groupBox,title)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setString(((KviTalGroupBox *)widget())->title());
 	return true;
 }
-KVSO_CLASS_FUNCTION(groupbox,setFlat)
+KVSO_CLASS_FUNCTION(groupBox,setFlat)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
@@ -199,13 +199,13 @@ KVSO_CLASS_FUNCTION(groupbox,setFlat)
 	((KviTalGroupBox *)widget())->setFlat(bEnabled);
 	return true;
 }
-KVSO_CLASS_FUNCTION(groupbox,isFlat)
+KVSO_CLASS_FUNCTION(groupBox,isFlat)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isFlat());
 	return true;
 }
-KVSO_CLASS_FUNCTION(groupbox,setCheckable)
+KVSO_CLASS_FUNCTION(groupBox,setCheckable)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
@@ -215,13 +215,13 @@ KVSO_CLASS_FUNCTION(groupbox,setCheckable)
 	((KviTalGroupBox *)widget())->setCheckable(bEnabled);
 	return true;
 }
-KVSO_CLASS_FUNCTION(groupbox,isCheckable)
+KVSO_CLASS_FUNCTION(groupBox,isCheckable)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isCheckable());
 	return true;
 }
-KVSO_CLASS_FUNCTION(groupbox,setChecked)
+KVSO_CLASS_FUNCTION(groupBox,setChecked)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
@@ -231,13 +231,13 @@ KVSO_CLASS_FUNCTION(groupbox,setChecked)
 	((KviTalGroupBox *)widget())->setChecked(bEnabled);
 	return true;
 }
-KVSO_CLASS_FUNCTION(groupbox,isChecked)
+KVSO_CLASS_FUNCTION(groupBox,isChecked)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((KviTalGroupBox *)widget())->isChecked());
 	return true;
 }
-KVSO_CLASS_FUNCTION(groupbox,setInsideMargin)
+KVSO_CLASS_FUNCTION(groupBox,setInsideMargin)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uMargin;
@@ -247,13 +247,13 @@ KVSO_CLASS_FUNCTION(groupbox,setInsideMargin)
 	((KviTalGroupBox *)widget())->setInsideMargin(uMargin);
 	return true;
 }
-KVSO_CLASS_FUNCTION(groupbox,insideMargin)
+KVSO_CLASS_FUNCTION(groupBox,insideMargin)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((KviTalGroupBox *)widget())->insideMargin());
 	return true;
 }
-KVSO_CLASS_FUNCTION(groupbox,setInsideSpacing)
+KVSO_CLASS_FUNCTION(groupBox,setInsideSpacing)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uSpacing;
@@ -263,14 +263,14 @@ KVSO_CLASS_FUNCTION(groupbox,setInsideSpacing)
     ((KviTalGroupBox *)widget())->setInsideSpacing(uSpacing);
 	return true;
 }
-KVSO_CLASS_FUNCTION(groupbox,insideSpacing)
+KVSO_CLASS_FUNCTION(groupBox,insideSpacing)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((KviTalGroupBox *)widget())->insideSpacing());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(groupbox,addSpace)
+KVSO_CLASS_FUNCTION(groupBox,addSpace)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iSpace;
@@ -281,7 +281,7 @@ KVSO_CLASS_FUNCTION(groupbox,addSpace)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(groupbox,setAlignment)
+KVSO_CLASS_FUNCTION(groupBox,setAlignment)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szAlign;
@@ -300,7 +300,7 @@ KVSO_CLASS_FUNCTION(groupbox,setAlignment)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(groupbox,alignment)
+KVSO_CLASS_FUNCTION(groupBox,alignment)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	int mode = ((KviTalGroupBox *)widget())->alignment();
@@ -317,7 +317,7 @@ KVSO_CLASS_FUNCTION(groupbox,alignment)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(groupbox,setOrientation)
+KVSO_CLASS_FUNCTION(groupBox,setOrientation)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szMode;
diff --git a/src/modules/objects/class_groupbox.h b/src/modules/objects/KvsObject_groupBox.h
index a4412ba9b..4770352a9 100644
--- a/src/modules/objects/class_groupbox.h
+++ b/src/modules/objects/KvsObject_groupBox.h
@@ -2,7 +2,7 @@
 #define _CLASS_GROUPBOX_H_
 //=============================================================================
 //
-//   File : class_groupbox.cpp
+//   File : KvsObject_groupBox.cpp
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -28,13 +28,13 @@
 
 
 #include <KviTalGroupBox.h>
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_groupbox : public KviKvsObject_widget
+class KvsObject_groupBox : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_groupbox)
+	KVSO_DECLARE_OBJECT(KvsObject_groupBox)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/KvsObject_hBox.cpp
index 1f5a44278..c9c5b53fb 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/KvsObject_hBox.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_hbox.cpp
+//   File : KvsObject_hBox.cpp
 //   Creation date : Wed Mar 01 2005 23:00:01 by Alessandro Carbone & Tonino Imbesi
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,7 +25,7 @@
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "class_hbox.h"
+#include "KvsObject_hBox.h"
 #include "KviTalHBox.h"
 
 const char * const align_tbl[] = {
@@ -83,31 +83,31 @@ const int align_cod[] = {
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_hbox,"hbox","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_hbox,setMargin)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_hbox,setSpacing)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_hbox,setStretchFactor )
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_hbox,addStretch )
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_hbox,setAlignment )
-KVSO_END_REGISTERCLASS(KviKvsObject_hbox)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_hBox,"hbox","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_hBox,setMargin)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_hBox,setSpacing)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_hBox,setStretchFactor )
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_hBox,addStretch )
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_hBox,setAlignment )
+KVSO_END_REGISTERCLASS(KvsObject_hBox)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_hbox,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_hBox,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_hbox)
+KVSO_END_CONSTRUCTOR(KvsObject_hBox)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_hbox)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_hBox)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_hbox)
+KVSO_END_CONSTRUCTOR(KvsObject_hBox)
 
-bool KviKvsObject_hbox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_hBox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 
 	setObject(new KviTalHBox(parentScriptWidget()), true);
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(hbox,setMargin)
+KVSO_CLASS_FUNCTION(hBox,setMargin)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uMargin;
@@ -118,7 +118,7 @@ KVSO_CLASS_FUNCTION(hbox,setMargin)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(hbox,setSpacing)
+KVSO_CLASS_FUNCTION(hBox,setSpacing)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uSpacing;
@@ -129,7 +129,7 @@ KVSO_CLASS_FUNCTION(hbox,setSpacing)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(hbox,setStretchFactor)
+KVSO_CLASS_FUNCTION(hBox,setStretchFactor)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject * pObject;
@@ -141,7 +141,7 @@ KVSO_CLASS_FUNCTION(hbox,setStretchFactor)
 	KVSO_PARAMETERS_END(c)
 	pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 	CHECK_HOBJECT_IS_WIDGET(pObject)
-	if(((KviKvsObject_widget *)pObject)->widget()->parentWidget() != widget())
+	if(((KvsObject_widget *)pObject)->widget()->parentWidget() != widget())
 	{
 		c->warning(__tr2qs_ctx("The widget must be a child of this hbox","objects"));
 		return true;
@@ -150,7 +150,7 @@ KVSO_CLASS_FUNCTION(hbox,setStretchFactor)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(hbox,addStretch)
+KVSO_CLASS_FUNCTION(hBox,addStretch)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iStretch;
@@ -161,7 +161,7 @@ KVSO_CLASS_FUNCTION(hbox,addStretch)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(hbox,setAlignment)
+KVSO_CLASS_FUNCTION(hBox,setAlignment)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QStringList alignment;
@@ -173,7 +173,7 @@ KVSO_CLASS_FUNCTION(hbox,setAlignment)
 	KVSO_PARAMETERS_END(c)
 	pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 	CHECK_HOBJECT_IS_WIDGET(pObject)
-	if(((KviKvsObject_widget *)pObject)->widget()->parentWidget() != widget())
+	if(((KvsObject_widget *)pObject)->widget()->parentWidget() != widget())
 	{
 		c->warning(__tr2qs_ctx("The widget must be a child of this hbox","objects"));
 		return true;
diff --git a/src/modules/objects/class_hbox.h b/src/modules/objects/KvsObject_hBox.h
index 6be6f5e2d..29e9a75c0 100644
--- a/src/modules/objects/class_hbox.h
+++ b/src/modules/objects/KvsObject_hBox.h
@@ -2,7 +2,7 @@
 #define _CLASS_HBOX_H_
 //=============================================================================
 //
-//   File : class_hbox.h
+//   File : KvsObject_hBox.h
 //   Creation date : Wed Mar 01 2005 23:00:01 by Alessandro Carbone & Tonino Imbesi
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,12 +25,12 @@
 //=============================================================================
 
 #include "object_macros.h"
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 
-class KviKvsObject_hbox : public KviKvsObject_widget
+class KvsObject_hBox : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_hbox)
+	KVSO_DECLARE_OBJECT(KvsObject_hBox)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_http.cpp b/src/modules/objects/KvsObject_http.cpp
index 7d68c07f8..c0adda535 100644
--- a/src/modules/objects/class_http.cpp
+++ b/src/modules/objects/KvsObject_http.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_http.cpp
+//   File : KvsObject_http.cpp
 //   Creation date : Fry Sep 5 18:13:45 2008 GMT by Carbone Alesssandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "class_http.h"
+#include "KvsObject_http.h"
 
 #include "kvi_debug.h"
 #include "KviError.h"
@@ -149,35 +149,35 @@
 		This signal is emitted by the default implementation of [classfnc]$responseHeaderReceivedEvent[/classfnc].
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_http,"http","object")
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"get",functionGet)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"post",functionPost)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"abort",functionAbort)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"setHost",functionSetHost)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"setProxy",functionSetProxy)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"currentId",functionCurrentId)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"setUser",functionSetUser)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"readAll",functionReadAll)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"errorString",functionErrorString)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"setFollowRedirect",functionFollowRedirect)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_http,"http","object")
+	KVSO_REGISTER_HANDLER(KvsObject_http,"get",functionGet)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"post",functionPost)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"abort",functionAbort)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"setHost",functionSetHost)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"setProxy",functionSetProxy)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"currentId",functionCurrentId)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"setUser",functionSetUser)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"readAll",functionReadAll)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"errorString",functionErrorString)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"setFollowRedirect",functionFollowRedirect)
 
 	// events
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"doneEvent",functionDoneEvent)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"requestFinishedEvent",functionRequestFinishedEvent)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"requestStartedEvent",functionRequestStartedEvent)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"responseHeaderReceivedEvent",functionResponseHeaderReceivedEvent)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"dataReadProgressEvent",functionDataReadProgressEvent)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"dataSendProgressEvent",functionDataSendProgressEvent)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"stateChangedEvent",functionStateChangedEvent)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"readyReadEvent",functionReadyReadEvent)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"doneEvent",functionDoneEvent)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"requestFinishedEvent",functionRequestFinishedEvent)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"requestStartedEvent",functionRequestStartedEvent)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"responseHeaderReceivedEvent",functionResponseHeaderReceivedEvent)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"dataReadProgressEvent",functionDataReadProgressEvent)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"dataSendProgressEvent",functionDataSendProgressEvent)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"stateChangedEvent",functionStateChangedEvent)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"readyReadEvent",functionReadyReadEvent)
 	#ifndef QT_NO_OPENSSL
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"sslErrorsEvent",functionSslErrorsEvent)
-	KVSO_REGISTER_HANDLER(KviKvsObject_http,"ignoreSSlErrors",functionIgnoreSslErrors)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"sslErrorsEvent",functionSslErrorsEvent)
+	KVSO_REGISTER_HANDLER(KvsObject_http,"ignoreSSlErrors",functionIgnoreSslErrors)
 	#endif
-KVSO_END_REGISTERCLASS(KviKvsObject_http)
+KVSO_END_REGISTERCLASS(KvsObject_http)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_http,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_http,KviKvsObject)
 	m_pHttp = new QHttp();
 	m_bAbort=false;
 	m_bEnableForceRedirect=false;
@@ -194,9 +194,9 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_http,KviKvsObject)
 	#endif
 	connect(m_pHttp,SIGNAL(stateChanged(int)),this,SLOT(slotStateChanged(int)));
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_http)
+KVSO_END_CONSTRUCTOR(KvsObject_http)
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_http)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_http)
 	QHashIterator<int,QFile *> t(getDict);
         while (t.hasNext())
         {
@@ -209,11 +209,11 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_http)
         getDict.clear();
 	delete m_pHttp;
 
-KVSO_END_DESTRUCTOR(KviKvsObject_http)
+KVSO_END_DESTRUCTOR(KvsObject_http)
 //----------------------
 
 
-bool  KviKvsObject_http::functionSetHost(KviKvsObjectFunctionCall *c)
+bool  KvsObject_http::functionSetHost(KviKvsObjectFunctionCall *c)
 {
 	CHECK_INTERNAL_POINTER(m_pHttp)
 	QString szHost;
@@ -240,13 +240,13 @@ bool  KviKvsObject_http::functionSetHost(KviKvsObjectFunctionCall *c)
 	c->returnValue()->setInteger(id);
 	return true;
 }
-bool  KviKvsObject_http::functionCurrentId(KviKvsObjectFunctionCall *c)
+bool  KvsObject_http::functionCurrentId(KviKvsObjectFunctionCall *c)
 {
 	CHECK_INTERNAL_POINTER(m_pHttp)
 	c->returnValue()->setInteger(m_pHttp->currentId());
 	return true;
 }
-bool  KviKvsObject_http::functionSetUser(KviKvsObjectFunctionCall *c)
+bool  KvsObject_http::functionSetUser(KviKvsObjectFunctionCall *c)
 {
 	CHECK_INTERNAL_POINTER(m_pHttp)
 	QString szUser;
@@ -259,7 +259,7 @@ bool  KviKvsObject_http::functionSetUser(KviKvsObjectFunctionCall *c)
 	id=m_pHttp->setUser(szUser,szPass);
 	return true;
 }
-bool  KviKvsObject_http::functionSetProxy(KviKvsObjectFunctionCall *c)
+bool  KvsObject_http::functionSetProxy(KviKvsObjectFunctionCall *c)
 {
 	CHECK_INTERNAL_POINTER(m_pHttp)
 	QString szHost;
@@ -275,7 +275,7 @@ bool  KviKvsObject_http::functionSetProxy(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool  KviKvsObject_http::functionGet(KviKvsObjectFunctionCall *c)
+bool  KvsObject_http::functionGet(KviKvsObjectFunctionCall *c)
 {
 	CHECK_INTERNAL_POINTER(m_pHttp)
 	QString szPath,szDest;
@@ -304,7 +304,7 @@ bool  KviKvsObject_http::functionGet(KviKvsObjectFunctionCall *c)
 	c->returnValue()->setInteger(id);
 	return true;
 }
-bool  KviKvsObject_http::functionPost(KviKvsObjectFunctionCall *c)
+bool  KvsObject_http::functionPost(KviKvsObjectFunctionCall *c)
 {
 	CHECK_INTERNAL_POINTER(m_pHttp)
 	QString szPath,szDest,szData;
@@ -326,26 +326,26 @@ bool  KviKvsObject_http::functionPost(KviKvsObjectFunctionCall *c)
 	c->returnValue()->setInteger(id);
 	return true;
 }
-bool  KviKvsObject_http::functionAbort(KviKvsObjectFunctionCall *c)
+bool  KvsObject_http::functionAbort(KviKvsObjectFunctionCall *c)
 {
 	CHECK_INTERNAL_POINTER(m_pHttp)
 	m_bAbort=true;
 	m_pHttp->abort();
 	return true;
 }
-bool  KviKvsObject_http::functionReadAll(KviKvsObjectFunctionCall *c)
+bool  KvsObject_http::functionReadAll(KviKvsObjectFunctionCall *c)
 {
 	CHECK_INTERNAL_POINTER(m_pHttp)
 	c->returnValue()->setString(m_pHttp->readAll());
 	return true;
 }
-bool  KviKvsObject_http::functionErrorString(KviKvsObjectFunctionCall *c)
+bool  KvsObject_http::functionErrorString(KviKvsObjectFunctionCall *c)
 {
 	CHECK_INTERNAL_POINTER(m_pHttp)
 	c->returnValue()->setString(m_pHttp->errorString());
 	return true;
 }
-bool KviKvsObject_http::functionFollowRedirect(KviKvsObjectFunctionCall *c)
+bool KvsObject_http::functionFollowRedirect(KviKvsObjectFunctionCall *c)
 {
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -356,13 +356,13 @@ bool KviKvsObject_http::functionFollowRedirect(KviKvsObjectFunctionCall *c)
 }
 //signals & slots
 
-bool KviKvsObject_http::functionRequestFinishedEvent(KviKvsObjectFunctionCall *c)
+bool KvsObject_http::functionRequestFinishedEvent(KviKvsObjectFunctionCall *c)
 {
         emitSignal("requestFinished",c,c->params());
 	return true;
 }
 
-void KviKvsObject_http::slotRequestFinished ( int id, bool error )
+void KvsObject_http::slotRequestFinished ( int id, bool error )
 {
 
     if (m_bAbort)
@@ -397,65 +397,65 @@ void KviKvsObject_http::slotRequestFinished ( int id, bool error )
     callFunction(this,"requestFinishedEvent",0,&lParams);
 }
 
-bool KviKvsObject_http::functionRequestStartedEvent(KviKvsObjectFunctionCall *c)
+bool KvsObject_http::functionRequestStartedEvent(KviKvsObjectFunctionCall *c)
 {
 	emitSignal("requestStarted",c,c->params());
 	return true;
 }
-void KviKvsObject_http::slotRequestStarted ( int id )
+void KvsObject_http::slotRequestStarted ( int id )
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t) id));
 	callFunction(this,"requestStartedEvent",0,&lParams);
 }
 
-void KviKvsObject_http::slotDataReadProgress ( int done,int total )
+void KvsObject_http::slotDataReadProgress ( int done,int total )
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t) done));
 	lParams.append(new KviKvsVariant((kvs_int_t) total));
 	callFunction(this,"dataReadProgressEvent",0,&lParams);
 }
-bool KviKvsObject_http::functionDataReadProgressEvent(KviKvsObjectFunctionCall *c)
+bool KvsObject_http::functionDataReadProgressEvent(KviKvsObjectFunctionCall *c)
 {
 	emitSignal("dataReadProgress",c,c->params());
 	return true;
 }
-void KviKvsObject_http::slotDataSendProgress ( int done,int total )
+void KvsObject_http::slotDataSendProgress ( int done,int total )
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant((kvs_int_t) done));
 	lParams.append(new KviKvsVariant((kvs_int_t) total));
 	callFunction(this,"dataSendProgressEvent",0,&lParams);
 }
-bool KviKvsObject_http::functionDataSendProgressEvent(KviKvsObjectFunctionCall *c)
+bool KvsObject_http::functionDataSendProgressEvent(KviKvsObjectFunctionCall *c)
 {
 	emitSignal("dataSendProgress",c,c->params());
 	return true;
 }
-bool KviKvsObject_http::functionDoneEvent(KviKvsObjectFunctionCall *c)
+bool KvsObject_http::functionDoneEvent(KviKvsObjectFunctionCall *c)
 {
 	emitSignal("done",c,c->params());
 	return true;
 }
-void KviKvsObject_http::slotDone ( bool error )
+void KvsObject_http::slotDone ( bool error )
 {
 	KviKvsVariantList lParams;
 	lParams.append(new KviKvsVariant(error));
 	callFunction(this,"doneEvent",0,&lParams);
 }
 
-bool KviKvsObject_http::functionResponseHeaderReceivedEvent(KviKvsObjectFunctionCall *c)
+bool KvsObject_http::functionResponseHeaderReceivedEvent(KviKvsObjectFunctionCall *c)
 {
 	emitSignal("responseHeaderReceived",c,c->params());
 	return true;
 }
-bool KviKvsObject_http::functionReadyReadEvent(KviKvsObjectFunctionCall *c)
+bool KvsObject_http::functionReadyReadEvent(KviKvsObjectFunctionCall *c)
 {
 	emitSignal("readyRead",c,c->params());
 	return true;
 }
-void KviKvsObject_http::redirect(QString &file,const QHttpResponseHeader &r)
+void KvsObject_http::redirect(QString &file,const QHttpResponseHeader &r)
 {
 	QUrl url(r.value("location"));
 	m_pHttp->setHost(url.host());
@@ -466,7 +466,7 @@ void KviKvsObject_http::redirect(QString &file,const QHttpResponseHeader &r)
 	getDict[id]=pFile;
 }
 
-void KviKvsObject_http::slotResponseHeaderReceived(const QHttpResponseHeader &r)
+void KvsObject_http::slotResponseHeaderReceived(const QHttpResponseHeader &r)
 {
 	QString szResponse;
 	switch (r.statusCode()) {
@@ -488,7 +488,7 @@ void KviKvsObject_http::slotResponseHeaderReceived(const QHttpResponseHeader &r)
 	callFunction(this,"responseHeaderReceivedEvent",0,&lParams);
 
 }
-void KviKvsObject_http::slotReadyRead(const QHttpResponseHeader &r)
+void KvsObject_http::slotReadyRead(const QHttpResponseHeader &r)
 {
 	QString szResponse;
 	switch (r.statusCode()) {
@@ -508,7 +508,7 @@ void KviKvsObject_http::slotReadyRead(const QHttpResponseHeader &r)
 
 
 
-void KviKvsObject_http::slotStateChanged ( int state)
+void KvsObject_http::slotStateChanged ( int state)
 {
 	QString szState="";
 	if (state==QHttp::Unconnected) szState="Unconnected";
@@ -523,7 +523,7 @@ void KviKvsObject_http::slotStateChanged ( int state)
 	lParams.append(new KviKvsVariant(szState));
 	callFunction(this,"stateChangedEvent",0,&lParams);
 }
-bool KviKvsObject_http::functionStateChangedEvent(KviKvsObjectFunctionCall *c)
+bool KvsObject_http::functionStateChangedEvent(KviKvsObjectFunctionCall *c)
 {
 	emitSignal("stateChanged",c,c->params());
 	return true;
@@ -531,12 +531,12 @@ bool KviKvsObject_http::functionStateChangedEvent(KviKvsObjectFunctionCall *c)
 
 #ifndef QT_NO_OPENSSL
 
-bool  KviKvsObject_http::functionIgnoreSslErrors(KviKvsObjectFunctionCall *)
+bool  KvsObject_http::functionIgnoreSslErrors(KviKvsObjectFunctionCall *)
 {
 	if (m_pHttp) m_pHttp->ignoreSslErrors();
 	return true;
 }
-void KviKvsObject_http::slotSslErrors(QList<QSslError> sslerrors)
+void KvsObject_http::slotSslErrors(QList<QSslError> sslerrors)
 {
 	KviKvsArray *pArray=0;
 	pArray=new KviKvsArray();
@@ -549,7 +549,7 @@ void KviKvsObject_http::slotSslErrors(QList<QSslError> sslerrors)
 	callFunction(this,"sslErrorEvent",0,&lParams);
 	}
 
-bool KviKvsObject_http::functionSslErrorsEvent(KviKvsObjectFunctionCall *c)
+bool KvsObject_http::functionSslErrorsEvent(KviKvsObjectFunctionCall *c)
 {
 
 	emitSignal("sslErrors",c,c->params());
@@ -557,5 +557,5 @@ bool KviKvsObject_http::functionSslErrorsEvent(KviKvsObjectFunctionCall *c)
 }
 #endif
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_http.moc"
+#include "m_KvsObject_http.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_http.h b/src/modules/objects/KvsObject_http.h
index cd221a995..1ef5ef592 100644
--- a/src/modules/objects/class_http.h
+++ b/src/modules/objects/KvsObject_http.h
@@ -2,7 +2,7 @@
 #define _CLASS_HTTP_H_
 //=============================================================================
 //
-//   File : class_http.h
+//   File : KvsObject_http.h
 //   Creation date : Fry Sep 5 18:13:45 2008 GMT by Carbone Alesssandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -34,11 +34,11 @@
 #include <QHash>
 #include <QSslError>
 
-class KviKvsObject_http : public KviKvsObject
+class KvsObject_http : public KviKvsObject
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_http)
+	KVSO_DECLARE_OBJECT(KvsObject_http)
 protected:
 	QHttp *m_pHttp;
 	QHash<int, QFile*> getDict;
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/KvsObject_label.cpp
index edceb3731..08cb4ffa1 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/KvsObject_label.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_label.cpp
+//   File : KvsObject_label.cpp
 //   Creation date : Mon Sep 18 14:21:48 CEST 2000 by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,7 +25,7 @@
 
 #include "KviError.h"
 #include "kvi_debug.h"
-#include "class_label.h"
+#include "KvsObject_label.h"
 #include "KviLocale.h"
 #include "KviIconManager.h"
 
@@ -183,29 +183,29 @@ const int frame_cod[] = {
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_label,"label","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,setText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,text)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,margin)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,setMargin)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,alignment)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,setAlignment)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,clear)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,frameStyle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,setFrameStyle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_label,setImage)
-KVSO_END_REGISTERCLASS(KviKvsObject_label)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_label,"label","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_label,setText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_label,text)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_label,margin)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_label,setMargin)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_label,alignment)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_label,setAlignment)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_label,clear)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_label,frameStyle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_label,setFrameStyle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_label,setImage)
+KVSO_END_REGISTERCLASS(KvsObject_label)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_label,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_label,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_label)
+KVSO_END_CONSTRUCTOR(KvsObject_label)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_label)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_label)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_label)
+KVSO_END_CONSTRUCTOR(KvsObject_label)
 
-bool KviKvsObject_label::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_label::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QLabel)
 	((QLabel *)widget())->setWordWrap(true);
diff --git a/src/modules/objects/class_label.h b/src/modules/objects/KvsObject_label.h
index c37620a22..f043f126b 100644
--- a/src/modules/objects/class_label.h
+++ b/src/modules/objects/KvsObject_label.h
@@ -2,7 +2,7 @@
 #define	_CLASS_LABEL_H_
 //=============================================================================
 //
-//   File : class_label.h
+//   File : KvsObject_label.h
 //   Creation date : Mon Sep 18 14:21:48 CEST 2000 by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -26,13 +26,13 @@
 //=============================================================================
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_label : public KviKvsObject_widget
+class KvsObject_label : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_label)
+	KVSO_DECLARE_OBJECT(KvsObject_label)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/KvsObject_layout.cpp
index 1fb6e6188..8d923da2e 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/KvsObject_layout.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_layout.cpp
+//   File : KvsObject_layout.cpp
 //   Creation date : Fri Now 22 2002 00:50:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,7 +25,7 @@
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "class_layout.h"
+#include "KvsObject_layout.h"
 
 #include <QGridLayout>
 
@@ -107,29 +107,29 @@ const int align_cod[] = {
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_layout,"layout","object")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,addWidget)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,addMultiCellWidget)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setRowStretch)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setColumnStretch)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,addRowSpacing)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,addColSpacing)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setMargin)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setSpacing)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setResizeMode)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_layout,setAlignment )
-KVSO_END_REGISTERCLASS(KviKvsObject_layout)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_layout,"layout","object")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_layout,addWidget)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_layout,addMultiCellWidget)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_layout,setRowStretch)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_layout,setColumnStretch)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_layout,addRowSpacing)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_layout,addColSpacing)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_layout,setMargin)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_layout,setSpacing)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_layout,setResizeMode)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_layout,setAlignment )
+KVSO_END_REGISTERCLASS(KvsObject_layout)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_layout,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_layout,KviKvsObject)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_layout)
+KVSO_END_CONSTRUCTOR(KvsObject_layout)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_layout)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_layout)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_layout)
+KVSO_END_CONSTRUCTOR(KvsObject_layout)
 
-bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *)
+bool KvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *)
 {
 	QWidget * w = parentScriptWidget();
 
@@ -313,5 +313,5 @@ KVSO_CLASS_FUNCTION(layout,setAlignment)
 	return true;
 }
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_layout.moc"
+#include "m_KvsObject_layout.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_layout.h b/src/modules/objects/KvsObject_layout.h
index 5d1e9e393..65580e99e 100644
--- a/src/modules/objects/class_layout.h
+++ b/src/modules/objects/KvsObject_layout.h
@@ -2,7 +2,7 @@
 #define _CLASS_LAYOUT_H_
 //=============================================================================
 //
-//   File : class_layout.h
+//   File : KvsObject_layout.h
 //   Creation date : Fri Now 22 2002 00:50:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -26,10 +26,10 @@
 
 #include "object_macros.h"
 
-class KviKvsObject_layout : public KviKvsObject
+class KvsObject_layout : public KviKvsObject
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_layout)
+	KVSO_DECLARE_OBJECT(KvsObject_layout)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/KvsObject_lcd.cpp
index 1c5a79953..ab4664bdc 100644
--- a/src/modules/objects/class_lcd.cpp
+++ b/src/modules/objects/KvsObject_lcd.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_lcd.cpp
+//   File : KvsObject_lcd.cpp
 //   Creation date : Mon Gen 27 14:30:48 CEST 2005 by Tonino Imbesi(Grifisx)
 //         and Alessandro Carbone(Noldor)
 //
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "class_lcd.h"
+#include "KvsObject_lcd.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -68,28 +68,28 @@
 		Returns 1 (TRUE) if num is too big to be displayed in its entirety; otherwise returns 0 (FALSE).
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_lcd,"lcdnumber","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_lcd,"lcdnumber","widget")
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,displayStr)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,displayInt)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,displayDouble)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,setMode)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,setSegmentStyle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,setNumDigits)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,setSmallDecimalPoint)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lcd,checkOverflow)
-KVSO_END_REGISTERCLASS(KviKvsObject_lcd)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lcd,displayStr)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lcd,displayInt)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lcd,displayDouble)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lcd,setMode)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lcd,setSegmentStyle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lcd,setNumDigits)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lcd,setSmallDecimalPoint)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lcd,checkOverflow)
+KVSO_END_REGISTERCLASS(KvsObject_lcd)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_lcd,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_lcd,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_lcd)
+KVSO_END_CONSTRUCTOR(KvsObject_lcd)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_lcd)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_lcd)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_lcd)
+KVSO_END_CONSTRUCTOR(KvsObject_lcd)
 
-bool KviKvsObject_lcd::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_lcd::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QLCDNumber)
 	return true;
diff --git a/src/modules/objects/class_lcd.h b/src/modules/objects/KvsObject_lcd.h
index bb80b520b..77c1fdc38 100644
--- a/src/modules/objects/class_lcd.h
+++ b/src/modules/objects/KvsObject_lcd.h
@@ -2,7 +2,7 @@
 #define _CLASS_LCD_H_
 //=============================================================================
 //
-//   File : class_lcd.h
+//   File : KvsObject_lcd.h
 //   Creation date : Mon Gen 27 14:30:48 CEST 2005 by Tonino Imbesi(Grifisx)
 //         and Alessandro Carbone(Noldor)
 //
@@ -27,13 +27,13 @@
 
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 
 
-class KviKvsObject_lcd : public KviKvsObject_widget
+class KvsObject_lcd : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_lcd)
+	KVSO_DECLARE_OBJECT(KvsObject_lcd)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/KvsObject_lineEdit.cpp
index 575b5a4c7..be41500da 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/KvsObject_lineEdit.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_lineedit.cpp
+//   File : KvsObject_lineEdit.cpp
 //   Creation date : Wed 20 Sep 2000 04:34:40 CEST by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -26,7 +26,7 @@
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
-#include "class_lineedit.h"
+#include "KvsObject_lineEdit.h"
 #include <QRegExpValidator>
 #include <QLineEdit>
 #include <QCompleter>
@@ -190,57 +190,57 @@ static const int mode_cod[] =  {
 
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_lineedit,"lineedit","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_lineEdit,"lineedit","widget")
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,text)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,text)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,setText)
 
         // completer
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setCompleter)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,enableCompleter)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,disableCompleter)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,unsetCompleter)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,setCompleter)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,enableCompleter)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,disableCompleter)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,unsetCompleter)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,maxLength)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setMaxLength)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,frame)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setCursorPosition)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,cursorPosition)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setFrame)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,selectAll)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setSelection)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,copy)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,cut)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,paste)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,echoMode)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setEchoMode)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,clear)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,dragAndDrop)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setInputMask)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setReadOnly)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,returnPressedEvent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,lostFocusEvent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,textChangedEvent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_lineedit,setInputValidator)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,maxLength)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,setMaxLength)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,frame)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,setCursorPosition)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,cursorPosition)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,setFrame)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,selectAll)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,setSelection)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,copy)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,cut)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,paste)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,echoMode)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,setEchoMode)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,clear)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,dragAndDrop)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,setInputMask)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,setReadOnly)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,returnPressedEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,lostFocusEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,textChangedEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_lineEdit,setInputValidator)
 
 
-KVSO_END_REGISTERCLASS(KviKvsObject_lineedit)
+KVSO_END_REGISTERCLASS(KvsObject_lineEdit)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_lineedit,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_lineEdit,KvsObject_widget)
 m_pCompleter=0;
-KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit)
+KVSO_END_CONSTRUCTOR(KvsObject_lineEdit)
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_lineedit)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_lineEdit)
 if (m_pCompleter)
 {
        delete m_pCompleter;
        m_pCompleter=0;
 }
-KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit)
+KVSO_END_CONSTRUCTOR(KvsObject_lineEdit)
 
 
-bool KviKvsObject_lineedit::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_lineEdit::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QLineEdit)
 
@@ -250,14 +250,14 @@ bool KviKvsObject_lineedit::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,text)
+KVSO_CLASS_FUNCTION(lineEdit,text)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setString(((QLineEdit *)widget())->text());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,setText)
+KVSO_CLASS_FUNCTION(lineEdit,setText)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szText;
@@ -267,7 +267,7 @@ KVSO_CLASS_FUNCTION(lineedit,setText)
 	((QLineEdit *)widget())->setText(szText);
 	return true;
 }
-KVSO_CLASS_FUNCTION(lineedit,setInputValidator)
+KVSO_CLASS_FUNCTION(lineEdit,setInputValidator)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szReg;
@@ -277,14 +277,14 @@ KVSO_CLASS_FUNCTION(lineedit,setInputValidator)
 	((QLineEdit *)widget())->setValidator(new QRegExpValidator(QRegExp(szReg),((QLineEdit *)widget())));
 	return true;
 }
-KVSO_CLASS_FUNCTION(lineedit,maxLength)
+KVSO_CLASS_FUNCTION(lineEdit,maxLength)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QLineEdit *)widget())->maxLength());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,setMaxLength)
+KVSO_CLASS_FUNCTION(lineEdit,setMaxLength)
 {
         CHECK_INTERNAL_POINTER(widget())
         kvs_uint_t iMaxlen;
@@ -295,14 +295,14 @@ KVSO_CLASS_FUNCTION(lineedit,setMaxLength)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,frame)
+KVSO_CLASS_FUNCTION(lineEdit,frame)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((QLineEdit *)widget())->hasFrame());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,setFrame)
+KVSO_CLASS_FUNCTION(lineEdit,setFrame)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bFrame;
@@ -313,14 +313,14 @@ KVSO_CLASS_FUNCTION(lineedit,setFrame)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,cursorPosition)
+KVSO_CLASS_FUNCTION(lineEdit,cursorPosition)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QLineEdit *)widget())->cursorPosition());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,setCursorPosition)
+KVSO_CLASS_FUNCTION(lineEdit,setCursorPosition)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iPos;
@@ -331,14 +331,14 @@ KVSO_CLASS_FUNCTION(lineedit,setCursorPosition)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,selectAll)
+KVSO_CLASS_FUNCTION(lineEdit,selectAll)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QLineEdit *)widget())->selectAll();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,setSelection)
+KVSO_CLASS_FUNCTION(lineEdit,setSelection)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uStart,uLen;
@@ -350,28 +350,28 @@ KVSO_CLASS_FUNCTION(lineedit,setSelection)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,copy)
+KVSO_CLASS_FUNCTION(lineEdit,copy)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QLineEdit *)widget())->copy();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,cut)
+KVSO_CLASS_FUNCTION(lineEdit,cut)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QLineEdit *)widget())->cut();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,paste)
+KVSO_CLASS_FUNCTION(lineEdit,paste)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QLineEdit *)widget())->paste();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,echoMode)
+KVSO_CLASS_FUNCTION(lineEdit,echoMode)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	int mode = ((QLineEdit *)widget())->echoMode();
@@ -388,7 +388,7 @@ KVSO_CLASS_FUNCTION(lineedit,echoMode)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,setEchoMode)
+KVSO_CLASS_FUNCTION(lineEdit,setEchoMode)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szMode;
@@ -408,7 +408,7 @@ KVSO_CLASS_FUNCTION(lineedit,setEchoMode)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,clear)
+KVSO_CLASS_FUNCTION(lineEdit,clear)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QLineEdit *)widget())->clear();
@@ -416,7 +416,7 @@ KVSO_CLASS_FUNCTION(lineedit,clear)
 }
 
 //-| Grifisx & Noldor |-Start:
-KVSO_CLASS_FUNCTION(lineedit,dragAndDrop)
+KVSO_CLASS_FUNCTION(lineEdit,dragAndDrop)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
@@ -427,7 +427,7 @@ KVSO_CLASS_FUNCTION(lineedit,dragAndDrop)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,setReadOnly)
+KVSO_CLASS_FUNCTION(lineEdit,setReadOnly)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
@@ -438,7 +438,7 @@ KVSO_CLASS_FUNCTION(lineedit,setReadOnly)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,setInputMask)
+KVSO_CLASS_FUNCTION(lineEdit,setInputMask)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szMask;
@@ -449,7 +449,7 @@ KVSO_CLASS_FUNCTION(lineedit,setInputMask)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(lineedit,setCompleter)
+KVSO_CLASS_FUNCTION(lineEdit,setCompleter)
 {
         CHECK_INTERNAL_POINTER(widget())
         QStringList szCompletionList;
@@ -473,19 +473,19 @@ KVSO_CLASS_FUNCTION(lineedit,setCompleter)
         ((QLineEdit *)widget())->setCompleter(m_pCompleter);
         return true;
 }
-KVSO_CLASS_FUNCTION(lineedit,enableCompleter)
+KVSO_CLASS_FUNCTION(lineEdit,enableCompleter)
 {
         CHECK_INTERNAL_POINTER(widget())
         if (m_pCompleter) ((QLineEdit *)widget())->setCompleter(m_pCompleter);
         return true;
 }
-KVSO_CLASS_FUNCTION(lineedit,disableCompleter)
+KVSO_CLASS_FUNCTION(lineEdit,disableCompleter)
 {
         CHECK_INTERNAL_POINTER(widget())
         ((QLineEdit *)widget())->setCompleter(0);
         return true;
 }
-KVSO_CLASS_FUNCTION(lineedit,unsetCompleter)
+KVSO_CLASS_FUNCTION(lineEdit,unsetCompleter)
 {
         CHECK_INTERNAL_POINTER(widget())
         if (m_pCompleter){
@@ -497,39 +497,39 @@ KVSO_CLASS_FUNCTION(lineedit,unsetCompleter)
 }
 
 
-KVSO_CLASS_FUNCTION(lineedit,returnPressedEvent)
+KVSO_CLASS_FUNCTION(lineEdit,returnPressedEvent)
 {
 	emitSignal("returnPressed",c);
 	return true;
 }
 
-void KviKvsObject_lineedit::slotreturnPressed()
+void KvsObject_lineEdit::slotreturnPressed()
 {
 	KviKvsVariantList * params = 0;
 	callFunction(this,"returnPressedEvent",params);
 
 }
 
-KVSO_CLASS_FUNCTION(lineedit,lostFocusEvent)
+KVSO_CLASS_FUNCTION(lineEdit,lostFocusEvent)
 {
 	emitSignal("lostFocus",c);
 	return true;
 }
 
-void KviKvsObject_lineedit::slotlostFocus()
+void KvsObject_lineEdit::slotlostFocus()
 {
 	KviKvsVariantList * params = 0;
 	callFunction(this,"lostFocusEvent",params);
 }
 
-KVSO_CLASS_FUNCTION(lineedit,textChangedEvent)
+KVSO_CLASS_FUNCTION(lineEdit,textChangedEvent)
 {
 	emitSignal("textChanged",c,c->params());
 	return true;
 
 }
 
-void KviKvsObject_lineedit::slottextChanged(const QString &text)
+void KvsObject_lineEdit::slottextChanged(const QString &text)
 {
 	KviKvsVariantList params(new KviKvsVariant(text));
 	callFunction(this,"textChangedEvent",&params);
@@ -538,6 +538,6 @@ void KviKvsObject_lineedit::slottextChanged(const QString &text)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_lineedit.moc"
+#include "m_KvsObject_lineEdit.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_lineedit.h b/src/modules/objects/KvsObject_lineEdit.h
index 54b34bd62..f561bf682 100644
--- a/src/modules/objects/class_lineedit.h
+++ b/src/modules/objects/KvsObject_lineEdit.h
@@ -2,7 +2,7 @@
 #define	_CLASS_LINEEDIT_H_
 //=============================================================================
 //
-//   File : class_lineedit.h
+//   File : KvsObject_lineEdit.h
 //   Creation date : Wed 20 Sep 2000 04:34:40 CEST by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -27,17 +27,17 @@
 
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 
 //#warning "Signals !"
 #include <QCompleter>
 #include "object_macros.h"
 
-class KviKvsObject_lineedit : public KviKvsObject_widget
+class KvsObject_lineEdit : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_lineedit)
+	KVSO_DECLARE_OBJECT(KvsObject_lineEdit)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_list.cpp b/src/modules/objects/KvsObject_list.cpp
index d69529022..a07b3a3e2 100644
--- a/src/modules/objects/class_list.cpp
+++ b/src/modules/objects/KvsObject_list.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_list.cpp
+//   File : KvsObject_list.cpp
 //   Creation date : Wed Sep 09 2000 21:07:55 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,7 +25,7 @@
 #include "kvi_debug.h"
 #include "KviMemory.h"
 #include "KviLocale.h"
-#include "class_list.h"
+#include "KvsObject_list.h"
 #include <stdlib.h>
 
 
@@ -134,42 +134,42 @@
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_list,"list","object")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,count)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,isEmpty)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,clear)
-	KVSO_REGISTER_HANDLER(KviKvsObject_list,"removeAll",clear)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,append)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,prepend)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,insert)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,insert)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,at)
-	KVSO_REGISTER_HANDLER(KviKvsObject_list,"item",at)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,remove)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,removeFirst)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,removeLast)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,removeCurrent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,moveFirst)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,moveNext)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,movePrev)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,moveLast)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,sort)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,eof)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_list,current)
-KVSO_END_REGISTERCLASS(KviKvsObject_list)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_list,"list","object")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,count)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,isEmpty)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,clear)
+	KVSO_REGISTER_HANDLER(KvsObject_list,"removeAll",clear)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,append)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,prepend)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,insert)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,insert)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,at)
+	KVSO_REGISTER_HANDLER(KvsObject_list,"item",at)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,remove)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,removeFirst)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,removeLast)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,removeCurrent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,moveFirst)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,moveNext)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,movePrev)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,moveLast)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,sort)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,eof)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_list,current)
+KVSO_END_REGISTERCLASS(KvsObject_list)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_list,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_list,KviKvsObject)
 	m_pDataList = new KviPointerList<KviKvsVariant>;
 	m_pDataList->setAutoDelete(true);
 	m_pDataList->first();
-KVSO_END_CONSTRUCTOR(KviKvsObject_list)
+KVSO_END_CONSTRUCTOR(KvsObject_list)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_list)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_list)
 delete m_pDataList;
 m_pDataList = 0;
-KVSO_END_CONSTRUCTOR(KviKvsObject_list)
+KVSO_END_CONSTRUCTOR(KvsObject_list)
 
 KVSO_CLASS_FUNCTION(list,current)
 {
diff --git a/src/modules/objects/class_list.h b/src/modules/objects/KvsObject_list.h
index 54d350815..46a4c0c4b 100644
--- a/src/modules/objects/class_list.h
+++ b/src/modules/objects/KvsObject_list.h
@@ -2,7 +2,7 @@
 #define _CLASS_LIST_H_
 //=============================================================================
 //
-//   File : class_list.h
+//   File : KvsObject_list.h
 //   Creation date : Wed Sep 09 2000 21:07:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,10 +31,10 @@
 #include "object_macros.h"
 
 
-class KviKvsObject_list : public KviKvsObject
+class KvsObject_list : public KviKvsObject
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_list)
+	KVSO_DECLARE_OBJECT(KvsObject_list)
 protected:
 	KviPointerList<KviKvsVariant> * m_pDataList;
 protected:
diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp
index 11369d244..773cfe0b4 100644
--- a/src/modules/objects/class_listwidget.cpp
+++ b/src/modules/objects/KvsObject_listWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_listwidget.cpp
+//   File : KvsObject_listWidget.cpp
 //   Creation date : Sat Oct 2 03:40:28 CET 2004 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,9 +25,9 @@
 #include "KviError.h"
 #include "KviLocale.h"
 #include "kvi_debug.h"
-#include "class_list.h"
-#include "class_listwidget.h"
-#include "class_pixmap.h"
+#include "KvsObject_list.h"
+#include "KvsObject_listWidget.h"
+#include "KvsObject_pixmap.h"
 #include "KviIconManager.h"
 #include <QListWidget>
 
@@ -155,54 +155,54 @@ const char * const itemflags_tbl[] = {
 		*/
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_listwidget,"listbox","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,insertItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,insertWidgetItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,changeItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,removeItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,clear)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,count)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,currentText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,currentItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,textAt);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,itemAt);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,itemRect);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,setCurrentItem);
+KVSO_BEGIN_REGISTERCLASS(KvsObject_listWidget,"listbox","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,insertItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,insertWidgetItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,changeItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,removeItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,clear)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,count)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,currentText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,currentItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,textAt);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,itemAt);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,itemRect);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,setCurrentItem);
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,selectedItems);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,setSelected);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,isSelected);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,setFont);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,setIcon);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,selectedItems);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,setSelected);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,isSelected);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,setFont);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,setIcon);
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,setFlags)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,setChecked);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,isChecked);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,setFlags)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,setChecked);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,isChecked);
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,setSelectionMode);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,selectionMode);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,setSelectionMode);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,selectionMode);
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,setForeground);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,setForeground);
 
 	// events
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,currentItemChangedEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,itemChangedEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_listwidget,itemEnteredEvent);
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_listwidget,"selectionChangedEvent")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,currentItemChangedEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,itemChangedEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_listWidget,itemEnteredEvent);
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_listWidget,"selectionChangedEvent")
 
 
-KVSO_END_REGISTERCLASS(KviKvsObject_listwidget)
+KVSO_END_REGISTERCLASS(KvsObject_listWidget)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_listwidget,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_listWidget,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_listwidget)
+KVSO_END_CONSTRUCTOR(KvsObject_listWidget)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_listwidget)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_listWidget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_listwidget)
+KVSO_END_CONSTRUCTOR(KvsObject_listWidget)
 
-bool KviKvsObject_listwidget::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_listWidget::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QListWidget)
 	obj->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -214,7 +214,7 @@ bool KviKvsObject_listwidget::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(listwidget,insertItem)
+KVSO_CLASS_FUNCTION(listWidget,insertItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iRow;
@@ -228,7 +228,7 @@ KVSO_CLASS_FUNCTION(listwidget,insertItem)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(listwidget,setFlags)
+KVSO_CLASS_FUNCTION(listWidget,setFlags)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QStringList itemflags;
@@ -262,7 +262,7 @@ KVSO_CLASS_FUNCTION(listwidget,setFlags)
 	pItem->setFlags((Qt::ItemFlags)sum);
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,setChecked)
+KVSO_CLASS_FUNCTION(listWidget,setChecked)
 {
 	bool bChecked;
 	kvs_uint_t iIdx;
@@ -276,7 +276,7 @@ KVSO_CLASS_FUNCTION(listwidget,setChecked)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(listwidget,isChecked)
+KVSO_CLASS_FUNCTION(listWidget,isChecked)
 {
 	kvs_uint_t iIdx;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -288,7 +288,7 @@ KVSO_CLASS_FUNCTION(listwidget,isChecked)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(listwidget,setFont)
+KVSO_CLASS_FUNCTION(listWidget,setFont)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szFamily;
@@ -320,7 +320,7 @@ KVSO_CLASS_FUNCTION(listwidget,setFont)
 	pItem->setFont(font);
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,setIcon)
+KVSO_CLASS_FUNCTION(listWidget,setIcon)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uIdx;
@@ -345,7 +345,7 @@ KVSO_CLASS_FUNCTION(listwidget,setIcon)
 			c->warning(__tr2qs_ctx("Pixmap object or image Id required","objects"));
 			return true;
 		}
-		pix=((KviKvsObject_pixmap *)obPixmap)->getPixmap();
+		pix=((KvsObject_pixmap *)obPixmap)->getPixmap();
 	} else {
 		QString szPix;
 		vPixmap->asString(szPix);
@@ -364,7 +364,7 @@ KVSO_CLASS_FUNCTION(listwidget,setIcon)
 	}
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,setForeground)
+KVSO_CLASS_FUNCTION(listWidget,setForeground)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iCol1,iCol2,iCol3,iOpacity,iIdx;
@@ -419,14 +419,14 @@ KVSO_CLASS_FUNCTION(listwidget,setForeground)
 	pItem->setForeground(brush);
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,clear)
+KVSO_CLASS_FUNCTION(listWidget,clear)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QListWidget *)widget())->clear();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(listwidget,changeItem)
+KVSO_CLASS_FUNCTION(listWidget,changeItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iIndex,cnt;
@@ -447,7 +447,7 @@ KVSO_CLASS_FUNCTION(listwidget,changeItem)
 }
 
 
-KVSO_CLASS_FUNCTION(listwidget,removeItem)
+KVSO_CLASS_FUNCTION(listWidget,removeItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iIndex,cnt;
@@ -464,13 +464,13 @@ KVSO_CLASS_FUNCTION(listwidget,removeItem)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(listwidget,count)
+KVSO_CLASS_FUNCTION(listWidget,count)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QListWidget *)widget())->count());
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,currentText)
+KVSO_CLASS_FUNCTION(listWidget,currentText)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString text;
@@ -480,14 +480,14 @@ KVSO_CLASS_FUNCTION(listwidget,currentText)
 	c->returnValue()->setString(text);
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,currentItem)
+KVSO_CLASS_FUNCTION(listWidget,currentItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QListWidget *)widget())->currentRow());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(listwidget,textAt)
+KVSO_CLASS_FUNCTION(listWidget,textAt)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iIndex;
@@ -497,7 +497,7 @@ KVSO_CLASS_FUNCTION(listwidget,textAt)
 	c->returnValue()->setString(((QListWidget *)widget())->item(iIndex)->text());
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,setCurrentItem)
+KVSO_CLASS_FUNCTION(listWidget,setCurrentItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iIndex;
@@ -507,7 +507,7 @@ KVSO_CLASS_FUNCTION(listwidget,setCurrentItem)
 	((QListWidget *)widget())->setCurrentRow(iIndex);
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,setSelectionMode)
+KVSO_CLASS_FUNCTION(listWidget,setSelectionMode)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szMode;
@@ -523,7 +523,7 @@ KVSO_CLASS_FUNCTION(listwidget,setSelectionMode)
 	((QListWidget *)widget())->setSelectionMode(iMode);
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,selectionMode)
+KVSO_CLASS_FUNCTION(listWidget,selectionMode)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	switch(((QListWidget *)widget())->selectionMode())
@@ -537,7 +537,7 @@ KVSO_CLASS_FUNCTION(listwidget,selectionMode)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(listwidget,insertWidgetItem)
+KVSO_CLASS_FUNCTION(listWidget,insertWidgetItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *pObject;
@@ -563,7 +563,7 @@ KVSO_CLASS_FUNCTION(listwidget,insertWidgetItem)
 	((QListWidget *)widget())->setItemWidget(item,wi);
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,selectedItems)
+KVSO_CLASS_FUNCTION(listWidget,selectedItems)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QList<QListWidgetItem *> list=((QListWidget *)widget())->selectedItems();
@@ -577,7 +577,7 @@ KVSO_CLASS_FUNCTION(listwidget,selectedItems)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(listwidget,setSelected)
+KVSO_CLASS_FUNCTION(listWidget,setSelected)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bSel;
@@ -589,7 +589,7 @@ KVSO_CLASS_FUNCTION(listwidget,setSelected)
 	((QListWidget *)widget())->item(uIndex)->setSelected(bSel);
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,isSelected)
+KVSO_CLASS_FUNCTION(listWidget,isSelected)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uIndex;
@@ -599,7 +599,7 @@ KVSO_CLASS_FUNCTION(listwidget,isSelected)
 	c->returnValue()->setBoolean(((QListWidget *)widget())->item(uIndex)->isSelected());
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,itemAt)
+KVSO_CLASS_FUNCTION(listWidget,itemAt)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uX,uY;
@@ -610,7 +610,7 @@ KVSO_CLASS_FUNCTION(listwidget,itemAt)
 	c->returnValue()->setInteger(((QListWidget *)widget())->row(((QListWidget *)widget())->itemAt(QPoint(uX,uY))));
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,itemRect)
+KVSO_CLASS_FUNCTION(listWidget,itemRect)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uIndex;
@@ -627,18 +627,18 @@ KVSO_CLASS_FUNCTION(listwidget,itemRect)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(listwidget,currentItemChangedEvent)
+KVSO_CLASS_FUNCTION(listWidget,currentItemChangedEvent)
 {
 	emitSignal("currentItemChanged",c,c->params());
 	return true;
 }
-KVSO_CLASS_FUNCTION(listwidget,itemChangedEvent)
+KVSO_CLASS_FUNCTION(listWidget,itemChangedEvent)
 {
 	emitSignal("itemChanged",c,c->params());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(listwidget,itemEnteredEvent)
+KVSO_CLASS_FUNCTION(listWidget,itemEnteredEvent)
 {
 	emitSignal("itemEntered",c,c->params());
 
@@ -646,7 +646,7 @@ KVSO_CLASS_FUNCTION(listwidget,itemEnteredEvent)
 }
 
 //slots
-void KviKvsObject_listwidget::currentItemChanged(QListWidgetItem *currentItem,QListWidgetItem *)
+void KvsObject_listWidget::currentItemChanged(QListWidgetItem *currentItem,QListWidgetItem *)
 {
 	if (!currentItem) callFunction(this,"currentItemChangedEvent",0,0);
 	else
@@ -656,25 +656,25 @@ void KviKvsObject_listwidget::currentItemChanged(QListWidgetItem *currentItem,QL
 	}
 
 }
-void KviKvsObject_listwidget::selectionChanged()
+void KvsObject_listWidget::selectionChanged()
 {
 	callFunction(this,"selectionChangedEvent",0,0);
 }
 
 
-void KviKvsObject_listwidget::slotItemEntered(QListWidgetItem *item)
+void KvsObject_listWidget::slotItemEntered(QListWidgetItem *item)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)((QListWidget *)widget())->row(item)));
 	callFunction(this,"itemEnteredEvent",0,&params);
 }
 
-void KviKvsObject_listwidget::slotItemChanged(QListWidgetItem *item)
+void KvsObject_listWidget::slotItemChanged(QListWidgetItem *item)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)((QListWidget *)widget())->row(item)));
 	callFunction(this,"itemChangedEvent",0,&params);
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_listwidget.moc"
+#include "m_KvsObject_listWidget.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_listwidget.h b/src/modules/objects/KvsObject_listWidget.h
index 1fd754481..3fb204488 100644
--- a/src/modules/objects/class_listwidget.h
+++ b/src/modules/objects/KvsObject_listWidget.h
@@ -2,7 +2,7 @@
 #define _CLASS_LISTBOX_H_

 //=============================================================================

 //

-//   File : class_listwidget.h

+//   File : KvsObject_listWidget.h

 //   Creation date : Sat Oct 2 03:40:28 CET 2004 by Szymon Stefanek

 //

 //   This file is part of the KVIrc irc client distribution

@@ -25,15 +25,15 @@
 //=============================================================================

 

 

-#include "class_widget.h"

+#include "KvsObject_widget.h"

 #include <QListWidget>

 #include "object_macros.h"

 

-class KviKvsObject_listwidget: public KviKvsObject_widget

+class KvsObject_listWidget: public KvsObject_widget

 {

 	Q_OBJECT

 public:

-	KVSO_DECLARE_OBJECT(KviKvsObject_listwidget)

+	KVSO_DECLARE_OBJECT(KvsObject_listWidget)

 public:

 	QWidget * widget() { return (QWidget *)object(); };

 protected:

diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/KvsObject_mainWindow.cpp
index f6cd43342..71844c67a 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/KvsObject_mainWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_mainwindow.cpp
+//   File : KvsObject_mainWindow.cpp
 //   Creation date : Mon Feb 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -24,7 +24,7 @@
 //=============================================================================
 
 #include "KviTalMainWindow.h"
-#include "class_mainwindow.h"
+#include "KvsObject_mainWindow.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -51,27 +51,27 @@
 		Sets the central widget for the main window to <wid>.
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_mainwindow,"mainwindow","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_mainwindow,setCentralWidget)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_mainWindow,"mainwindow","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_mainWindow,setCentralWidget)
 
-KVSO_END_REGISTERCLASS(KviKvsObject_mainwindow)
+KVSO_END_REGISTERCLASS(KvsObject_mainWindow)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_mainwindow,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_mainWindow,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_mainwindow)
+KVSO_END_CONSTRUCTOR(KvsObject_mainWindow)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_mainwindow)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_mainWindow)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_mainwindow)
+KVSO_END_CONSTRUCTOR(KvsObject_mainWindow)
 
-bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_mainWindow::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	setObject(new KviTalMainWindow(parentScriptWidget(), getName().toUtf8().data()), true);
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(mainwindow,setCentralWidget)
+KVSO_CLASS_FUNCTION(mainWindow,setCentralWidget)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject * pObject;
diff --git a/src/modules/objects/class_mainwindow.h b/src/modules/objects/KvsObject_mainWindow.h
index 4db39bc24..11ad34645 100644
--- a/src/modules/objects/class_mainwindow.h
+++ b/src/modules/objects/KvsObject_mainWindow.h
@@ -2,7 +2,7 @@
 #define _CLASS_MAINWINDOW_H_
 //=============================================================================
 //
-//   File : class_mainwindow.h
+//   File : KvsObject_mainWindow.h
 //   Creation date : Mon Feb 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -26,13 +26,13 @@
 //=============================================================================
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_mainwindow : public KviKvsObject_widget
+class KvsObject_mainWindow : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_mainwindow)
+	KVSO_DECLARE_OBJECT(KvsObject_mainWindow)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/KvsObject_memoryBuffer.cpp
index 26f656ec0..e5947f448 100644
--- a/src/modules/objects/class_memorybuffer.cpp
+++ b/src/modules/objects/KvsObject_memoryBuffer.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_memorybuffer.cpp
+//   File : KvsObject_memoryBuffer.cpp
 //   Creation date : Fri Mar 18 21:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "class_memorybuffer.h"
+#include "KvsObject_memoryBuffer.h"
 
 #include "KviError.h"
 #include "kvi_debug.h"
@@ -57,25 +57,25 @@
 
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_memorybuffer,"memorybuffer","object")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_memorybuffer,loadFromFile);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_memorybuffer,saveToFile);
-KVSO_END_REGISTERCLASS(KviKvsObject_memorybuffer)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_memoryBuffer,"memorybuffer","object")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_memoryBuffer,loadFromFile);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_memoryBuffer,saveToFile);
+KVSO_END_REGISTERCLASS(KvsObject_memoryBuffer)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_memorybuffer,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_memoryBuffer,KviKvsObject)
 
 	m_pBuffer = new QByteArray();
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_memorybuffer)
+KVSO_END_CONSTRUCTOR(KvsObject_memoryBuffer)
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_memorybuffer)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_memoryBuffer)
 
 	delete m_pBuffer;
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_memorybuffer)
+KVSO_END_CONSTRUCTOR(KvsObject_memoryBuffer)
 
-KVSO_CLASS_FUNCTION(memorybuffer,loadFromFile)
+KVSO_CLASS_FUNCTION(memoryBuffer,loadFromFile)
 {
 	CHECK_INTERNAL_POINTER(m_pBuffer)
 	QString szFileName;
@@ -98,7 +98,7 @@ KVSO_CLASS_FUNCTION(memorybuffer,loadFromFile)
 	else c->warning(__tr2qs_ctx("The file '%Q' does not exist","objects"),&szFileName);
 	return true;
 }
-KVSO_CLASS_FUNCTION(memorybuffer,saveToFile)
+KVSO_CLASS_FUNCTION(memoryBuffer,saveToFile)
 {
 	CHECK_INTERNAL_POINTER(m_pBuffer)
 	QString szFileName;
@@ -119,7 +119,7 @@ KVSO_CLASS_FUNCTION(memorybuffer,saveToFile)
 }
 /*
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_memorybuffer.moc"
+#include "m_KvsObject_memoryBuffer.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES*/
 
 
diff --git a/src/modules/objects/class_memorybuffer.h b/src/modules/objects/KvsObject_memoryBuffer.h
index ebff5dc88..0cd6fd388 100644
--- a/src/modules/objects/class_memorybuffer.h
+++ b/src/modules/objects/KvsObject_memoryBuffer.h
@@ -2,7 +2,7 @@
 #define _CLASS_MEMORYBUFFER_H_

 //=============================================================================

 //

-//   File : class_memorybuffer.h

+//   File : KvsObject_memoryBuffer.h

 //   Creation date : Fri Mar 18 21:30:48 CEST 2005

 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)

 //

@@ -31,10 +31,10 @@
 

 

 

-class KviKvsObject_memorybuffer : public KviKvsObject

+class KvsObject_memoryBuffer : public KviKvsObject

 {

 public:

-	KVSO_DECLARE_OBJECT(KviKvsObject_memorybuffer)

+	KVSO_DECLARE_OBJECT(KvsObject_memoryBuffer)

 protected:

 	QByteArray * m_pBuffer;

 public:

diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/KvsObject_menuBar.cpp
index 8096a8154..0a9904b2a 100644
--- a/src/modules/objects/class_menubar.cpp
+++ b/src/modules/objects/KvsObject_menuBar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_menubar.cpp
+//   File : KvsObject_menuBar.cpp
 //   Creation date : Tue Now 26 13:16:59 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "class_menubar.h"
+#include "KvsObject_menuBar.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -46,26 +46,26 @@
 		Returns an integer that identifies the inserted item.
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_menubar,"menubar","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_menubar,insertItem)
-KVSO_END_REGISTERCLASS(KviKvsObject_menubar)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_menuBar,"menubar","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_menuBar,insertItem)
+KVSO_END_REGISTERCLASS(KvsObject_menuBar)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_menubar,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_menuBar,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_menubar)
+KVSO_END_CONSTRUCTOR(KvsObject_menuBar)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_menubar)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_menuBar)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_menubar)
+KVSO_END_CONSTRUCTOR(KvsObject_menuBar)
 
-bool KviKvsObject_menubar::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_menuBar::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QMenuBar)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(menubar,insertItem)
+KVSO_CLASS_FUNCTION(menuBar,insertItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szItem;
diff --git a/src/modules/objects/class_menubar.h b/src/modules/objects/KvsObject_menuBar.h
index a255e1747..64e9b62fb 100644
--- a/src/modules/objects/class_menubar.h
+++ b/src/modules/objects/KvsObject_menuBar.h
@@ -2,7 +2,7 @@
 #define _CLASS_MENUBAR_H_
 //=============================================================================
 //
-//   File : class_menubar.h
+//   File : KvsObject_menuBar.h
 //   Creation date : Tue Now 26 13:15:48 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,13 +25,13 @@
 //=============================================================================
 
 #include <qmenubar.h>
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_menubar : public KviKvsObject_widget
+class KvsObject_menuBar : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_menubar)
+	KVSO_DECLARE_OBJECT(KvsObject_menuBar)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/KvsObject_multiLineEdit.cpp
index eb8cff0fd..e7df905e5 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/KvsObject_multiLineEdit.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_multilineedit.cpp
+//   File : KvsObject_multiLineEdit.cpp
 //   Creation date : Mon Feb 19 2000 00:45:34 CET by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -35,7 +35,7 @@
 #include <QTextStream>
 #include <QTextCursor>
 
-#include "class_multilineedit.h"
+#include "KvsObject_multiLineEdit.h"
 
 /*
 	@doc: multilineedit
@@ -165,76 +165,76 @@
 		*/
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_textedit,"multilineedit","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_textedit,"multilineedit","widget")
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"textLine", functionTextLine)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setWordWrap", functionSetWordWrap)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"wordWrap", functionWordWrap)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"textLine", functionTextLine)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setWordWrap", functionSetWordWrap)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"wordWrap", functionWordWrap)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"atEnd", functionAtEnd)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"numLines", functionNumLines)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"atBeginning", functionAtBeginning)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"cursorPosition", functionCursorPosition)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"text", functionText)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"insert", functionInsert)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"maxLines", functionMaxLines)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setMaxLines", functionSetMaxLines)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"append", functionAppend)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"copy", functionCopy)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"cut", functionCut)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"paste", functionPaste)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"atEnd", functionAtEnd)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"numLines", functionNumLines)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"atBeginning", functionAtBeginning)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"cursorPosition", functionCursorPosition)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"text", functionText)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"insert", functionInsert)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"maxLines", functionMaxLines)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setMaxLines", functionSetMaxLines)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"append", functionAppend)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"copy", functionCopy)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"cut", functionCut)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"paste", functionPaste)
 
 	//->Set Style
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setFamily", functionsetFamily)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setItalic", functionsetItalic)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setBold", functionsetBold)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setUnderline", functionsetUnderline)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"italic", functionitalic)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"bold", functionbold)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"underline", functionunderline)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setFamily", functionsetFamily)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setItalic", functionsetItalic)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setBold", functionsetBold)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setUnderline", functionsetUnderline)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"italic", functionitalic)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"bold", functionbold)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"underline", functionunderline)
 
 	//->Zoom In, Out, To
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"zoomIn", functionzoomIn)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"zoomOut", functionzoomOut)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"zoomIn", functionzoomIn)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"zoomOut", functionzoomOut)
 
 	//->Undo & Redo
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"undo", functionundo)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"redo", functionredo)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"clear", functionclear)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setUndoRedoEnabled", functionsetUndoRedoEnabled)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"undo", functionundo)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"redo", functionredo)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"clear", functionclear)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setUndoRedoEnabled", functionsetUndoRedoEnabled)
 
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"isUndoRedoEnabled", functionisUndoRedoEnabled)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"isUndoRedoEnabled", functionisUndoRedoEnabled)
 
 	//->Text color & others
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setText", functionsetText)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setColor", functionsetColor)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setModified", functionsetModified)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setText", functionsetText)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setColor", functionsetColor)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setModified", functionsetModified)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setPointSize", functionsetPointSize)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setReadOnly",functionSetReadOnly)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setPointSize", functionsetPointSize)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setReadOnly",functionSetReadOnly)
 	
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setTextFormat", functionsetTextFormat)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"textFormat", functiontextFormat)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"loadFile", functionloadFile);
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setAlignment", functionsetAlignment)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setTextFormat", functionsetTextFormat)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"textFormat", functiontextFormat)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"loadFile", functionloadFile);
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"setAlignment", functionsetAlignment)
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"lines", functionlines)
-	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"selectAll", functionselectAll)
-KVSO_END_REGISTERCLASS(KviKvsObject_textedit)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"lines", functionlines)
+	KVSO_REGISTER_HANDLER(KvsObject_textedit,"selectAll", functionselectAll)
+KVSO_END_REGISTERCLASS(KvsObject_textedit)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_textedit,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_textedit,KvsObject_widget)
 
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_textedit)
+KVSO_END_CONSTRUCTOR(KvsObject_textedit)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_textedit)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_textedit)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_textedit)
+KVSO_END_CONSTRUCTOR(KvsObject_textedit)
 
-bool KviKvsObject_textedit::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_textedit::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QTextEdit);
 	return true;
@@ -242,7 +242,7 @@ bool KviKvsObject_textedit::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 
 
 
-bool KviKvsObject_textedit::functionSetReadOnly(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionSetReadOnly(KviKvsObjectFunctionCall * c)
 {
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -253,7 +253,7 @@ bool KviKvsObject_textedit::functionSetReadOnly(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionTextLine(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionTextLine(KviKvsObjectFunctionCall * c)
 {
 	kvs_int_t iBlock;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -266,12 +266,12 @@ bool KviKvsObject_textedit::functionTextLine(KviKvsObjectFunctionCall * c)
 
 	return true;
 }
-bool KviKvsObject_textedit::functionNumLines(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionNumLines(KviKvsObjectFunctionCall * c)
 {
 	if(widget()) c->returnValue()->setInteger(((QTextEdit *)widget())->document()->blockCount());
 	return true;
 }
-bool KviKvsObject_textedit::functionCursorPosition(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionCursorPosition(KviKvsObjectFunctionCall * c)
 {
 	if(!widget()) return true;
 	int iRow=((QTextEdit *)widget())->textCursor().blockNumber();
@@ -284,21 +284,21 @@ bool KviKvsObject_textedit::functionCursorPosition(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionAtBeginning(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionAtBeginning(KviKvsObjectFunctionCall * c)
 {
 	if(!widget()) return true;
 	c->returnValue()->setBoolean(((QTextEdit *)widget())->textCursor().atStart());
 	return true;
 }
 
-bool KviKvsObject_textedit::functionAtEnd(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionAtEnd(KviKvsObjectFunctionCall * c)
 {
 	if(!widget()) return true;
 	c->returnValue()->setBoolean(((QTextEdit *)widget())->textCursor().atEnd());
 	return true;
 }
 
-bool KviKvsObject_textedit::functionSetWordWrap(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionSetWordWrap(KviKvsObjectFunctionCall * c)
 {
 	if(!widget())return true;
 	QString szWrap;
@@ -319,7 +319,7 @@ bool KviKvsObject_textedit::functionSetWordWrap(KviKvsObjectFunctionCall * c)
 }
 
 
-bool KviKvsObject_textedit::functionWordWrap(KviKvsObjectFunctionCall *c)
+bool KvsObject_textedit::functionWordWrap(KviKvsObjectFunctionCall *c)
 {
 
 	if(!widget()) return true;
@@ -334,14 +334,14 @@ bool KviKvsObject_textedit::functionWordWrap(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionText(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionText(KviKvsObjectFunctionCall * c)
 {
 	if(widget())
 		c->returnValue()->setString(((QTextEdit *)widget())->document()->toPlainText());
 	return true;
 }
 
-bool KviKvsObject_textedit::functionSetMaxLines(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionSetMaxLines(KviKvsObjectFunctionCall * c)
 {
 	kvs_uint_t imaxLines;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -352,14 +352,14 @@ bool KviKvsObject_textedit::functionSetMaxLines(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionMaxLines(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionMaxLines(KviKvsObjectFunctionCall * c)
 {
 	if(widget())
 		c->returnValue()->setInteger(((QTextEdit *)widget())->document()->maximumBlockCount());
 	return true;
 }
 
-bool KviKvsObject_textedit::functionInsert(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionInsert(KviKvsObjectFunctionCall * c)
 {
 	QString szInsert;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -374,7 +374,7 @@ bool KviKvsObject_textedit::functionInsert(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionAppend(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionAppend(KviKvsObjectFunctionCall * c)
 {
 	QString szAppend;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -385,21 +385,21 @@ bool KviKvsObject_textedit::functionAppend(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionCopy(KviKvsObjectFunctionCall *)
+bool KvsObject_textedit::functionCopy(KviKvsObjectFunctionCall *)
 {
 	if(widget())
 		((QTextEdit *)widget())->copy();
 	return true;
 }
 
-bool KviKvsObject_textedit::functionCut(KviKvsObjectFunctionCall *)
+bool KvsObject_textedit::functionCut(KviKvsObjectFunctionCall *)
 {
 	if(widget())
 		((QTextEdit *)widget())->cut();
 	return true;
 }
 
-bool KviKvsObject_textedit::functionPaste(KviKvsObjectFunctionCall *)
+bool KvsObject_textedit::functionPaste(KviKvsObjectFunctionCall *)
 {
 	if(widget())
 		((QTextEdit *)widget())->paste();
@@ -407,7 +407,7 @@ bool KviKvsObject_textedit::functionPaste(KviKvsObjectFunctionCall *)
 }
 
 //->Set Bold, Italic, Underline
-bool KviKvsObject_textedit::functionsetBold(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetBold(KviKvsObjectFunctionCall * c)
 {
 	bool bFlag;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -418,7 +418,7 @@ bool KviKvsObject_textedit::functionsetBold(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionsetUnderline(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetUnderline(KviKvsObjectFunctionCall * c)
 {
 	bool bFlag;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -429,7 +429,7 @@ bool KviKvsObject_textedit::functionsetUnderline(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionsetItalic(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetItalic(KviKvsObjectFunctionCall * c)
 {
 	bool bFlag;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -441,21 +441,21 @@ bool KviKvsObject_textedit::functionsetItalic(KviKvsObjectFunctionCall * c)
 }
 
 //-->Returns Italic, Bold, Underline.
-bool KviKvsObject_textedit::functionbold(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionbold(KviKvsObjectFunctionCall * c)
 {
 	if(widget())
 		c->returnValue()->setBoolean(((QTextEdit *)widget())->fontWeight() >= QFont::Bold );
 	return true;
 }
 
-bool KviKvsObject_textedit::functionitalic(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionitalic(KviKvsObjectFunctionCall * c)
 {
 	if(widget())
 		c->returnValue()->setBoolean(((QTextEdit *)widget())->fontItalic());
 	return true;
 }
 
-bool KviKvsObject_textedit::functionunderline(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionunderline(KviKvsObjectFunctionCall * c)
 {
 	if(widget())
 		c->returnValue()->setBoolean(((QTextEdit *)widget())->fontUnderline());
@@ -463,7 +463,7 @@ bool KviKvsObject_textedit::functionunderline(KviKvsObjectFunctionCall * c)
 }
 
 //->Zoom In, out at
-bool KviKvsObject_textedit::functionzoomIn(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionzoomIn(KviKvsObjectFunctionCall * c)
 {
 	kvs_int_t iZoom;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -477,7 +477,7 @@ bool KviKvsObject_textedit::functionzoomIn(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionzoomOut(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionzoomOut(KviKvsObjectFunctionCall * c)
 {
 	kvs_int_t iZoom;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -494,21 +494,21 @@ bool KviKvsObject_textedit::functionzoomOut(KviKvsObjectFunctionCall * c)
 
 
 //-> Undo & Redo functions
-bool KviKvsObject_textedit::functionundo(KviKvsObjectFunctionCall *)
+bool KvsObject_textedit::functionundo(KviKvsObjectFunctionCall *)
 {
 	if(widget())
 		((QTextEdit *)widget())->undo();
 	return true;
 }
 
-bool KviKvsObject_textedit::functionredo(KviKvsObjectFunctionCall *)
+bool KvsObject_textedit::functionredo(KviKvsObjectFunctionCall *)
 {
 	if(widget())
 		((QTextEdit *)widget())->redo();
 	return true;
 }
 
-bool KviKvsObject_textedit::functionclear(KviKvsObjectFunctionCall *)
+bool KvsObject_textedit::functionclear(KviKvsObjectFunctionCall *)
 {
 	if(widget())
 		((QTextEdit *)widget())->clear();
@@ -517,7 +517,7 @@ bool KviKvsObject_textedit::functionclear(KviKvsObjectFunctionCall *)
 
 
 
-bool KviKvsObject_textedit::functionsetUndoRedoEnabled(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetUndoRedoEnabled(KviKvsObjectFunctionCall * c)
 {
 	bool bFlag;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -528,7 +528,7 @@ bool KviKvsObject_textedit::functionsetUndoRedoEnabled(KviKvsObjectFunctionCall
 	return true;
 }
 
-bool KviKvsObject_textedit::functionisUndoRedoEnabled(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionisUndoRedoEnabled(KviKvsObjectFunctionCall * c)
 {
 	if(widget())
 		c->returnValue()->setBoolean(((QTextEdit *)widget())->isUndoRedoEnabled());
@@ -537,7 +537,7 @@ bool KviKvsObject_textedit::functionisUndoRedoEnabled(KviKvsObjectFunctionCall *
 
 
 //-->Text & Color & Family
-bool KviKvsObject_textedit::functionsetText(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetText(KviKvsObjectFunctionCall * c)
 {
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -548,7 +548,7 @@ bool KviKvsObject_textedit::functionsetText(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionsetPlainText(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetPlainText(KviKvsObjectFunctionCall * c)
 {
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -559,7 +559,7 @@ bool KviKvsObject_textedit::functionsetPlainText(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionsetHtmlText(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetHtmlText(KviKvsObjectFunctionCall * c)
 {
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -570,7 +570,7 @@ bool KviKvsObject_textedit::functionsetHtmlText(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionsetColor(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetColor(KviKvsObjectFunctionCall * c)
 {
 	KviKvsVariant * pColArray;
 	kvs_int_t iColR,iColG,iColB;
@@ -641,7 +641,7 @@ bool KviKvsObject_textedit::functionsetColor(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionsetPointSize(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetPointSize(KviKvsObjectFunctionCall * c)
 {
 	kvs_real_t dPointSize;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -654,7 +654,7 @@ bool KviKvsObject_textedit::functionsetPointSize(KviKvsObjectFunctionCall * c)
 
 
 
-bool KviKvsObject_textedit::functionsetFamily(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetFamily(KviKvsObjectFunctionCall * c)
 {
 	QString szFamily;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -665,7 +665,7 @@ bool KviKvsObject_textedit::functionsetFamily(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionsetModified(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetModified(KviKvsObjectFunctionCall * c)
 {
 	bool bFlag;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -676,7 +676,7 @@ bool KviKvsObject_textedit::functionsetModified(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionModified(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionModified(KviKvsObjectFunctionCall * c)
 {
 	if(widget())
 		c->returnValue()->setBoolean(((QTextEdit *)widget())->document()->isModified());
@@ -684,7 +684,7 @@ bool KviKvsObject_textedit::functionModified(KviKvsObjectFunctionCall * c)
 }
 
 
-bool KviKvsObject_textedit::functiontextFormat(KviKvsObjectFunctionCall *c)
+bool KvsObject_textedit::functiontextFormat(KviKvsObjectFunctionCall *c)
 {
 	if(!widget())return true;
 	if(((QTextEdit *)widget())->acceptRichText())
@@ -694,7 +694,7 @@ bool KviKvsObject_textedit::functiontextFormat(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionsetTextFormat(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetTextFormat(KviKvsObjectFunctionCall * c)
 {
 	QString szFormat;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -712,7 +712,7 @@ bool KviKvsObject_textedit::functionsetTextFormat(KviKvsObjectFunctionCall * c)
 
 
 
-bool KviKvsObject_textedit::functionloadFile(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionloadFile(KviKvsObjectFunctionCall * c)
 {
 	QString szFile;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -740,7 +740,7 @@ bool KviKvsObject_textedit::functionloadFile(KviKvsObjectFunctionCall * c)
 	return true;
 }
 
-bool KviKvsObject_textedit::functionsetAlignment(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionsetAlignment(KviKvsObjectFunctionCall * c)
 {
 	QString szAlignment;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -762,7 +762,7 @@ bool KviKvsObject_textedit::functionsetAlignment(KviKvsObjectFunctionCall * c)
 
 
 
-bool KviKvsObject_textedit::functionlines(KviKvsObjectFunctionCall * c)
+bool KvsObject_textedit::functionlines(KviKvsObjectFunctionCall * c)
 {
 	if(widget())
 		c->returnValue()->setInteger(((QTextEdit *)widget())->document()->blockCount());
@@ -772,7 +772,7 @@ bool KviKvsObject_textedit::functionlines(KviKvsObjectFunctionCall * c)
 
 
 
-bool KviKvsObject_textedit::functionselectAll(KviKvsObjectFunctionCall *)
+bool KvsObject_textedit::functionselectAll(KviKvsObjectFunctionCall *)
 {
 	if (widget())
 		((QTextEdit *)widget())->selectAll();
@@ -781,5 +781,5 @@ bool KviKvsObject_textedit::functionselectAll(KviKvsObjectFunctionCall *)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_multilineedit.moc"
+#include "m_KvsObject_multiLineEdit.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_multilineedit.h b/src/modules/objects/KvsObject_multiLineEdit.h
index 86d47ab8f..aa264331a 100644
--- a/src/modules/objects/class_multilineedit.h
+++ b/src/modules/objects/KvsObject_multiLineEdit.h
@@ -2,7 +2,7 @@
 #define _CLASS_MULTILINEEDIT_H_
 //=============================================================================
 //
-//   File : class_multilineedit.cpp
+//   File : KvsObject_multiLineEdit.cpp
 //   Creation date : Mon Feb 19 2000 00:45:34 CET by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -26,14 +26,14 @@
 //=============================================================================
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_textedit : public KviKvsObject_widget
+class KvsObject_textedit : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_textedit)
+	KVSO_DECLARE_OBJECT(KvsObject_textedit)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index 5607b7d13..a73d7924e 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_painter.cpp
+//   File : KvsObject_painter.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //   Lucia Papini (^ashura^)  English Translation.
@@ -24,9 +24,9 @@
 //
 //=============================================================================
 
-#include "class_painter.h"
-#include "class_pixmap.h"
-#include "class_widget.h"
+#include "KvsObject_painter.h"
+#include "KvsObject_pixmap.h"
+#include "KvsObject_widget.h"
 
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -427,99 +427,99 @@ const char * const brushstyles_tbl[] = {
 */
 
 // ========================================================================
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_painter,"painter","object")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_painter,"painter","object")
 
 	// Fonts
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setFont)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setFontSize)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,fontAscent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,fontDescent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,fontMetricsHeight)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,fontMetricsWidth)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setFont)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setFontSize)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,fontAscent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,fontDescent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,fontMetricsHeight)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,fontMetricsWidth)
 
 	// Draws
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawRect)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawLine)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawRoundRect)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPoint)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawArc)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawEllipse)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPie)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawChord)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,fillRect)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawRect)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawLine)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawRoundRect)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawPoint)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawArc)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawEllipse)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawPie)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawChord)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,fillRect)
 
 	// Text & Pixmap & Icons
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPixmap)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawIcon)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawHtmlText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,htmlTextSize)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawPixmap)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawIcon)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawHtmlText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,htmlTextSize)
 
 
         // Transform Operation
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,rotate)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,shear)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,scale)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,translate)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,reset)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,rotate)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,shear)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,scale)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,translate)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,reset)
 
 
 
 	// ??
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setOpacity)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setTextAntialiasing)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setAntialiasing)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setSmoothPixmapTransform)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setBackGroundMode)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setOpacity)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setTextAntialiasing)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setAntialiasing)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setSmoothPixmapTransform)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setBackGroundMode)
 
 
 
 	// QPainterPath stuff
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,drawPath)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,resetPath)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathAddText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathMoveTo)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,pathLineTo)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,drawPath)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,resetPath)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,pathAddText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,pathMoveTo)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,pathLineTo)
 
 	// Pen
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenJoinStyle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenCapStyle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenWidth)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPenStyle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setPen)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,colorNames)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setPenJoinStyle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setPenCapStyle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setPenWidth)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setPenStyle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setPen)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,colorNames)
 
 
 	// Brush
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setBrush)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setBrushStyle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setBrush)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setBrushStyle)
 
 
 	// Gradients
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setGradientStart)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setGradientStop)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setGradientColor)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,setGradientAsBrush)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,clearGradient)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setGradientStart)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setGradientStop)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setGradientColor)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,setGradientAsBrush)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,clearGradient)
 
 	// painter state
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,save)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,restore)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,save)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,restore)
 
 	// painter device
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,painterDeviceWidth)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,painterDeviceHeight)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,begin)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,end)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,painterDeviceWidth)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,painterDeviceHeight)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,begin)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,end)
 
 	// extra
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_painter,beginPdf)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_painter,beginPdf)
 
 
-KVSO_END_REGISTERCLASS(KviKvsObject_painter)
+KVSO_END_REGISTERCLASS(KvsObject_painter)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_painter,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_painter,KviKvsObject)
 
 	m_pPainter = new QPainter();
         bDonotdeleteinternalqpainter=false;
@@ -528,9 +528,9 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_painter,KviKvsObject)
 	m_pPainterPath=0;
 	m_pGradient=0;
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_painter)
+KVSO_END_CONSTRUCTOR(KvsObject_painter)
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_painter)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_painter)
 
 if (m_pPainterPath) delete m_pPainterPath;
 	m_pPainterPath=0;
@@ -541,7 +541,7 @@ if (m_pPainter && !bDonotdeleteinternalqpainter) delete m_pPainter;
 if (m_pPrinter) delete m_pPrinter;
 	m_pPrinter = 0;
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_painter)
+KVSO_END_CONSTRUCTOR(KvsObject_painter)
 
 #define KVSO_PARAMETERS_PAINTER(__pXOrArray,__iY,__iW,__iH)\
 if(__pXOrArray->isArray())\
@@ -846,7 +846,7 @@ KVSO_CLASS_FUNCTION(painter,setBrush)
 			return true;
 		}
 		if(pObject->inheritsClass("pixmap"))
-			m_pPainter->setBrush(*((KviKvsObject_pixmap *)pObject)->getPixmap());
+			m_pPainter->setBrush(*((KvsObject_pixmap *)pObject)->getPixmap());
 		else c->warning(__tr2qs_ctx("Object Pixmap required!","objects"));
 		return true;
 	}
@@ -1083,8 +1083,8 @@ KVSO_CLASS_FUNCTION(painter,begin)
                     c->warning(__tr2qs_ctx("Pixmap or Widget parameter is not an object","objects"));
                     return true;
                 }
-                if(pObject->inheritsClass("pixmap"))pd=((KviKvsObject_pixmap *)pObject)->getPixmap();
-                else if (pObject->inheritsClass("widget")) pd=((KviKvsObject_widget *)pObject)->widget();
+                if(pObject->inheritsClass("pixmap"))pd=((KvsObject_pixmap *)pObject)->getPixmap();
+                else if (pObject->inheritsClass("widget")) pd=((KvsObject_widget *)pObject)->widget();
                 else
                 {
                     c->warning(__tr2qs_ctx("Widget or Pixmap required ","objects"));
@@ -1097,15 +1097,15 @@ KVSO_CLASS_FUNCTION(painter,begin)
                 return true;
        }
        attachDevice(pObject,pd);
-            //if (pObject->inheritsClass("pixmap")) ((KviKvsObject_pixmap *)pObject)->pixmapChanged();
+            //if (pObject->inheritsClass("pixmap")) ((KvsObject_pixmap *)pObject)->pixmapChanged();
        return true;
 }
 
-void KviKvsObject_painter::attachDevice(KviKvsObject * o,QPaintDevice * p)
+void KvsObject_painter::attachDevice(KviKvsObject * o,QPaintDevice * p)
 {
 	if(m_pDeviceObject)detachDevice();
 	m_pDeviceObject = o;
-	// KviKvsObject_pixmap and KviKvsObject_widget object have this signal
+	// KvsObject_pixmap and KvsObject_widget object have this signal
 	// it is emitted BEFORE the real QPaintDevice is deleted, so we can eventually
 	// call m_pPainter->end() in time
 
@@ -1113,7 +1113,7 @@ void KviKvsObject_painter::attachDevice(KviKvsObject * o,QPaintDevice * p)
 	m_pPainter->begin(p);
 }
 
-void KviKvsObject_painter::detachDevice()
+void KvsObject_painter::detachDevice()
 {
 	if(!m_pDeviceObject)return;
 	disconnect(m_pDeviceObject,SIGNAL(aboutToDie()),this,SLOT(detachDevice()));
@@ -1213,7 +1213,7 @@ KVSO_CLASS_FUNCTION(painter,drawPixmap)
 		return true;
 	}
 
-	m_pPainter->drawPixmap(QPointF(iX,iY),*((KviKvsObject_pixmap *)obj)->getPixmap(),QRect(iStartx,iStarty,iEndx,iEndy));
+	m_pPainter->drawPixmap(QPointF(iX,iY),*((KvsObject_pixmap *)obj)->getPixmap(),QRect(iStartx,iStarty,iEndx,iEndy));
 	return true;
 }
 
@@ -1727,12 +1727,12 @@ KVSO_CLASS_FUNCTION(painter,resetPath)
 	}
 	return true;
 }
-void KviKvsObject_painter::setInternalPainter(QPainter *p)
+void KvsObject_painter::setInternalPainter(QPainter *p)
 {
     delete m_pPainter;
     m_pPainter=p;
     bDonotdeleteinternalqpainter=true;
 }
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_painter.moc"
+#include "m_KvsObject_painter.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_painter.h b/src/modules/objects/KvsObject_painter.h
index 7e05cbab7..e8529dfb0 100644
--- a/src/modules/objects/class_painter.h
+++ b/src/modules/objects/KvsObject_painter.h
@@ -2,7 +2,7 @@
 #define _CLASS_PAINTER_H_
 //=============================================================================
 //
-//   File : class_painter.h
+//   File : KvsObject_painter.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -34,11 +34,11 @@
 #include "object_macros.h"
 
 
-class KviKvsObject_painter : public KviKvsObject
+class KvsObject_painter : public KviKvsObject
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_painter)
+	KVSO_DECLARE_OBJECT(KvsObject_painter)
 protected:
 	QPrinter * m_pPrinter;
         bool bDonotdeleteinternalqpainter;
diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index 592582676..64128ef5d 100644
--- a/src/modules/objects/class_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_pixmap.cpp
+//   File : KvsObject_pixmap.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,10 +23,10 @@
 //
 //=============================================================================
 
-#include "class_pixmap.h"
-#include "class_widget.h"
+#include "KvsObject_pixmap.h"
+#include "KvsObject_widget.h"
 
-#include "class_memorybuffer.h"
+#include "KvsObject_memoryBuffer.h"
 #include "KviAnimatedPixmap.h"
 
 #include "kvi_debug.h"
@@ -85,36 +85,36 @@
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_pixmap,"pixmap","object")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_pixmap,"pixmap","object")
 
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,fill)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,resize)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,scale)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,load)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,loadAnimation)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,save)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,startAnimation)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,stopAnimation)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,loadFromMemoryBuffer)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,height)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,width)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,grabWidget)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_pixmap,frameChangedEvent)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,fill)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,resize)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,scale)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,load)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,loadAnimation)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,save)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,startAnimation)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,stopAnimation)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,loadFromMemoryBuffer)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,height)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,width)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,grabWidget)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_pixmap,frameChangedEvent)
 
-KVSO_END_REGISTERCLASS(KviKvsObject_pixmap)
+KVSO_END_REGISTERCLASS(KvsObject_pixmap)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_pixmap,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_pixmap,KviKvsObject)
         m_pAnimatedPixmap = 0;
         m_pPixmap = 0;
-KVSO_END_CONSTRUCTOR(KviKvsObject_pixmap)
+KVSO_END_CONSTRUCTOR(KvsObject_pixmap)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_pixmap)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_pixmap)
         emit aboutToDie();
         if (m_pPixmap)delete m_pPixmap;
         if (m_pAnimatedPixmap) delete m_pAnimatedPixmap;
-KVSO_END_CONSTRUCTOR(KviKvsObject_pixmap)
+KVSO_END_CONSTRUCTOR(KvsObject_pixmap)
 
 
 KVSO_CLASS_FUNCTION(pixmap,fill)
@@ -284,7 +284,7 @@ KVSO_CLASS_FUNCTION(pixmap,loadFromMemoryBuffer)
             m_pAnimatedPixmap=0;
         }
         if (!m_pPixmap) m_pPixmap=new QPixmap();
-        m_pPixmap->loadFromData(((KviKvsObject_memorybuffer *)pObject)->dataBuffer());
+        m_pPixmap->loadFromData(((KvsObject_memoryBuffer *)pObject)->dataBuffer());
         return true;
 }
 
@@ -303,7 +303,7 @@ KVSO_CLASS_FUNCTION(pixmap,grabWidget)
             m_pAnimatedPixmap=0;
         }
         if (!m_pPixmap) m_pPixmap=new QPixmap();
-        *m_pPixmap=QPixmap::grabWidget(((KviKvsObject_widget *)pObject)->widget());
+        *m_pPixmap=QPixmap::grabWidget(((KvsObject_widget *)pObject)->widget());
   /*          QString szFileName;
             KVSO_PARAMETERS_BEGIN(c)
                         KVSO_PARAMETER("file_name",KVS_PT_STRING,0,szFileName)
@@ -335,7 +335,7 @@ KVSO_CLASS_FUNCTION(pixmap,width)
         return true;
 }
 
-QPixmap * KviKvsObject_pixmap::getPixmap()
+QPixmap * KvsObject_pixmap::getPixmap()
 {
         if (!m_pAnimatedPixmap && !m_pPixmap) return new QPixmap();
         else if(m_pAnimatedPixmap) return m_pAnimatedPixmap->pixmap();
@@ -348,13 +348,13 @@ KVSO_CLASS_FUNCTION(pixmap,frameChangedEvent)
 }
 
 // slots
-void KviKvsObject_pixmap::frameChanged()
+void KvsObject_pixmap::frameChanged()
 {
         KviKvsVariantList *params=0;
         callFunction(this,"frameChangedEvent",params);
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_pixmap.moc"
+#include "m_KvsObject_pixmap.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_pixmap.h b/src/modules/objects/KvsObject_pixmap.h
index 0ef01fee4..a1e2eeb3a 100644
--- a/src/modules/objects/class_pixmap.h
+++ b/src/modules/objects/KvsObject_pixmap.h
@@ -2,7 +2,7 @@
 #define	_CLASS_PIXMAP_H_
 //=============================================================================
 //
-//   File : class_pixmap.h
+//   File : KvsObject_pixmap.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -37,12 +37,12 @@
 #include "object_macros.h"
 
 
-class KviKvsObject_pixmap : public KviKvsObject
+class KvsObject_pixmap : public KviKvsObject
 {
 	Q_OBJECT
 //	Q_PROPERTY(QPixmap pixmap READ getPixmap)
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_pixmap)
+	KVSO_DECLARE_OBJECT(KvsObject_pixmap)
 	QPixmap  * getPixmap();
 
             //QPixmap * pixmap(){ return m_pPixmap; }
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp
index bc5195bc3..25cc28cac 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/KvsObject_popupMenu.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_popupmenu.cpp
+//   File : KvsObject_popupMenu.cpp
 //   Creation date : Fri Mar 18 21:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -24,7 +24,7 @@
 //=============================================================================
 
 
-#include "class_popupmenu.h"
+#include "KvsObject_popupMenu.h"
 
 #include "KviError.h"
 #include "kvi_debug.h"
@@ -197,30 +197,30 @@ static void removeAction(int idx)
 }
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_popupmenu,"popupmenu","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,insertItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,setTitle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,exec)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,insertSeparator)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,removeItem)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,addMenu)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_popupMenu,"popupmenu","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,insertItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,setTitle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,exec)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,insertSeparator)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,removeItem)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,addMenu)
 
 	// events
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,highlightedEvent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_popupmenu,activatedEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,highlightedEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_popupMenu,activatedEvent)
 
-KVSO_END_REGISTERCLASS(KviKvsObject_popupmenu)
+KVSO_END_REGISTERCLASS(KvsObject_popupMenu)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_popupmenu,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_popupMenu,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu)
+KVSO_END_CONSTRUCTOR(KvsObject_popupMenu)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_popupmenu)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_popupMenu)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu)
+KVSO_END_CONSTRUCTOR(KvsObject_popupMenu)
 
-bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_popupMenu::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
         SET_OBJECT(QMenu)
 	connect(widget(),SIGNAL(triggered(QAction *)),this,SLOT(slottriggered(QAction *)));
@@ -229,7 +229,7 @@ bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(popupmenu,insertItem)
+KVSO_CLASS_FUNCTION(popupMenu,insertItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szItem,szIcon;
@@ -252,7 +252,7 @@ KVSO_CLASS_FUNCTION(popupmenu,insertItem)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(popupmenu,setTitle)
+KVSO_CLASS_FUNCTION(popupMenu,setTitle)
 {
 	QString szTitle;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -264,7 +264,7 @@ KVSO_CLASS_FUNCTION(popupmenu,setTitle)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(popupmenu,exec)
+KVSO_CLASS_FUNCTION(popupMenu,exec)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	if(!c->params()->count())
@@ -291,7 +291,7 @@ KVSO_CLASS_FUNCTION(popupmenu,exec)
 
 
 
-KVSO_CLASS_FUNCTION(popupmenu,addMenu)
+KVSO_CLASS_FUNCTION(popupMenu,addMenu)
 {
         CHECK_INTERNAL_POINTER(widget())
         KviKvsObject *pObject;
@@ -330,7 +330,7 @@ KVSO_CLASS_FUNCTION(popupmenu,addMenu)
         return true;
 }
 
-KVSO_CLASS_FUNCTION(popupmenu,removeItem)
+KVSO_CLASS_FUNCTION(popupMenu,removeItem)
 {
 	CHECK_INTERNAL_POINTER(widget())
         kvs_int_t iIdx;
@@ -346,7 +346,7 @@ KVSO_CLASS_FUNCTION(popupmenu,removeItem)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(popupmenu,insertSeparator)
+KVSO_CLASS_FUNCTION(popupMenu,insertSeparator)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iIndex;
@@ -358,23 +358,23 @@ KVSO_CLASS_FUNCTION(popupmenu,insertSeparator)
 	return true;
 }
 
-void KviKvsObject_popupmenu::slothighlighted(int i)
+void KvsObject_popupMenu::slothighlighted(int i)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i));
 	callFunction(this,"highlightedEvent",&params);
 }
-void KviKvsObject_popupmenu::aboutToDie(QObject *pObject)
+void KvsObject_popupMenu::aboutToDie(QObject *pObject)
 {
         qDebug("Removing popup from kvs dict");
         removeMenuAllActions((QMenu *)pObject);
 }
-KVSO_CLASS_FUNCTION(popupmenu,highlightedEvent)
+KVSO_CLASS_FUNCTION(popupMenu,highlightedEvent)
 {
 	emitSignal("highlighted",c,c->params());
 	return true;
 }
 
-void KviKvsObject_popupmenu::slottriggered(QAction *a)
+void KvsObject_popupMenu::slottriggered(QAction *a)
 {
 	QHashIterator<int, QAction *> i(actionsDict);
 	while (i.hasNext())
@@ -386,7 +386,7 @@ void KviKvsObject_popupmenu::slottriggered(QAction *a)
 	callFunction(this,"activatedEvent",&params);
 }
 
-KVSO_CLASS_FUNCTION(popupmenu,activatedEvent)
+KVSO_CLASS_FUNCTION(popupMenu,activatedEvent)
 {
 	emitSignal("activated",c,c->params());
 	return true;
@@ -394,5 +394,5 @@ KVSO_CLASS_FUNCTION(popupmenu,activatedEvent)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_popupmenu.moc"
+#include "m_KvsObject_popupMenu.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_popupmenu.h b/src/modules/objects/KvsObject_popupMenu.h
index 3e87cc843..95e1a023a 100644
--- a/src/modules/objects/class_popupmenu.h
+++ b/src/modules/objects/KvsObject_popupMenu.h
@@ -2,7 +2,7 @@
 #define _CLASS_POPUPMENU_H_
 //=============================================================================
 //
-//   File : class_popupmenu.h
+//   File : KvsObject_popupMenu.h
 //   Creation date : Fri Mar 18 21:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -26,7 +26,7 @@
 //=============================================================================
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 #include <QHash>
 #include <QMenu>
@@ -34,11 +34,11 @@
 
 
 
-class KviKvsObject_popupmenu : public KviKvsObject_widget
+class KvsObject_popupMenu : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_popupmenu)
+	KVSO_DECLARE_OBJECT(KvsObject_popupMenu)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/KvsObject_process.cpp
index db53beed2..7934127c6 100644
--- a/src/modules/objects/class_process.cpp
+++ b/src/modules/objects/KvsObject_process.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_process.cpp
+//   File : KvsObject_process.cpp
 //   Creation date : Fri Mar 18 21:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "class_process.h"
+#include "KvsObject_process.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "kvi_settings.h"
@@ -159,40 +159,40 @@
 		This signal is emitted by the default implementation of [classfnc]$readyReadStderrEvent[/classfnc]().
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_process,"process","object")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_process,"process","object")
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,addArgument);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,startProcess);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,readStdout);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,readStderr);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,writeToStdin);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,closekill);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,kill);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,tryTerminate);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,closeStdin);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,isRunning);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,normalExit);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,addArgument);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,startProcess);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,readStdout);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,readStderr);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,writeToStdin);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,closekill);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,kill);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,tryTerminate);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,closeStdin);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,isRunning);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,normalExit);
 
   // Events
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,readyReadStdoutEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_process,readyReadStderrEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,readyReadStdoutEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_process,readyReadStderrEvent);
 
-  KVSO_END_REGISTERCLASS(KviKvsObject_process)
+  KVSO_END_REGISTERCLASS(KvsObject_process)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_process,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_process,KviKvsObject)
 
 	m_pProcess = new QProcess();
 	connect(m_pProcess,SIGNAL(readyReadStandardOutput()),this,SLOT(slotReadStdout()));
 	connect(m_pProcess,SIGNAL(readyReadStandardError()),this,SLOT(slotReadStderr()));
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_process)
+KVSO_END_CONSTRUCTOR(KvsObject_process)
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_process)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_process)
 
 	delete m_pProcess;
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_process)
+KVSO_END_CONSTRUCTOR(KvsObject_process)
 
 
 
@@ -305,19 +305,19 @@ KVSO_CLASS_FUNCTION(process,normalExit)
 	return true;
 }
 
-void KviKvsObject_process::slotReadStdout()
+void KvsObject_process::slotReadStdout()
 {
 	KviKvsVariantList *params=0;
 	callFunction(this,"readyReadStdoutEvent",params);
 }
 
-void KviKvsObject_process::slotReadStderr()
+void KvsObject_process::slotReadStderr()
 {
 	KviKvsVariantList *params=0;
 	callFunction(this,"readyReadStderrEvent",params);
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_process.moc"
+#include "m_KvsObject_process.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_process.h b/src/modules/objects/KvsObject_process.h
index 3e1fa9cbd..f2726f225 100644
--- a/src/modules/objects/class_process.h
+++ b/src/modules/objects/KvsObject_process.h
@@ -2,7 +2,7 @@
 #define _CLASS_PROCESS_H_
 //=============================================================================
 //
-//   File : class_process.h
+//   File : KvsObject_process.h
 //   Creation date : Fri Mar 18 21:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -27,18 +27,18 @@
 
 
 #include <QTimer>
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 
 
 #include "object_macros.h"
 #include "QProcess"
 
 
-class KviKvsObject_process : public KviKvsObject
+class KvsObject_process : public KviKvsObject
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_process)
+	KVSO_DECLARE_OBJECT(KvsObject_process)
 protected:
 	QProcess * m_pProcess;
 private:
diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/KvsObject_progressBar.cpp
index f09eb8c2d..07cddba24 100644
--- a/src/modules/objects/class_progressbar.cpp
+++ b/src/modules/objects/KvsObject_progressBar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_progressbar.cpp
+//   File : KvsObject_progressBar.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "class_progressbar.h"
+#include "KvsObject_progressBar.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 
@@ -67,30 +67,30 @@
 		See also [classfnc]$setPercentageVisible[/classfnc]()
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_progressbar,"progressbar","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,setProgress)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,setFormat)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,setTotalSteps)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,reset)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,setPercentageVisible)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_progressbar,percentageVisible)
-KVSO_END_REGISTERCLASS(KviKvsObject_progressbar)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_progressBar,"progressbar","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_progressBar,setProgress)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_progressBar,setFormat)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_progressBar,setTotalSteps)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_progressBar,reset)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_progressBar,setPercentageVisible)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_progressBar,percentageVisible)
+KVSO_END_REGISTERCLASS(KvsObject_progressBar)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_progressbar,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_progressBar,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_progressbar)
+KVSO_END_CONSTRUCTOR(KvsObject_progressBar)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_progressbar)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_progressBar)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_progressbar)
+KVSO_END_CONSTRUCTOR(KvsObject_progressBar)
 
-bool KviKvsObject_progressbar::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_progressBar::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT (QProgressBar)
 	return true;
 }
-KVSO_CLASS_FUNCTION(progressbar,setProgress)
+KVSO_CLASS_FUNCTION(progressBar,setProgress)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iValue;
@@ -101,7 +101,7 @@ KVSO_CLASS_FUNCTION(progressbar,setProgress)
     return true;
 }
 
-KVSO_CLASS_FUNCTION(progressbar,setTotalSteps)
+KVSO_CLASS_FUNCTION(progressBar,setTotalSteps)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iMax;
@@ -112,7 +112,7 @@ KVSO_CLASS_FUNCTION(progressbar,setTotalSteps)
     return true;
 }
 
-KVSO_CLASS_FUNCTION(progressbar,reset)
+KVSO_CLASS_FUNCTION(progressBar,reset)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QProgressBar *)widget())->reset();
@@ -120,7 +120,7 @@ KVSO_CLASS_FUNCTION(progressbar,reset)
 }
 
 
-KVSO_CLASS_FUNCTION(progressbar,setPercentageVisible)
+KVSO_CLASS_FUNCTION(progressBar,setPercentageVisible)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
@@ -130,7 +130,7 @@ KVSO_CLASS_FUNCTION(progressbar,setPercentageVisible)
 	((QProgressBar *)widget())->setTextVisible(bEnabled);
 	return true;
 }
-KVSO_CLASS_FUNCTION(progressbar,setFormat)
+KVSO_CLASS_FUNCTION(progressBar,setFormat)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szFormat;
@@ -140,7 +140,7 @@ KVSO_CLASS_FUNCTION(progressbar,setFormat)
 	((QProgressBar *)widget())->setFormat(szFormat);
 	return true;
 }
-KVSO_CLASS_FUNCTION(progressbar,percentageVisible)
+KVSO_CLASS_FUNCTION(progressBar,percentageVisible)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((QProgressBar *)widget())->isTextVisible());
diff --git a/src/modules/objects/class_progressbar.h b/src/modules/objects/KvsObject_progressBar.h
index 5d233fcf2..9b27177e1 100644
--- a/src/modules/objects/class_progressbar.h
+++ b/src/modules/objects/KvsObject_progressBar.h
@@ -2,7 +2,7 @@
 #define _CLASS_PROGRESSBAR_H_
 //=============================================================================
 //
-//   File : class_progressbar.h
+//   File : KvsObject_progressBar.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -26,13 +26,13 @@
 //=============================================================================
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_progressbar : public KviKvsObject_widget
+class KvsObject_progressBar : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_progressbar)
+	KVSO_DECLARE_OBJECT(KvsObject_progressBar)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/KvsObject_radioButton.cpp
index 314f78773..1b8be1a93 100644
--- a/src/modules/objects/class_radiobutton.cpp
+++ b/src/modules/objects/KvsObject_radioButton.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_radiobutton.cpp
+//   File : KvsObject_radioButton.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "class_radiobutton.h"
+#include "KvsObject_radioButton.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -64,32 +64,32 @@
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_radiobutton,"radiobutton","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_radioButton,"radiobutton","widget")
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_radiobutton,setText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_radiobutton,setChecked)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_radiobutton,isChecked)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_radiobutton,setImage)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_radiobutton,toggleEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_radioButton,setText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_radioButton,setChecked)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_radioButton,isChecked)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_radioButton,setImage)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_radioButton,toggleEvent)
 
-KVSO_END_REGISTERCLASS(KviKvsObject_radiobutton)
+KVSO_END_REGISTERCLASS(KvsObject_radioButton)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_radiobutton,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_radioButton,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_radiobutton)
+KVSO_END_CONSTRUCTOR(KvsObject_radioButton)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_radiobutton)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_radioButton)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_radiobutton)
+KVSO_END_CONSTRUCTOR(KvsObject_radioButton)
 
-bool KviKvsObject_radiobutton::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_radioButton::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QRadioButton)
 	connect(widget(),SIGNAL(toggled(bool)),this,SLOT(toggled(bool)));
 	return true;
 }
-KVSO_CLASS_FUNCTION(radiobutton,setText)
+KVSO_CLASS_FUNCTION(radioButton,setText)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szText;
@@ -99,14 +99,14 @@ KVSO_CLASS_FUNCTION(radiobutton,setText)
 	((QRadioButton *)widget())->setText(szText);
 	return true;
 }
-KVSO_CLASS_FUNCTION(radiobutton,isChecked)
+KVSO_CLASS_FUNCTION(radioButton,isChecked)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((QRadioButton *)widget())->isChecked());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(radiobutton,setChecked)
+KVSO_CLASS_FUNCTION(radioButton,setChecked)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bChecked;
@@ -116,7 +116,7 @@ KVSO_CLASS_FUNCTION(radiobutton,setChecked)
 	((QRadioButton *)widget())->setChecked(bChecked);
 	return true;
 }
-KVSO_CLASS_FUNCTION(radiobutton,setImage)
+KVSO_CLASS_FUNCTION(radioButton,setImage)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString icon;
@@ -127,13 +127,13 @@ KVSO_CLASS_FUNCTION(radiobutton,setImage)
 	if(pix)((QRadioButton *)widget())->setIcon(*pix);
 	return true;
 }
-KVSO_CLASS_FUNCTION(radiobutton,toggleEvent)
+KVSO_CLASS_FUNCTION(radioButton,toggleEvent)
 {
 	emitSignal("toggled",c,c->params());
 	return true;
 }
 
-void KviKvsObject_radiobutton::toggled(bool b)
+void KvsObject_radioButton::toggled(bool b)
 {
 	KviKvsVariantList params(new KviKvsVariant(b));
 	callFunction(this,"toggleEvent",&params);
@@ -141,6 +141,6 @@ void KviKvsObject_radiobutton::toggled(bool b)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_radiobutton.moc"
+#include "m_KvsObject_radioButton.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_radiobutton.h b/src/modules/objects/KvsObject_radioButton.h
index 8a09084ae..00cdb9f6a 100644
--- a/src/modules/objects/class_radiobutton.h
+++ b/src/modules/objects/KvsObject_radioButton.h
@@ -2,7 +2,7 @@
 #define _CLASS_RADIOBUTTON_H_
 //=============================================================================
 //
-//   File : class_radiobutton.h
+//   File : KvsObject_radioButton.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -25,14 +25,14 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_radiobutton : public KviKvsObject_widget
+class KvsObject_radioButton : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_radiobutton)
+	KVSO_DECLARE_OBJECT(KvsObject_radioButton)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/KvsObject_slider.cpp
index 1e51a150c..7bf2f4923 100644
--- a/src/modules/objects/class_slider.cpp
+++ b/src/modules/objects/KvsObject_slider.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_slider.cpp
+//   File : KvsObject_slider.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "class_slider.h"
+#include "KvsObject_slider.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -100,38 +100,38 @@
 
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_slider,"slider","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_slider,"slider","widget")
 
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setTracking);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setValue);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setMinValue);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setMaxValue);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setLineStep);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setPageStep);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setTickInterval);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,value);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,minValue);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,maxValue);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,lineStep);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,pageStep);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setTickmarks);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,setOrientation);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,setTracking);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,setValue);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,setMinValue);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,setMaxValue);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,setLineStep);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,setPageStep);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,setTickInterval);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,value);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,minValue);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,maxValue);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,lineStep);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,pageStep);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,setTickmarks);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,setOrientation);
 
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_slider,valueChangedEvent);
-KVSO_END_REGISTERCLASS(KviKvsObject_slider)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_slider,valueChangedEvent);
+KVSO_END_REGISTERCLASS(KvsObject_slider)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_slider,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_slider,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_slider)
+KVSO_END_CONSTRUCTOR(KvsObject_slider)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_slider)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_slider)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_slider)
+KVSO_END_CONSTRUCTOR(KvsObject_slider)
 
-bool KviKvsObject_slider::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_slider::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QSlider)
 	connect(widget(),SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
@@ -288,7 +288,7 @@ KVSO_CLASS_FUNCTION(slider,valueChangedEvent)
 	return true;
 }
 
-void KviKvsObject_slider::valueChanged(int value)
+void KvsObject_slider::valueChanged(int value)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value));
 	callFunction(this,"valueChangedEvent",&params);
@@ -296,6 +296,6 @@ void KviKvsObject_slider::valueChanged(int value)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_slider.moc"
+#include "m_KvsObject_slider.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_slider.h b/src/modules/objects/KvsObject_slider.h
index e3a36d8b9..7474d0db0 100644
--- a/src/modules/objects/class_slider.h
+++ b/src/modules/objects/KvsObject_slider.h
@@ -2,7 +2,7 @@
 #define _CLASS_SLIDER_H_
 //=============================================================================
 //
-//   File : class_slider.h
+//   File : KvsObject_slider.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -25,14 +25,14 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_slider : public KviKvsObject_widget
+class KvsObject_slider : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_slider)
+	KVSO_DECLARE_OBJECT(KvsObject_slider)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index 9195f044e..6c40f8ea2 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_socket.cpp
+//   File : KvsObject_socket.cpp
 //   Creation date : Sun Nov 11 03:13:45 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "class_socket.h"
-#include "class_memorybuffer.h"
-#include "class_file.h"
+#include "KvsObject_socket.h"
+#include "KvsObject_memoryBuffer.h"
+#include "KvsObject_file.h"
 
 #include "kvi_settings.h"
 #include "KviQString.h"
@@ -260,34 +260,34 @@
 		[/example]
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_socket,"socket","object")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_socket,"socket","object")
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,status)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,remotePort)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,remoteIp)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,localIp)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,localPort)
-	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"connect",functionConnect)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,connectTimeout)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,setConnectTimeout)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,close)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,read)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,write)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,status)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,remotePort)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,remoteIp)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,localIp)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,localPort)
+	KVSO_REGISTER_HANDLER(KvsObject_socket,"connect",functionConnect)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,connectTimeout)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,setConnectTimeout)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,close)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,read)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,write)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,setProtocol)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,listen)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,accept)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,setProtocol)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,listen)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_socket,accept)
 
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_socket,"connectEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_socket,"connectFailedEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_socket,"disconnectEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_socket,"dataAvailableEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_socket,"incomingConnectionEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_socket,"connectEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_socket,"connectFailedEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_socket,"disconnectEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_socket,"dataAvailableEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_socket,"incomingConnectionEvent")
 
-KVSO_END_REGISTERCLASS(KviKvsObject_socket)
+KVSO_END_REGISTERCLASS(KvsObject_socket)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_socket,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_socket,KviKvsObject)
 	m_bUdp = false;
 	m_uConnectionId = 0;
 	m_sock = KVI_INVALID_SOCKET;
@@ -307,9 +307,9 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_socket,KviKvsObject)
 	m_uLocalPort = 0;
 	m_secondarySock = KVI_INVALID_SOCKET;
 	connect(m_pFlushTimer,SIGNAL(timeout()),this,SLOT(tryFlush()));
-KVSO_END_CONSTRUCTOR(KviKvsObject_socket)
+KVSO_END_CONSTRUCTOR(KvsObject_socket)
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_socket)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_socket)
 	delete m_pOutBuffer;
 	delete m_pFlushTimer;
 	m_pOutBuffer=0;
@@ -322,7 +322,7 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_socket)
 	if(m_pSn)delete m_pSn;
 	if(m_sock != KVI_INVALID_SOCKET)kvi_socket_close(m_sock);
 	if(m_secondarySock != KVI_INVALID_SOCKET)kvi_socket_close(m_secondarySock);
-KVSO_END_DESTRUCTOR(KviKvsObject_socket)
+KVSO_END_DESTRUCTOR(KvsObject_socket)
 //----------------------
 
 
@@ -384,7 +384,7 @@ KVSO_CLASS_FUNCTION(socket,localIp)
 	return true;
 }
 
-unsigned int KviKvsObject_socket::readGetLength(KviKvsObjectFunctionCall * c)
+unsigned int KvsObject_socket::readGetLength(KviKvsObjectFunctionCall * c)
 {
 	kvs_uint_t uLen;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -414,14 +414,14 @@ KVSO_CLASS_FUNCTION(socket,read)
 		}
 		if(pObject->inheritsClass("memorybuffer"))
 		{
-			QByteArray *pBuffer=((KviKvsObject_memorybuffer *)pObject)->pBuffer();
+			QByteArray *pBuffer=((KvsObject_memoryBuffer *)pObject)->pBuffer();
 			int oldsize=pBuffer->size();
 			pBuffer->resize(oldsize+uLen);
 			KviMemory::move(pBuffer->data()+oldsize,m_pInBuffer,uLen);
 
 		} else if(pObject->inheritsClass("file"))
 		{
-			KviFile *pFile=((KviKvsObject_file *)pObject)->file();
+			KviFile *pFile=((KvsObject_file *)pObject)->file();
 			if (!pFile->isOpen())
 			{
 				c->warning(__tr2qs_ctx("File is not open!","objects"));
@@ -474,11 +474,11 @@ KVSO_CLASS_FUNCTION(socket,write)
 		}
 		if(pObject->inheritsClass("memorybuffer"))
 		{
-			QByteArray *p=((KviKvsObject_memorybuffer *)pObject)->pBuffer();
+			QByteArray *p=((KvsObject_memoryBuffer *)pObject)->pBuffer();
 			m_pOutBuffer->append((const unsigned char *)p->data(),p->size());
 		} else if(pObject->inheritsClass("file"))
 		{
-			KviFile * pFile = ((KviKvsObject_file *)pObject)->file();
+			KviFile * pFile = ((KvsObject_file *)pObject)->file();
 			if(!pFile->isOpen())
 			{
 				c->warning(__tr2qs_ctx("File is not open!","objects"));
@@ -576,7 +576,7 @@ KVSO_CLASS_FUNCTION(socket,accept)
 
 	if(m_secondarySock != KVI_INVALID_SOCKET)
 	{
-		((KviKvsObject_socket *)pObject)->acceptConnection(m_secondarySock,m_uSecondaryPort,m_szSecondaryIp.toUtf8().data());
+		((KvsObject_socket *)pObject)->acceptConnection(m_secondarySock,m_uSecondaryPort,m_szSecondaryIp.toUtf8().data());
 
 		m_secondarySock = KVI_INVALID_SOCKET;
 		m_uSecondaryPort = 0;
@@ -789,7 +789,7 @@ KVSO_CLASS_FUNCTION(socket,listen)
 	return true;
 }
 
-void KviKvsObject_socket::incomingConnection(int)
+void KvsObject_socket::incomingConnection(int)
 {
 #ifdef COMPILE_IPV6_SUPPORT
 	struct sockaddr_in6 hostSockAddr6;
@@ -839,7 +839,7 @@ void KviKvsObject_socket::incomingConnection(int)
 	} // else..huh ?... wait for the next notifier call
 }
 
-void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const char * szIp)
+void KvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const char * szIp)
 {
 	reset();
 	m_sock = s;
@@ -866,7 +866,7 @@ void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const
 	m_pSn->setEnabled(true);
 }
 
-void KviKvsObject_socket::delayedConnect()
+void KvsObject_socket::delayedConnect()
 {
 	if(m_pDelayTimer)delete m_pDelayTimer;
 	m_pDelayTimer = new QTimer();
@@ -876,7 +876,7 @@ void KviKvsObject_socket::delayedConnect()
 	m_pDelayTimer->start();
 }
 
-void KviKvsObject_socket::doConnect()
+void KvsObject_socket::doConnect()
 {
 	qDebug("doConnect function");
 	if(m_pDelayTimer)delete m_pDelayTimer;
@@ -973,7 +973,7 @@ qDebug("Socket created");
 	m_pSn->setEnabled(true);
 }
 
-void KviKvsObject_socket::connectTimeoutSlot()
+void KvsObject_socket::connectTimeoutSlot()
 {
 	unsigned int uOldConnectionId = m_uConnectionId;
 	KviKvsVariantList lParams;
@@ -983,7 +983,7 @@ void KviKvsObject_socket::connectTimeoutSlot()
 	// else it has already been called!
 }
 
-void KviKvsObject_socket::delayedLookupRemoteIp()
+void KvsObject_socket::delayedLookupRemoteIp()
 {
 	if(m_pDelayTimer)delete m_pDelayTimer;
 	m_pDelayTimer = new QTimer();
@@ -994,7 +994,7 @@ void KviKvsObject_socket::delayedLookupRemoteIp()
 	m_pDelayTimer->start();
 }
 
-void KviKvsObject_socket::lookupRemoteIp()
+void KvsObject_socket::lookupRemoteIp()
 {
 	qDebug("Resolve dns");
 	if(m_pDelayTimer)delete m_pDelayTimer;
@@ -1013,7 +1013,7 @@ void KviKvsObject_socket::lookupRemoteIp()
 	}
 }
 
-void KviKvsObject_socket::lookupDone(KviDnsResolver *pDns)
+void KvsObject_socket::lookupDone(KviDnsResolver *pDns)
 {
 
 	if(pDns->state() != KviDnsResolver::Success)
@@ -1035,7 +1035,7 @@ void KviKvsObject_socket::lookupDone(KviDnsResolver *pDns)
 	doConnect();
 }
 
-void KviKvsObject_socket::writeNotifierFired(int)
+void KvsObject_socket::writeNotifierFired(int)
 {
 	if(m_pSn)
 	{
@@ -1095,7 +1095,7 @@ void KviKvsObject_socket::writeNotifierFired(int)
 	}
 }
 
-void KviKvsObject_socket::readNotifierFired(int)
+void KvsObject_socket::readNotifierFired(int)
 {
 	//read da
 	if((m_uInBufferLen - m_uInDataLen) < KVI_READ_CHUNK)
@@ -1165,7 +1165,7 @@ void KviKvsObject_socket::readNotifierFired(int)
 	}
 }
 
-void KviKvsObject_socket::eatInData(unsigned int uLen)
+void KvsObject_socket::eatInData(unsigned int uLen)
 {
 	if(uLen > m_uInDataLen)uLen = m_uInDataLen;
 
@@ -1185,13 +1185,13 @@ void KviKvsObject_socket::eatInData(unsigned int uLen)
 	}
 }
 
-void KviKvsObject_socket::delayedFlush(unsigned int uTimeout)
+void KvsObject_socket::delayedFlush(unsigned int uTimeout)
 {
 	if(m_pFlushTimer->isActive())m_pFlushTimer->stop();
 	m_pFlushTimer->start(uTimeout);
 }
 
-void KviKvsObject_socket::tryFlush()
+void KvsObject_socket::tryFlush()
 {
 	if(m_pFlushTimer->isActive())m_pFlushTimer->stop();
 
@@ -1236,7 +1236,7 @@ void KviKvsObject_socket::tryFlush()
 		}
 	}
 }
-void KviKvsObject_socket::reset()
+void KvsObject_socket::reset()
 {
 	m_uConnectionId++; // this is the only place where this is incremented!
 	if(m_pDelayTimer)
@@ -1289,7 +1289,7 @@ void KviKvsObject_socket::reset()
 //--------------
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_socket.moc"
+#include "m_KvsObject_socket.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 
diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/KvsObject_socket.h
index 616d76313..4b5704620 100644
--- a/src/modules/objects/class_socket.h
+++ b/src/modules/objects/KvsObject_socket.h
@@ -2,7 +2,7 @@
 #define _CLASS_SOCKET_H_
 //=============================================================================
 //
-//   File : class_socket.h
+//   File : KvsObject_socket.h
 //   Creation date : Sun Nov 11 03:13:46 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -41,11 +41,11 @@ class KviDataBuffer;
 #include "object_macros.h"
 
 
-class KviKvsObject_socket : public KviKvsObject
+class KvsObject_socket : public KviKvsObject
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_socket)
+	KVSO_DECLARE_OBJECT(KvsObject_socket)
 protected:
 	bool               m_bUdp;
 	kvi_socket_t       m_sock;
diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/KvsObject_spinBox.cpp
index 0a6f20cfa..080cddc0e 100644
--- a/src/modules/objects/class_spinbox.cpp
+++ b/src/modules/objects/KvsObject_spinBox.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_spinbox.cpp
+//   File : KvsObject_spinBox.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "class_spinbox.h"
+#include "KvsObject_spinBox.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -100,38 +100,38 @@
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_spinbox,"spinbox","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_spinBox,"spinbox","widget")
 
 
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setValue);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setMinValue);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setMaxValue);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setLineStep);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setSpecialValueText);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,value);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,minValue);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,maxValue);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,lineStep);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,specialValueText);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,setValue);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,setMinValue);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,setMaxValue);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,setLineStep);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,setSpecialValueText);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,value);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,minValue);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,maxValue);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,lineStep);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,specialValueText);
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setPrefix);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,setSuffix);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,setPrefix);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,setSuffix);
 
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_spinbox,valueChangedEvent);
-KVSO_END_REGISTERCLASS(KviKvsObject_spinbox)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_spinBox,valueChangedEvent);
+KVSO_END_REGISTERCLASS(KvsObject_spinBox)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_spinbox,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_spinBox,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_spinbox)
+KVSO_END_CONSTRUCTOR(KvsObject_spinBox)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_spinbox)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_spinBox)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_spinbox)
+KVSO_END_CONSTRUCTOR(KvsObject_spinBox)
 
-bool KviKvsObject_spinbox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_spinBox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QSpinBox)
 	connect(widget(),SIGNAL(valueChanged(int)),this,SLOT(valueChanged(int)));
@@ -140,7 +140,7 @@ bool KviKvsObject_spinbox::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 
 
 
-KVSO_CLASS_FUNCTION(spinbox,setValue)
+KVSO_CLASS_FUNCTION(spinBox,setValue)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iValue;
@@ -150,7 +150,7 @@ KVSO_CLASS_FUNCTION(spinbox,setValue)
 	((QSpinBox *)widget())->setValue(iValue);
 	return true;
 }
-KVSO_CLASS_FUNCTION(spinbox,setMinValue)
+KVSO_CLASS_FUNCTION(spinBox,setMinValue)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iMinvalue;
@@ -160,7 +160,7 @@ KVSO_CLASS_FUNCTION(spinbox,setMinValue)
     ((QSpinBox *)widget())->setMinimum(iMinvalue);
 	return true;
 }
-KVSO_CLASS_FUNCTION(spinbox,setMaxValue)
+KVSO_CLASS_FUNCTION(spinBox,setMaxValue)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iMaxvalue;
@@ -171,7 +171,7 @@ KVSO_CLASS_FUNCTION(spinbox,setMaxValue)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(spinbox,setLineStep)
+KVSO_CLASS_FUNCTION(spinBox,setLineStep)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iLinestep;
@@ -183,26 +183,26 @@ KVSO_CLASS_FUNCTION(spinbox,setLineStep)
 }
 
 
-KVSO_CLASS_FUNCTION(spinbox,value)
+KVSO_CLASS_FUNCTION(spinBox,value)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QSpinBox *)widget())->value());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(spinbox,minValue)
+KVSO_CLASS_FUNCTION(spinBox,minValue)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QSpinBox *)widget())->minimum());
 	return true;
 }
-KVSO_CLASS_FUNCTION(spinbox,maxValue)
+KVSO_CLASS_FUNCTION(spinBox,maxValue)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QSpinBox *)widget())->maximum());
 	return true;
 }
-KVSO_CLASS_FUNCTION(spinbox,lineStep)
+KVSO_CLASS_FUNCTION(spinBox,lineStep)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QSpinBox *)widget())->singleStep());
@@ -210,7 +210,7 @@ KVSO_CLASS_FUNCTION(spinbox,lineStep)
 }
 
 
-KVSO_CLASS_FUNCTION(spinbox,specialValueText)
+KVSO_CLASS_FUNCTION(spinBox,specialValueText)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setString(((QSpinBox *)widget())->specialValueText());
@@ -218,7 +218,7 @@ KVSO_CLASS_FUNCTION(spinbox,specialValueText)
 }
 
 
-KVSO_CLASS_FUNCTION(spinbox,setSpecialValueText)
+KVSO_CLASS_FUNCTION(spinBox,setSpecialValueText)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szText;
@@ -228,7 +228,7 @@ KVSO_CLASS_FUNCTION(spinbox,setSpecialValueText)
 	((QSpinBox *)widget())->setSpecialValueText(szText);
 	return true;
 }
-KVSO_CLASS_FUNCTION(spinbox,setPrefix)
+KVSO_CLASS_FUNCTION(spinBox,setPrefix)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szPrefix;
@@ -238,7 +238,7 @@ KVSO_CLASS_FUNCTION(spinbox,setPrefix)
 	((QSpinBox *)widget())->setPrefix(szPrefix);
 	return true;
 }
-KVSO_CLASS_FUNCTION(spinbox,setSuffix)
+KVSO_CLASS_FUNCTION(spinBox,setSuffix)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szSuffix;
@@ -249,19 +249,19 @@ KVSO_CLASS_FUNCTION(spinbox,setSuffix)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(spinbox,valueChangedEvent)
+KVSO_CLASS_FUNCTION(spinBox,valueChangedEvent)
 {
 	emitSignal("valueChanged",c,c->params());
 	return true;
 }
 
-void KviKvsObject_spinbox::valueChanged(int value)
+void KvsObject_spinBox::valueChanged(int value)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value));
 	callFunction(this,"valueChangedEvent",&params);
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_spinbox.moc"
+#include "m_KvsObject_spinBox.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_spinbox.h b/src/modules/objects/KvsObject_spinBox.h
index 72f1028bb..c85b4e295 100644
--- a/src/modules/objects/class_spinbox.h
+++ b/src/modules/objects/KvsObject_spinBox.h
@@ -2,7 +2,7 @@
 #define _CLASS_SPINBOX_H_
 //=============================================================================
 //
-//   File : class_spinbox.h
+//   File : KvsObject_spinBox.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -27,14 +27,14 @@
 
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_spinbox : public KviKvsObject_widget
+class KvsObject_spinBox : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_spinbox)
+	KVSO_DECLARE_OBJECT(KvsObject_spinBox)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index d34e5deb4..2c7b32438 100644
--- a/src/modules/objects/class_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_sql.cpp
+//   File : KvsObject_sql.cpp
 //   Creation date : Wed Gen 28 2009 21:07:55 by Alessandro Carbone
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,19 +25,19 @@
 #include "kvi_debug.h"
 #include "KviMemory.h"
 #include "KviLocale.h"
-#include "class_sql.h"
+#include "KvsObject_sql.h"
 #include <QtSql>
-#include "class_memorybuffer.h"
+#include "KvsObject_memoryBuffer.h"
 #include <stdlib.h>
 #include <QHash>
 
-static KviPointerList <KviKvsObject_sql> sql_instances;
+static KviPointerList <KvsObject_sql> sql_instances;
 
 static bool checkDuplicatedConnection(QString &szConnectionName)
 {
     if(!sql_instances.count()) return false;
     bool bFound=false;
-    for(KviKvsObject_sql *i = sql_instances.first(); i; i = sql_instances.next())
+    for(KvsObject_sql *i = sql_instances.first(); i; i = sql_instances.next())
     {
         QSqlQuery *q=i->getQueryConnectionsDict().value(szConnectionName);
         if (q)
@@ -49,12 +49,12 @@ static bool checkDuplicatedConnection(QString &szConnectionName)
     }
     return bFound;
 }
-static void KviKvsSqlInstanceRegister(KviKvsObject_sql *instance)
+static void KviKvsSqlInstanceRegister(KvsObject_sql *instance)
 {
     sql_instances.setAutoDelete(false);
     sql_instances.append(instance);
 }
-static void KviKvsSqlInstanceUnregister(KviKvsObject_sql *instance)
+static void KviKvsSqlInstanceUnregister(KvsObject_sql *instance)
 {
     int idx=sql_instances.findRef(instance);
     sql_instances.remove(idx);
@@ -139,39 +139,39 @@ static void KviKvsSqlInstanceUnregister(KviKvsObject_sql *instance)
 
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_sql,"sql","object")
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryLastInsertId)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,commit)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,beginTransaction)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,setConnection)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,connectionNames)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,setCurrentQuery)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,tablesList)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,currentQuery)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,closeConnection)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryInit)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryFinish)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryResultsSize)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryExec)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryPrepare)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryBindValue)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryPrevious)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryNext)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryLast)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryFirst)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,queryRecord)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,lastError)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_sql,features)
-KVSO_END_REGISTERCLASS(KviKvsObject_sql)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_sql,"sql","object")
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryLastInsertId)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,commit)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,beginTransaction)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,setConnection)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,connectionNames)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,setCurrentQuery)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,tablesList)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,currentQuery)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,closeConnection)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryInit)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryFinish)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryResultsSize)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryExec)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryPrepare)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryBindValue)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryPrevious)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryNext)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryLast)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryFirst)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,queryRecord)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,lastError)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_sql,features)
+KVSO_END_REGISTERCLASS(KvsObject_sql)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_sql,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_sql,KviKvsObject)
 m_pCurrentSQlQuery=0;
 KviKvsSqlInstanceRegister(this);
-KVSO_END_CONSTRUCTOR(KviKvsObject_sql)
+KVSO_END_CONSTRUCTOR(KvsObject_sql)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_sql)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_sql)
 QHashIterator<QString,QSqlQuery *> t(queryConnectionsDict);
 while (t.hasNext())
 {
@@ -184,7 +184,7 @@ while (t.hasNext())
 KviKvsSqlInstanceUnregister(this);
 queryConnectionsDict.clear();
 
-KVSO_END_DESTRUCTOR(KviKvsObject_sql)
+KVSO_END_DESTRUCTOR(KvsObject_sql)
 
 KVSO_CLASS_FUNCTION(sql,setConnection)
 {
@@ -488,7 +488,7 @@ KVSO_CLASS_FUNCTION(sql,queryBindValue)
             KviKvsObject *pObject;
             pObject=KviKvsKernel::instance()->objectController()->lookupObject(hOb);
             if (pObject->inheritsClass("memorybuffer"))
-                m_pCurrentSQlQuery->bindValue(szFieldName,QVariant(*((KviKvsObject_memorybuffer *)pObject)->pBuffer()));
+                m_pCurrentSQlQuery->bindValue(szFieldName,QVariant(*((KvsObject_memoryBuffer *)pObject)->pBuffer()));
             else c->warning(__tr2qs_ctx("Only memorybuffer class object is supported","objects"));
         }
         else
@@ -561,7 +561,7 @@ KVSO_CLASS_FUNCTION(sql,queryRecord)
                KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("memoryBuffer");
                KviKvsVariantList params(new KviKvsVariant(QString()));
                KviKvsObject * pObject = pClass->allocateInstance(0,"",c->context(),&params);
-               *((KviKvsObject_memorybuffer *)pObject)->pBuffer()=value.toByteArray();
+               *((KvsObject_memoryBuffer *)pObject)->pBuffer()=value.toByteArray();
                pValue=new KviKvsVariant(pObject->handle());
             }
             else pValue=new KviKvsVariant(QString());
@@ -593,7 +593,7 @@ KVSO_CLASS_FUNCTION(sql,lastError)
         c->returnValue()->setString(szError);
         return true;
 }
-void KviKvsObject_sql::closeQueryConnection(QSqlQuery * query)
+void KvsObject_sql::closeQueryConnection(QSqlQuery * query)
 {
         if (query==m_pCurrentSQlQuery) m_pCurrentSQlQuery=0;
         query->finish();
diff --git a/src/modules/objects/class_sql.h b/src/modules/objects/KvsObject_sql.h
index 41645701d..51ade479b 100644
--- a/src/modules/objects/class_sql.h
+++ b/src/modules/objects/KvsObject_sql.h
@@ -32,10 +32,10 @@
 #include <QtSql>
 #include <QHash>
 
-class KviKvsObject_sql : public KviKvsObject
+class KvsObject_sql : public KviKvsObject
 {
 public:
-        KVSO_DECLARE_OBJECT(KviKvsObject_sql)
+        KVSO_DECLARE_OBJECT(KvsObject_sql)
 protected:
         QSqlQuery *m_pCurrentSQlQuery;
         QHash<QString,QSqlQuery *> queryConnectionsDict;
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/KvsObject_tabWidget.cpp
index a416835a2..0d7cc8a34 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/KvsObject_tabWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_tabwidget.cpp
+//   File : KvsObject_tabWidget.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "class_tabwidget.h"
+#include "KvsObject_tabWidget.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -32,11 +32,11 @@
 #include <QTabWidget>
 
 /*
-	@doc:	tabwidget
+	@doc:	tabWidget
 	@keyterms:
-		tabwidget object class,
+		tabWidget object class,
 	@title:
-		tabwidget class
+		tabWidget class
 	@type:
 		class
 	@short:
@@ -45,7 +45,7 @@
 		[class]object[/class]
 		[class]widget[/class]
 	@description:
-		The tabwidget class provides a stack of tabbed widgets.[br]
+		The tabWidget class provides a stack of tabbed widgets.[br]
 		Each tab is associated with a different widget (called a `page').[br]
 		Only the current tab's page is shown in the page area; all the others tabs pages are hidden.[br]
 		The user can show a different page by clicking on its tab.[br]
@@ -57,7 +57,7 @@
 		If index is not specified, the tab is simply appended.[br]
 		Otherwise the new tab is inserted at the specified position.
 		!fn: $setTabToolTip(<tab_widget:object>,<tooltip:string>)
-		Sets the tab tool tip for the tabwidget to <tooltip>.
+		Sets the tab tool tip for the tabWidget to <tooltip>.
 		!fn: $removeTabToolTip(<tab_widget:object>)
 		Removes the tab tool tip for the tab. If the page does not have a tip, nothing happens.
 		!fn: $setTabLabel(<tab_widget>, <label:string>)
@@ -92,12 +92,12 @@
 		See also [classfnc]$setTabsClosable[/classfnc]().
 	@examples:
 		[example]
-			// First we'll create the main tabwidget.
-			%Tabwidget=$new(tabwidget)
+			// First we'll create the main tabWidget.
+			%Tabwidget=$new(tabWidget)
 			%Tabwidget->$setToolTip("Example of TabWidget class")
 			%Tabwidget->$setTabPosition(Top)
 			%Tabwidget->$resize(300,200)
-			// Now we'll create the new widgets and put they in to the main tabwidget.
+			// Now we'll create the new widgets and put they in to the main tabWidget.
 			%firsttab=$new(vbox)
 			%secondtab=$new(vbox)
 			// Now we'll create the item to put in to tab's pages.
@@ -144,43 +144,43 @@
 		This signal is emitted by the default implementation of [classfnc]tabCloseRequestEvent[/classfnc]().[br]
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_tabwidget,"tabwidget","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_tabWidget,"tabWidget","widget")
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,addTab)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,insertTab)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,setTabToolTip)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,removeTabToolTip)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,setTabLabel)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,changeTab)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,setCurrentPage)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,currentPageIndex)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,tabLabel)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,currentTabLabel)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,addTab)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,insertTab)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,setTabToolTip)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,removeTabToolTip)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,setTabLabel)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,changeTab)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,setCurrentPage)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,currentPageIndex)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,tabLabel)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,currentTabLabel)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,count)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,removePage)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,widgetAt)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,setTabPosition)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,setTabsClosable)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,count)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,removePage)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,widgetAt)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,setTabPosition)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,setTabsClosable)
 
 	// events
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,currentChangedEvent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tabwidget,tabCloseRequestEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,currentChangedEvent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tabWidget,tabCloseRequestEvent)
 
 
 
-KVSO_END_REGISTERCLASS(KviKvsObject_tabwidget)
+KVSO_END_REGISTERCLASS(KvsObject_tabWidget)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_tabwidget,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_tabWidget,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_tabwidget)
+KVSO_END_CONSTRUCTOR(KvsObject_tabWidget)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_tabwidget)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_tabWidget)
 tabsList.clear();;
-KVSO_END_CONSTRUCTOR(KviKvsObject_tabwidget)
+KVSO_END_CONSTRUCTOR(KvsObject_tabWidget)
 
-bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_tabWidget::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QTabWidget)
 	connect(widget(),SIGNAL(currentChanged(int)),this,SLOT(slotCurrentChanged(int)));
@@ -188,7 +188,7 @@ bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 
 	return true;
 }
-KVSO_CLASS_FUNCTION(tabwidget,setTabsClosable)
+KVSO_CLASS_FUNCTION(tabWidget,setTabsClosable)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bClosable;
@@ -199,7 +199,7 @@ KVSO_CLASS_FUNCTION(tabwidget,setTabsClosable)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tabwidget,addTab)
+KVSO_CLASS_FUNCTION(tabWidget,addTab)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *pObject;
@@ -220,7 +220,7 @@ KVSO_CLASS_FUNCTION(tabwidget,addTab)
 	tabsList.append(hObject);
 	return true;
 }
-KVSO_CLASS_FUNCTION(tabwidget,widgetAt)
+KVSO_CLASS_FUNCTION(tabWidget,widgetAt)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iIndex;
@@ -232,7 +232,7 @@ KVSO_CLASS_FUNCTION(tabwidget,widgetAt)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tabwidget,insertTab)
+KVSO_CLASS_FUNCTION(tabWidget,insertTab)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *pObject;
@@ -256,7 +256,7 @@ KVSO_CLASS_FUNCTION(tabwidget,insertTab)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tabwidget,setCurrentPage)
+KVSO_CLASS_FUNCTION(tabWidget,setCurrentPage)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t iIndex;
@@ -266,7 +266,7 @@ KVSO_CLASS_FUNCTION(tabwidget,setCurrentPage)
 	((QTabWidget *)widget())->setCurrentIndex(iIndex);
     return true;
 }
-KVSO_CLASS_FUNCTION(tabwidget,setTabToolTip)
+KVSO_CLASS_FUNCTION(tabWidget,setTabToolTip)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *pObject;
@@ -287,7 +287,7 @@ KVSO_CLASS_FUNCTION(tabwidget,setTabToolTip)
 	((QTabWidget *)widget())->setTabToolTip(iIdx,szTooltip);
 	return true;
 }
-KVSO_CLASS_FUNCTION(tabwidget,removeTabToolTip)
+KVSO_CLASS_FUNCTION(tabWidget,removeTabToolTip)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *pObject;
@@ -307,7 +307,7 @@ KVSO_CLASS_FUNCTION(tabwidget,removeTabToolTip)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tabwidget,setTabLabel)
+KVSO_CLASS_FUNCTION(tabWidget,setTabLabel)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *pObject;
@@ -328,14 +328,14 @@ KVSO_CLASS_FUNCTION(tabwidget,setTabLabel)
 	((QTabWidget *)widget())->setTabText(iIdx,szLabel);
 	return true;
 }
-KVSO_CLASS_FUNCTION(tabwidget,currentPageIndex)
+KVSO_CLASS_FUNCTION(tabWidget,currentPageIndex)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	int index=((QTabWidget *)widget())->currentIndex();
 	c->returnValue()->setInteger(index);
 	return true;
 }
-KVSO_CLASS_FUNCTION(tabwidget,tabLabel)
+KVSO_CLASS_FUNCTION(tabWidget,tabLabel)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t uIndex;
@@ -348,7 +348,7 @@ KVSO_CLASS_FUNCTION(tabwidget,tabLabel)
 }
 
 
-KVSO_CLASS_FUNCTION(tabwidget,count)
+KVSO_CLASS_FUNCTION(tabWidget,count)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	int count = ((QTabWidget *)widget())->count();
@@ -356,7 +356,7 @@ KVSO_CLASS_FUNCTION(tabwidget,count)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tabwidget,currentTabLabel)
+KVSO_CLASS_FUNCTION(tabWidget,currentTabLabel)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	int i= ((QTabWidget *)widget())->currentIndex();
@@ -364,7 +364,7 @@ KVSO_CLASS_FUNCTION(tabwidget,currentTabLabel)
 	c->returnValue()->setString(label);
 	 return true;
 }
-KVSO_CLASS_FUNCTION(tabwidget,removePage)
+KVSO_CLASS_FUNCTION(tabWidget,removePage)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *pObject;
@@ -385,7 +385,7 @@ KVSO_CLASS_FUNCTION(tabwidget,removePage)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tabwidget,changeTab)
+KVSO_CLASS_FUNCTION(tabWidget,changeTab)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *pObject;
@@ -410,7 +410,7 @@ KVSO_CLASS_FUNCTION(tabwidget,changeTab)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tabwidget,setTabPosition)
+KVSO_CLASS_FUNCTION(tabWidget,setTabPosition)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szPos;
@@ -425,32 +425,32 @@ KVSO_CLASS_FUNCTION(tabwidget,setTabPosition)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tabwidget,currentChangedEvent)
+KVSO_CLASS_FUNCTION(tabWidget,currentChangedEvent)
 {
 
 	emitSignal("currentChanged",c,c->params());
 	return true;
 }
 
-void KviKvsObject_tabwidget::slotCurrentChanged(int value)
+void KvsObject_tabWidget::slotCurrentChanged(int value)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value));
 	callFunction(this,"currentChangedEvent",&params);
 }
 
-KVSO_CLASS_FUNCTION(tabwidget,tabCloseRequestEvent)
+KVSO_CLASS_FUNCTION(tabWidget,tabCloseRequestEvent)
 {
 
 	emitSignal("tabCloseRequested",c,c->params());
 	return true;
 }
 
-void KviKvsObject_tabwidget::slotTabCloseRequest(int iIndex)
+void KvsObject_tabWidget::slotTabCloseRequest(int iIndex)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iIndex));
 	callFunction(this,"tabCloseRequestEvent",&params);
 }
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_tabwidget.moc"
+#include "m_KvsObject_tabWidget.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_tabwidget.h b/src/modules/objects/KvsObject_tabWidget.h
index a8425a3b7..72f893758 100644
--- a/src/modules/objects/class_tabwidget.h
+++ b/src/modules/objects/KvsObject_tabWidget.h
@@ -2,7 +2,7 @@
 #define _CLASS_TABWIDGET_H_
 //=============================================================================
 //
-//   File : class_tabwidget.cpp
+//   File : KvsObject_tabWidget.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -25,14 +25,14 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_tabwidget : public KviKvsObject_widget
+class KvsObject_tabWidget : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_tabwidget)
+	KVSO_DECLARE_OBJECT(KvsObject_tabWidget)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_tablewidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index df2428ede..6bda1f64a 100644
--- a/src/modules/objects/class_tablewidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_tablewidget.cpp
+//   File : KvsObject_tableWidget.cpp
 //   Creation date : Wed 04 Feb 2009 09:30:05 CEST by Carbone Alessandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,9 +22,9 @@
 //
 //=============================================================================
 
-#include "class_tablewidget.h"
-#include "class_painter.h"
-#include "class_pixmap.h"
+#include "KvsObject_tableWidget.h"
+#include "KvsObject_painter.h"
+#include "KvsObject_pixmap.h"
 
 #include "kvi_debug.h"
 #include "KviApplication.h"
@@ -174,74 +174,74 @@ const char * const itemflags_tbl[] = {
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_tablewidget,"tablewidget","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_tableWidget,"tablewidget","widget")
 
 	// Horizontal Header
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,setHorizontalHeaderLabels)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,hideHorizontalHeader)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,hideVerticalHeader)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setHorizontalHeaderLabels)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,hideHorizontalHeader)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,hideVerticalHeader)
 
 	// Vertical Header
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,setVerticalHeaderLabels)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,showHorizontalHeader)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,showVerticalHeader)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setVerticalHeaderLabels)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,showHorizontalHeader)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,showVerticalHeader)
 
 	// Rows-Columns
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,setRowCount)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,insertRow)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,insertColumn)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,removeRow)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,removeColumn)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setRowCount)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,insertRow)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,insertColumn)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,removeRow)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,removeColumn)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,rowCount)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,currentRow)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,setColumnCount)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,columnCount)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,currentColumn)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,itemRowColAt)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,rowCount)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,currentRow)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setColumnCount)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,columnCount)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,currentColumn)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,itemRowColAt)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,hideRow)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,showRow)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,hideColumn)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,showColumn)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,hideRow)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,showRow)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,hideColumn)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,showColumn)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,resizeRowsToContents)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,resizeColumnsToContents)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,resizeRowsToContents)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,resizeColumnsToContents)
 
 	// Item (text. icon, widget)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,setText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,setNumber)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,setToolTip)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,text)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,setCellWidget)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,setIcon)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,clear)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_tablewidget,setItemFlags);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setNumber)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setToolTip)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,text)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setCellWidget)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setIcon)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,clear)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_tableWidget,setItemFlags);
 
-	KVSO_REGISTER_HANDLER(KviKvsObject_tablewidget,"itemEnteredEvent",itemEnteredEvent);
-	KVSO_REGISTER_HANDLER(KviKvsObject_tablewidget,"cellActivatedEvent",cellActivatedEvent);
-	KVSO_REGISTER_HANDLER(KviKvsObject_tablewidget,"cellDoubleClickedEvent",cellDoubleClickedEvent);
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KviKvsObject_tablewidget,"paintCellEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_tablewidget,"sizeHintCellRequestEvent")
+	KVSO_REGISTER_HANDLER(KvsObject_tableWidget,"itemEnteredEvent",itemEnteredEvent);
+	KVSO_REGISTER_HANDLER(KvsObject_tableWidget,"cellActivatedEvent",cellActivatedEvent);
+	KVSO_REGISTER_HANDLER(KvsObject_tableWidget,"cellDoubleClickedEvent",cellDoubleClickedEvent);
+	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_tableWidget,"paintCellEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_tableWidget,"sizeHintCellRequestEvent")
 
 
 
-KVSO_END_REGISTERCLASS(KviKvsObject_tablewidget)
+KVSO_END_REGISTERCLASS(KvsObject_tableWidget)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_tablewidget,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_tableWidget,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_tablewidget)
+KVSO_END_CONSTRUCTOR(KvsObject_tableWidget)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_tablewidget)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_tableWidget)
 /*if (m_pCellItemDelegate)
 {
 	delete m_pCellItemDelegate;
 	m_pCellItemDelegate=0;
 }*/
-KVSO_END_DESTRUCTOR(KviKvsObject_tablewidget)
+KVSO_END_DESTRUCTOR(KvsObject_tableWidget)
 
-bool KviKvsObject_tablewidget::init(KviKvsRunTimeContext *c,KviKvsVariantList *)
+bool KvsObject_tableWidget::init(KviKvsRunTimeContext *c,KviKvsVariantList *)
 {
 
 	SET_OBJECT(QTableWidget)
@@ -258,14 +258,14 @@ bool KviKvsObject_tablewidget::init(KviKvsRunTimeContext *c,KviKvsVariantList *)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,clear)
+KVSO_CLASS_FUNCTION(tableWidget,clear)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QTableWidget *)widget())->clear();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,resizeRowsToContents)
+KVSO_CLASS_FUNCTION(tableWidget,resizeRowsToContents)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	//qDebug("resize row to contents");
@@ -274,7 +274,7 @@ KVSO_CLASS_FUNCTION(tablewidget,resizeRowsToContents)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,resizeColumnsToContents)
+KVSO_CLASS_FUNCTION(tableWidget,resizeColumnsToContents)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	//qDebug("resize coluns to contents");
@@ -282,7 +282,7 @@ KVSO_CLASS_FUNCTION(tablewidget,resizeColumnsToContents)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,setText)
+KVSO_CLASS_FUNCTION(tableWidget,setText)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uCol,uRow;
@@ -304,7 +304,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setText)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,setNumber)
+KVSO_CLASS_FUNCTION(tableWidget,setNumber)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uCol,uRow;
@@ -327,7 +327,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setNumber)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,insertRow)
+KVSO_CLASS_FUNCTION(tableWidget,insertRow)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uRow;
@@ -338,7 +338,7 @@ KVSO_CLASS_FUNCTION(tablewidget,insertRow)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,insertColumn)
+KVSO_CLASS_FUNCTION(tableWidget,insertColumn)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uCol;
@@ -348,7 +348,7 @@ KVSO_CLASS_FUNCTION(tablewidget,insertColumn)
 	((QTableWidget *)widget())->insertColumn(uCol);
 	return true;
 }
-KVSO_CLASS_FUNCTION(tablewidget,removeRow)
+KVSO_CLASS_FUNCTION(tableWidget,removeRow)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uRow;
@@ -359,7 +359,7 @@ KVSO_CLASS_FUNCTION(tablewidget,removeRow)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,removeColumn)
+KVSO_CLASS_FUNCTION(tableWidget,removeColumn)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uCol;
@@ -371,7 +371,7 @@ KVSO_CLASS_FUNCTION(tablewidget,removeColumn)
 }
 
 
-KVSO_CLASS_FUNCTION(tablewidget,setIcon)
+KVSO_CLASS_FUNCTION(tableWidget,setIcon)
 {
 	kvs_uint_t uCol,uRow;
 	KviKvsObject *obPixmap;
@@ -392,7 +392,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setIcon)
 			c->warning(__tr2qs_ctx("Pixmap object or image Id required","objects"));
 			return true;
 		}
-		pix=((KviKvsObject_pixmap *)obPixmap)->getPixmap();
+		pix=((KvsObject_pixmap *)obPixmap)->getPixmap();
 	} else {
 			QString szPix;
 			vPixmap->asString(szPix);
@@ -413,7 +413,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setIcon)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,text)
+KVSO_CLASS_FUNCTION(tableWidget,text)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uCol,uRow;
@@ -427,7 +427,7 @@ KVSO_CLASS_FUNCTION(tablewidget,text)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,setRowCount)
+KVSO_CLASS_FUNCTION(tableWidget,setRowCount)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uRow;
@@ -438,35 +438,35 @@ KVSO_CLASS_FUNCTION(tablewidget,setRowCount)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,rowCount)
+KVSO_CLASS_FUNCTION(tableWidget,rowCount)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QTableWidget *)widget())->rowCount());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,currentRow)
+KVSO_CLASS_FUNCTION(tableWidget,currentRow)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QTableWidget *)widget())->currentRow());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,currentColumn)
+KVSO_CLASS_FUNCTION(tableWidget,currentColumn)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QTableWidget *)widget())->currentColumn());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,columnCount)
+KVSO_CLASS_FUNCTION(tableWidget,columnCount)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setInteger(((QTableWidget *)widget())->columnCount());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,itemRowColAt)
+KVSO_CLASS_FUNCTION(tableWidget,itemRowColAt)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iXpos,iYpos;
@@ -490,7 +490,7 @@ KVSO_CLASS_FUNCTION(tablewidget,itemRowColAt)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,setToolTip)
+KVSO_CLASS_FUNCTION(tableWidget,setToolTip)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szTooltip;
@@ -505,7 +505,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setToolTip)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,setColumnCount)
+KVSO_CLASS_FUNCTION(tableWidget,setColumnCount)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uCol;
@@ -516,7 +516,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setColumnCount)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,hideColumn)
+KVSO_CLASS_FUNCTION(tableWidget,hideColumn)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uCol;
@@ -527,7 +527,7 @@ KVSO_CLASS_FUNCTION(tablewidget,hideColumn)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,showColumn)
+KVSO_CLASS_FUNCTION(tableWidget,showColumn)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uCol;
@@ -538,7 +538,7 @@ KVSO_CLASS_FUNCTION(tablewidget,showColumn)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,hideRow)
+KVSO_CLASS_FUNCTION(tableWidget,hideRow)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uRow;
@@ -549,7 +549,7 @@ KVSO_CLASS_FUNCTION(tablewidget,hideRow)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,showRow)
+KVSO_CLASS_FUNCTION(tableWidget,showRow)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_uint_t uRow;
@@ -560,7 +560,7 @@ KVSO_CLASS_FUNCTION(tablewidget,showRow)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,setHorizontalHeaderLabels)
+KVSO_CLASS_FUNCTION(tableWidget,setHorizontalHeaderLabels)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsArrayCast ac;
@@ -589,7 +589,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setHorizontalHeaderLabels)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,setVerticalHeaderLabels)
+KVSO_CLASS_FUNCTION(tableWidget,setVerticalHeaderLabels)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsArrayCast ac;
@@ -618,7 +618,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setVerticalHeaderLabels)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,setCellWidget)
+KVSO_CLASS_FUNCTION(tableWidget,setCellWidget)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject * pObject;
@@ -635,34 +635,34 @@ KVSO_CLASS_FUNCTION(tablewidget,setCellWidget)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,hideHorizontalHeader)
+KVSO_CLASS_FUNCTION(tableWidget,hideHorizontalHeader)
 {
 	Q_UNUSED(c);
 	((QTableWidget *)widget())->horizontalHeader()->hide();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,hideVerticalHeader)
+KVSO_CLASS_FUNCTION(tableWidget,hideVerticalHeader)
 {
 	Q_UNUSED(c);
 	((QTableWidget *)widget())->verticalHeader()->hide();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,showHorizontalHeader)
+KVSO_CLASS_FUNCTION(tableWidget,showHorizontalHeader)
 {
 	Q_UNUSED(c);
 	((QTableWidget *)widget())->horizontalHeader()->show();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,showVerticalHeader)
+KVSO_CLASS_FUNCTION(tableWidget,showVerticalHeader)
 {
 	Q_UNUSED(c);
 	((QTableWidget *)widget())->verticalHeader()->show();
 	return true;
 }
-KVSO_CLASS_FUNCTION(tablewidget,setItemFlags)
+KVSO_CLASS_FUNCTION(tableWidget,setItemFlags)
 {
 	CHECK_INTERNAL_POINTER(widget())
 
@@ -699,48 +699,48 @@ KVSO_CLASS_FUNCTION(tablewidget,setItemFlags)
 	return true;
 }
 
-void KviKvsObject_tablewidget::slotItemEntered(QTableWidgetItem * i)
+void KvsObject_tableWidget::slotItemEntered(QTableWidgetItem * i)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i->row()),new KviKvsVariant((kvs_int_t)i->column()));
 	callFunction(this,"itemEnteredEvent",0,&params);
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,itemEnteredEvent)
+KVSO_CLASS_FUNCTION(tableWidget,itemEnteredEvent)
 {
 	emitSignal("itemEntered",c,c->params());
 	return true;
 }
 
-void KviKvsObject_tablewidget::cellActivated(int iRow,int iCol)
+void KvsObject_tableWidget::cellActivated(int iRow,int iCol)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iRow),new KviKvsVariant((kvs_int_t)iCol));
 	callFunction(this,"cellActivatedEvent",0,&params);
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,cellActivatedEvent)
+KVSO_CLASS_FUNCTION(tableWidget,cellActivatedEvent)
 {
 	emitSignal("cellActivated",c,c->params());
 	return true;
 }
 
-void KviKvsObject_tablewidget::cellDoubleClicked(int iRow,int iCol)
+void KvsObject_tableWidget::cellDoubleClicked(int iRow,int iCol)
 {
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iRow),new KviKvsVariant((kvs_int_t)iCol));
 	callFunction(this,"cellDoubleClickedEvent",0,&params);
 }
 
-KVSO_CLASS_FUNCTION(tablewidget,cellDoubleClickedEvent)
+KVSO_CLASS_FUNCTION(tableWidget,cellDoubleClickedEvent)
 {
 	emitSignal("cellDoubleClicked",c,c->params());
 	return true;
 }
-bool KviKvsObject_tablewidget::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index)
+bool KvsObject_tableWidget::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index)
 {
 	p->save();
 	KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass("painter");
 	KviKvsVariantList params;
 	KviKvsObject * pObject = pClass->allocateInstance(0,"internalpainter",m_pContext,&params);
-	((KviKvsObject_painter *)pObject)->setInternalPainter(p);
+	((KvsObject_painter *)pObject)->setInternalPainter(p);
 	p->setClipRect(option.rect);
 	p->translate(option.rect.x(),option.rect.y());
 	int col=index.column();
@@ -758,7 +758,7 @@ bool KviKvsObject_tablewidget::paint(QPainter * p, const QStyleOptionViewItem &
 	return retv->asBoolean();
 }
 
-KviCellItemDelegate::KviCellItemDelegate(QAbstractItemView * pWidget,KviKvsObject_tablewidget * parent)
+KviCellItemDelegate::KviCellItemDelegate(QAbstractItemView * pWidget,KvsObject_tableWidget * parent)
 : QItemDelegate(pWidget), m_pParentScript(parent)
 {
 }
@@ -792,5 +792,5 @@ QSize KviCellItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QM
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_tablewidget.moc"
+#include "m_KvsObject_tableWidget.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_tablewidget.h b/src/modules/objects/KvsObject_tableWidget.h
index 2f018aac0..a0c5df848 100644
--- a/src/modules/objects/class_tablewidget.h
+++ b/src/modules/objects/KvsObject_tableWidget.h
@@ -2,7 +2,7 @@
 #define _CLASS_TABLEWIDGET_H_
 //=============================================================================
 //
-//   File : class_tablewidget.h
+//   File : KvsObject_tableWidget.h
 //   Creation date : Wed 4 Feb 2009 09:30:05 CEST by Carbone Alessandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
 #include "KviKvsRunTimeContext.h"
@@ -35,26 +35,26 @@
 #include <QItemDelegate>
 #include <QAbstractItemView>
 
-class KviKvsObject_tablewidget;
+class KvsObject_tableWidget;
 
 class KviCellItemDelegate : public QItemDelegate
 {
 public:
-	KviCellItemDelegate(QAbstractItemView * pWidget = 0,KviKvsObject_tablewidget *pParent=0);
+	KviCellItemDelegate(QAbstractItemView * pWidget = 0,KvsObject_tableWidget *pParent=0);
 	~KviCellItemDelegate();
 protected:
 //        QAbstractItemView * m_pParent;
-	KviKvsObject_tablewidget *m_pParentScript;
+	KvsObject_tableWidget *m_pParentScript;
 public:
 	QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
 	void paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
 };
 
-class KviKvsObject_tablewidget : public KviKvsObject_widget
+class KvsObject_tableWidget : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_tablewidget)
+	KVSO_DECLARE_OBJECT(KvsObject_tableWidget)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 	bool paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index);
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/KvsObject_textBrowser.cpp
index 8be17b779..44fb40973 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/KvsObject_textBrowser.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_tbrowser.cpp
+//   File : KvsObject_textBrowser.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -24,7 +24,7 @@
 //=============================================================================
 
 
-#include "class_tbrowser.h"
+#include "KvsObject_textBrowser.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -34,11 +34,11 @@
 #include <QFile>
 #include <QUrl>
 /*
-	@doc: textbrowser
+	@doc: textBrowser
 	@keyterms:
-		textbrowser browser widget class,
+		textBrowser browser widget class,
 	@title:
-		textbrowser class
+		textBrowser class
 	@type:
 		class
 	@short:
@@ -66,32 +66,32 @@
 		This signal is emitted by the default implementation of the [classfnc]$linkClickedEvent[/classfnc]() function.
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_textbrowser,"textbrowser","multilineedit")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,setSource)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,forward)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,backward)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,home)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,reload)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_textbrowser,linkClickedEvent)
-KVSO_END_REGISTERCLASS(KviKvsObject_textbrowser)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_textBrowser,"textBrowser","multilineedit")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_textBrowser,setSource)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_textBrowser,forward)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_textBrowser,backward)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_textBrowser,home)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_textBrowser,reload)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_textBrowser,linkClickedEvent)
+KVSO_END_REGISTERCLASS(KvsObject_textBrowser)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_textbrowser,KviKvsObject_textedit)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_textBrowser,KvsObject_textedit)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_textbrowser)
+KVSO_END_CONSTRUCTOR(KvsObject_textBrowser)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_textbrowser)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_textBrowser)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_textbrowser)
+KVSO_END_CONSTRUCTOR(KvsObject_textBrowser)
 
-bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_textBrowser::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QTextBrowser);
 	connect(obj,SIGNAL(anchorClicked(const QUrl &)),this,SLOT(anchorClicked(const QUrl &)));
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(textbrowser,setSource)
+KVSO_CLASS_FUNCTION(textBrowser,setSource)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szFile;
@@ -109,47 +109,47 @@ KVSO_CLASS_FUNCTION(textbrowser,setSource)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(textbrowser,forward)
+KVSO_CLASS_FUNCTION(textBrowser,forward)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QTextBrowser *)widget())->forward();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(textbrowser,backward)
+KVSO_CLASS_FUNCTION(textBrowser,backward)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QTextBrowser *)widget())->backward();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(textbrowser,home)
+KVSO_CLASS_FUNCTION(textBrowser,home)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QTextBrowser *)widget())->home();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(textbrowser,reload)
+KVSO_CLASS_FUNCTION(textBrowser,reload)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QTextBrowser *)widget())->reload();
 	return true;
 }
 
-void KviKvsObject_textbrowser::anchorClicked(const QUrl &url)
+void KvsObject_textBrowser::anchorClicked(const QUrl &url)
 {
 	KviKvsVariantList parms(new KviKvsVariant(url.path()));
 	callFunction(this,"linkClickedEvent",0,&parms);
 }
 
-KVSO_CLASS_FUNCTION(textbrowser,linkClickedEvent)
+KVSO_CLASS_FUNCTION(textBrowser,linkClickedEvent)
 {
 	emitSignal("linkClicked",c,c->params());
 	return true;
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_tbrowser.moc"
+#include "m_KvsObject_textBrowser.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_tbrowser.h b/src/modules/objects/KvsObject_textBrowser.h
index aedfdd42d..50645e6f3 100644
--- a/src/modules/objects/class_tbrowser.h
+++ b/src/modules/objects/KvsObject_textBrowser.h
@@ -2,7 +2,7 @@
 #define	_CLASS_TBROWSER_H_
 //=============================================================================
 //
-//   File : class_tbrowser.h
+//   File : KvsObject_textBrowser.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -25,15 +25,16 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
-#include "class_multilineedit.h"
+#include "KvsObject_widget.h"
+#include "KvsObject_multiLineEdit.h"
 #include "object_macros.h"
 #include <QUrl>
-class KviKvsObject_textbrowser : public KviKvsObject_textedit
+
+class KvsObject_textBrowser : public KvsObject_textedit
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_textbrowser)
+	KVSO_DECLARE_OBJECT(KvsObject_textBrowser)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/KvsObject_toolBar.cpp
index 017b7a9c8..4dbacc19b 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/KvsObject_toolBar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_toolbar.cpp
+//   File : KvsObject_toolBar.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,14 +23,14 @@
 //
 //=============================================================================
 
-#include "class_toolbar.h"
+#include "KvsObject_toolBar.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviTalToolBar.h"
 #include "KviTalMainWindow.h"
 #include "KviLocale.h"
 #include "KviIconManager.h"
-#include "class_mainwindow.h"
+#include "KvsObject_mainWindow.h"
 
 /*
 	@doc:	toolbar
@@ -60,23 +60,23 @@
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_toolbar,"toolbar","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbar,addSeparator)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbar,setLabel)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbar,label)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbar,clear)
-KVSO_END_REGISTERCLASS(KviKvsObject_toolbar)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_toolBar,"toolbar","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolBar,addSeparator)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolBar,setLabel)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolBar,label)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolBar,clear)
+KVSO_END_REGISTERCLASS(KvsObject_toolBar)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_toolbar,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_toolBar,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_toolbar)
+KVSO_END_CONSTRUCTOR(KvsObject_toolBar)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_toolbar)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_toolBar)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_toolbar)
+KVSO_END_CONSTRUCTOR(KvsObject_toolBar)
 
-bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *)
+bool KvsObject_toolBar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *)
 {
 	if (!parentObject())
 	{
@@ -95,13 +95,13 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbar,addSeparator)
+KVSO_CLASS_FUNCTION(toolBar,addSeparator)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((KviTalToolBar *)widget())->addSeparator();
 	return true;
 }
-KVSO_CLASS_FUNCTION(toolbar,setLabel)
+KVSO_CLASS_FUNCTION(toolBar,setLabel)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szLabel;
@@ -111,13 +111,13 @@ KVSO_CLASS_FUNCTION(toolbar,setLabel)
 	((KviTalToolBar *)widget())->setWindowTitle(szLabel);
 	return true;
 }
-KVSO_CLASS_FUNCTION(toolbar,label)
+KVSO_CLASS_FUNCTION(toolBar,label)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setString(((KviTalToolBar *)widget())->windowTitle());
 	return true;
 }
-KVSO_CLASS_FUNCTION(toolbar,clear)
+KVSO_CLASS_FUNCTION(toolBar,clear)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((KviTalToolBar *)object())->clear();
diff --git a/src/modules/objects/class_toolbar.h b/src/modules/objects/KvsObject_toolBar.h
index a7bd439d1..ad537df43 100644
--- a/src/modules/objects/class_toolbar.h
+++ b/src/modules/objects/KvsObject_toolBar.h
@@ -2,7 +2,7 @@
 #define _CLASS_TOOLBAR_H_
 //=============================================================================
 //
-//   File : class_toolbar.h
+//   File : KvsObject_toolBar.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -25,13 +25,13 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_toolbar : public KviKvsObject_widget
+class KvsObject_toolBar : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_toolbar)
+	KVSO_DECLARE_OBJECT(KvsObject_toolBar)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/KvsObject_toolButton.cpp
index 516944445..884a3e92d 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/KvsObject_toolButton.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_toolbutton.cpp
+//   File : KvsObject_toolButton.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "class_toolbutton.h"
+#include "KvsObject_toolButton.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 
@@ -91,47 +91,47 @@
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_toolbutton,"toolbutton","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setImage)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setUsesBigPixmap)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,usesBigPixmap)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setUsesTextLabel)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,usesTextLabel)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setAutoRaise)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,autoRaise)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setTextLabel)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,textLabel)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setPopup)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,openPopup)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_toolButton,"toolbutton","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,setImage)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,setUsesBigPixmap)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,usesBigPixmap)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,setUsesTextLabel)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,usesTextLabel)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,setAutoRaise)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,autoRaise)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,setTextLabel)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,textLabel)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,setPopup)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,openPopup)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setToggleButton)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,toggle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setOn)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,setToggleButton)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,toggle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,setOn)
 
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,setTextPosition)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,textPosition)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,setTextPosition)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,textPosition)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_toolbutton,clickEvent)
-KVSO_END_REGISTERCLASS(KviKvsObject_toolbutton)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_toolButton,clickEvent)
+KVSO_END_REGISTERCLASS(KvsObject_toolButton)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_toolbutton,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_toolButton,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_toolbutton)
+KVSO_END_CONSTRUCTOR(KvsObject_toolButton)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_toolbutton)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_toolButton)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_toolbutton)
+KVSO_END_CONSTRUCTOR(KvsObject_toolButton)
 
-bool KviKvsObject_toolbutton::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_toolButton::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QToolButton);
 	connect(widget(),SIGNAL(clicked()),this,SLOT(slotClicked()));
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,setImage)
+KVSO_CLASS_FUNCTION(toolButton,setImage)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString icon;
@@ -147,7 +147,7 @@ KVSO_CLASS_FUNCTION(toolbutton,setImage)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,setUsesBigPixmap)
+KVSO_CLASS_FUNCTION(toolButton,setUsesBigPixmap)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
@@ -158,14 +158,14 @@ KVSO_CLASS_FUNCTION(toolbutton,setUsesBigPixmap)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,usesBigPixmap)
+KVSO_CLASS_FUNCTION(toolButton,usesBigPixmap)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((QToolButton *)widget())->iconSize().height() > 22);
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,setUsesTextLabel)
+KVSO_CLASS_FUNCTION(toolButton,setUsesTextLabel)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
@@ -176,14 +176,14 @@ KVSO_CLASS_FUNCTION(toolbutton,setUsesTextLabel)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,usesTextLabel)
+KVSO_CLASS_FUNCTION(toolButton,usesTextLabel)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((QToolButton *)widget())->toolButtonStyle() != Qt::ToolButtonIconOnly);
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,setAutoRaise)
+KVSO_CLASS_FUNCTION(toolButton,setAutoRaise)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
@@ -194,14 +194,14 @@ KVSO_CLASS_FUNCTION(toolbutton,setAutoRaise)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,autoRaise)
+KVSO_CLASS_FUNCTION(toolButton,autoRaise)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setBoolean(((QToolButton *)widget())->autoRaise());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,setOn)
+KVSO_CLASS_FUNCTION(toolButton,setOn)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
@@ -212,7 +212,7 @@ KVSO_CLASS_FUNCTION(toolbutton,setOn)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,setToggleButton)
+KVSO_CLASS_FUNCTION(toolButton,setToggleButton)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	bool bEnabled;
@@ -223,14 +223,14 @@ KVSO_CLASS_FUNCTION(toolbutton,setToggleButton)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,toggle)
+KVSO_CLASS_FUNCTION(toolButton,toggle)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QToolButton *)widget())->toggle();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,setTextLabel)
+KVSO_CLASS_FUNCTION(toolButton,setTextLabel)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szLabel,szTip;
@@ -243,14 +243,14 @@ KVSO_CLASS_FUNCTION(toolbutton,setTextLabel)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,textLabel)
+KVSO_CLASS_FUNCTION(toolButton,textLabel)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setString(((QToolButton *)widget())->text());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,setPopup)
+KVSO_CLASS_FUNCTION(toolButton,setPopup)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject *ob;
@@ -278,14 +278,14 @@ KVSO_CLASS_FUNCTION(toolbutton,setPopup)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,openPopup)
+KVSO_CLASS_FUNCTION(toolButton,openPopup)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	((QToolButton *)widget())->showMenu();
 	return true;
 }
 /*
-KVSO_CLASS_FUNCTION(toolbutton,setPopupDelay)
+KVSO_CLASS_FUNCTION(toolButton,setPopupDelay)
 {
 	kvs_int_t uDelay;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -295,14 +295,14 @@ KVSO_CLASS_FUNCTION(toolbutton,setPopupDelay)
 		  ((QToolButton *)widget())->setPopupDelay(uDelay);
 	return true;
 }
-KVSO_CLASS_FUNCTION(toolbutton,popupDelay)
+KVSO_CLASS_FUNCTION(toolButton,popupDelay)
 {
 	if (widget())
 		c->returnValue()->setInteger(((QToolButton *)widget())->popupDelay());
 	return true;
 }
 */
-KVSO_CLASS_FUNCTION(toolbutton,setTextPosition)
+KVSO_CLASS_FUNCTION(toolButton,setTextPosition)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szPos;
@@ -317,7 +317,7 @@ KVSO_CLASS_FUNCTION(toolbutton,setTextPosition)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,textPosition)
+KVSO_CLASS_FUNCTION(toolButton,textPosition)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QString szPos="BelowIcon";
@@ -327,18 +327,18 @@ KVSO_CLASS_FUNCTION(toolbutton,textPosition)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(toolbutton,clickEvent)
+KVSO_CLASS_FUNCTION(toolButton,clickEvent)
 {
 	emitSignal("clicked",c);
 	return true;
 }
 
-void KviKvsObject_toolbutton::slotClicked()
+void KvsObject_toolButton::slotClicked()
 {
 	KviKvsVariantList *params=0;
 	callFunction(this,"clickEvent",params);
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_toolbutton.moc"
+#include "m_KvsObject_toolButton.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_toolbutton.h b/src/modules/objects/KvsObject_toolButton.h
index 519abb58f..041b5612b 100644
--- a/src/modules/objects/class_toolbutton.h
+++ b/src/modules/objects/KvsObject_toolButton.h
@@ -2,7 +2,7 @@
 #define _CLASS_TOOLBUTTON_H_
 //=============================================================================
 //
-//   File : class_toolbutton.cpp
+//   File : KvsObject_toolButton.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -27,14 +27,14 @@
 
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_toolbutton : public KviKvsObject_widget
+class KvsObject_toolButton : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_toolbutton)
+	KVSO_DECLARE_OBJECT(KvsObject_toolButton)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_trayicon.cpp b/src/modules/objects/KvsObject_trayIcon.cpp
index 55dc31765..67fb17c43 100644
--- a/src/modules/objects/class_trayicon.cpp
+++ b/src/modules/objects/KvsObject_trayIcon.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_trayicon.cpp
+//   File : KvsObject_trayIcon.cpp
 //   Creation date : Wed Ago 25 17:28:45 2010 GMT by Carbone Alesssandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "class_trayicon.h"
-#include "class_popupmenu.h"
+#include "KvsObject_trayIcon.h"
+#include "KvsObject_popupMenu.h"
 #include "KviIconManager.h"
 #include "kvi_debug.h"
 #include "KviError.h"
@@ -92,33 +92,33 @@
                 This signal is emitted by the default implementation of [classfnc]$messageClickedEvent[/classfnc].
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_trayicon,"trayicon","object")
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_trayicon,show)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_trayicon,hide)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_trayicon,isVisible)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_trayicon,setIcon)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_trayicon,setTooltip)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_trayicon,showMessage)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_trayicon,setContextMenu)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_trayIcon,"trayicon","object")
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon,show)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon,hide)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon,isVisible)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon,setIcon)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon,setTooltip)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon,showMessage)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon,setContextMenu)
 	// events
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_trayicon,activatedEvent)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_trayicon,messageClickedEvent)
-KVSO_END_REGISTERCLASS(KviKvsObject_trayicon)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon,activatedEvent)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_trayIcon,messageClickedEvent)
+KVSO_END_REGISTERCLASS(KvsObject_trayIcon)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_trayicon,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_trayIcon,KviKvsObject)
         m_pTrayIcon = new QSystemTrayIcon(0);
 	connect(m_pTrayIcon,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),this,SLOT(slotActivated(QSystemTrayIcon::ActivationReason)));
         connect(m_pTrayIcon,SIGNAL(messageClicked()),this,SLOT(slotMessageClicked()));
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_trayicon)
+KVSO_END_CONSTRUCTOR(KvsObject_trayIcon)
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_trayicon)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_trayIcon)
 	delete m_pTrayIcon;
-KVSO_END_DESTRUCTOR(KviKvsObject_trayicon)
+KVSO_END_DESTRUCTOR(KvsObject_trayIcon)
 
 
-KVSO_CLASS_FUNCTION(trayicon,setIcon)
+KVSO_CLASS_FUNCTION(trayIcon,setIcon)
 {
         CHECK_INTERNAL_POINTER(m_pTrayIcon)
         QString szIcon;
@@ -129,7 +129,7 @@ KVSO_CLASS_FUNCTION(trayicon,setIcon)
         if(pix) m_pTrayIcon->setIcon(*pix);
         return true;
 }
-KVSO_CLASS_FUNCTION(trayicon,setTooltip)
+KVSO_CLASS_FUNCTION(trayIcon,setTooltip)
 {
 	CHECK_INTERNAL_POINTER(m_pTrayIcon)
         QString szTooltip;
@@ -139,26 +139,26 @@ KVSO_CLASS_FUNCTION(trayicon,setTooltip)
         m_pTrayIcon->setToolTip(szTooltip);
 	return true;
 }
-KVSO_CLASS_FUNCTION(trayicon,show)
+KVSO_CLASS_FUNCTION(trayIcon,show)
 {
         CHECK_INTERNAL_POINTER(m_pTrayIcon)
         m_pTrayIcon->show();
         return true;
 }
-KVSO_CLASS_FUNCTION(trayicon,hide)
+KVSO_CLASS_FUNCTION(trayIcon,hide)
 {
         CHECK_INTERNAL_POINTER(m_pTrayIcon)
         m_pTrayIcon->show();
         return true;
 }
-KVSO_CLASS_FUNCTION(trayicon,isVisible)
+KVSO_CLASS_FUNCTION(trayIcon,isVisible)
 {
         CHECK_INTERNAL_POINTER(m_pTrayIcon)
         c->returnValue()->setBoolean(m_pTrayIcon->isVisible());
         return true;
 }
 
-KVSO_CLASS_FUNCTION(trayicon,showMessage)
+KVSO_CLASS_FUNCTION(trayIcon,showMessage)
 {
 	CHECK_INTERNAL_POINTER(m_pTrayIcon)
         QString szMessage,szTitle,szMessageIcon;
@@ -179,7 +179,7 @@ KVSO_CLASS_FUNCTION(trayicon,showMessage)
         return true;
 }
 
-KVSO_CLASS_FUNCTION(trayicon,setContextMenu)
+KVSO_CLASS_FUNCTION(trayIcon,setContextMenu)
 {
 	CHECK_INTERNAL_POINTER(m_pTrayIcon)
         KviKvsObject *ob;
@@ -206,23 +206,23 @@ KVSO_CLASS_FUNCTION(trayicon,setContextMenu)
          m_pTrayIcon->setContextMenu(((QMenu  *)(ob->object())));
         return true;
 }
-KVSO_CLASS_FUNCTION(trayicon,activatedEvent)
+KVSO_CLASS_FUNCTION(trayIcon,activatedEvent)
 {
 	emitSignal("activated",c,c->params());
 	return true;
 }
-KVSO_CLASS_FUNCTION(trayicon,messageClickedEvent)
+KVSO_CLASS_FUNCTION(trayIcon,messageClickedEvent)
 {
         emitSignal("messageClicked",c,c->params());
         return true;
 }
-void KviKvsObject_trayicon::slotMessageClicked()
+void KvsObject_trayIcon::slotMessageClicked()
 {
     KviKvsVariantList *lParams=0;
     callFunction(this,"messageClickedEvent",0,lParams);
 }
 
-void KviKvsObject_trayicon::slotActivated(QSystemTrayIcon::ActivationReason reason)
+void KvsObject_trayIcon::slotActivated(QSystemTrayIcon::ActivationReason reason)
 {
         QString szReason;
         if (reason==QSystemTrayIcon::Unknown)
@@ -239,5 +239,5 @@ void KviKvsObject_trayicon::slotActivated(QSystemTrayIcon::ActivationReason reas
         callFunction(this,"activatedEvent",0,&lParams);
 }
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_trayicon.moc"
+#include "m_KvsObject_trayIcon.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_trayicon.h b/src/modules/objects/KvsObject_trayIcon.h
index ea7f7d5b7..4bec98e67 100644
--- a/src/modules/objects/class_trayicon.h
+++ b/src/modules/objects/KvsObject_trayIcon.h
@@ -2,7 +2,7 @@
 #define _CLASS_TRAYICON_H_
 //=============================================================================
 //
-//   File : class_trayicon.h
+//   File : KvsObject_trayIcon.h
 //   Creation date : Wed Ago 25 17:28:45 2010 GMT by Carbone Alesssandro
 //
 //   This file is part of the KVIrc irc client distribution
@@ -32,11 +32,11 @@
 #include <QSystemTrayIcon>
 #include <QMenu>
 
-class KviKvsObject_trayicon : public KviKvsObject
+class KvsObject_trayIcon : public KviKvsObject
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_trayicon)
+	KVSO_DECLARE_OBJECT(KvsObject_trayIcon)
 protected:
         QSystemTrayIcon *m_pTrayIcon;
 protected:
diff --git a/src/modules/objects/class_treewidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp
index 5385df3da..c12649bfb 100644
--- a/src/modules/objects/class_treewidget.cpp
+++ b/src/modules/objects/KvsObject_treeWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_treewidget.cpp
+//   File : KvsObject_treeWidget.cpp
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "class_treewidget.h"
+#include "KvsObject_treeWidget.h"
 
 #include "KviError.h"
 #include "kvi_debug.h"
@@ -184,58 +184,58 @@
 
 //---------------------------------------------------------------------------------
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_treewidget,"listview","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_treeWidget,"listview","widget")
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setHeaderLabels)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,addColumn)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,setHeaderLabels)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,addColumn)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setColumnText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setColumnCount)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,setColumnText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,setColumnCount)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setSorting)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setSortingEnabled)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setRootIsDecorated)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setAllColumnsShowFocus)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,clear)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,selectedItems)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,currentItem)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setSelectionMode)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,listViewHeaderIsVisible)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,itemAt)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,setSorting)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,setSortingEnabled)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,setRootIsDecorated)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,setAllColumnsShowFocus)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,clear)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,selectedItems)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,currentItem)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,setSelectionMode)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,listViewHeaderIsVisible)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,itemAt)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,hideListViewHeader)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,showListViewHeader)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,firstChild)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,topLevelItem)
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,topLevelItemCount)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,hideListViewHeader)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,showListViewHeader)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,firstChild)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,topLevelItem)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,topLevelItemCount)
 
 
 
 
         //events
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,selectionChangedEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,currentChangedEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,itemActivatedEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,onItemEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,itemClickedEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,itemExpandedEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,itemCollapsedEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,itemChangedEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidget,setAcceptDrops);
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_treewidget,"fileDroppedEvent")
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,selectionChangedEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,currentChangedEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,itemActivatedEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,onItemEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,itemClickedEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,itemExpandedEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,itemCollapsedEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,itemChangedEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidget,setAcceptDrops);
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_treeWidget,"fileDroppedEvent")
 
-KVSO_END_REGISTERCLASS(KviKvsObject_treewidget)
+KVSO_END_REGISTERCLASS(KvsObject_treeWidget)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_treewidget,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_treeWidget,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_treewidget)
+KVSO_END_CONSTRUCTOR(KvsObject_treeWidget)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_treewidget)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_treeWidget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_treewidget)
+KVSO_END_CONSTRUCTOR(KvsObject_treeWidget)
 
-bool KviKvsObject_treewidget::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_treeWidget::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	setObject(new KviKvsTreeWidget(parentScriptWidget(),getName().toUtf8().data(),this),true);
 	// hack for compatibility with "old" addColumn method;
@@ -252,7 +252,7 @@ bool KviKvsObject_treewidget::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,setHeaderLabels)
+KVSO_CLASS_FUNCTION(treeWidget,setHeaderLabels)
 {
 	QStringList columns;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -264,7 +264,7 @@ KVSO_CLASS_FUNCTION(treewidget,setHeaderLabels)
     return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,setColumnText)
+KVSO_CLASS_FUNCTION(treeWidget,setColumnText)
 {
 	if (!widget()) return true;
 	QString szLabel;
@@ -278,7 +278,7 @@ KVSO_CLASS_FUNCTION(treewidget,setColumnText)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,topLevelItem)
+KVSO_CLASS_FUNCTION(treeWidget,topLevelItem)
 {
         if (!widget()) return true;
         kvs_int_t iIdx;
@@ -287,10 +287,10 @@ KVSO_CLASS_FUNCTION(treewidget,topLevelItem)
         KVSO_PARAMETERS_END(c)
         QTreeWidgetItem *pItem=((QTreeWidget *)widget())->topLevelItem(iIdx);
         if (!pItem) c->returnValue()->setHObject((kvs_hobject_t)0);
-        else  c->returnValue()->setHObject(KviKvsObject_treewidgetitem::itemToHandle(pItem));
+        else  c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle(pItem));
         return true;
 }
-KVSO_CLASS_FUNCTION(treewidget,itemAt)
+KVSO_CLASS_FUNCTION(treeWidget,itemAt)
 {
 	if (!widget()) return true;
 	kvs_int_t iXpos,iYpos;
@@ -301,17 +301,17 @@ KVSO_CLASS_FUNCTION(treewidget,itemAt)
 	QPoint pPoint=((QTreeWidget *)widget())->viewport()->mapFromGlobal(QPoint(iXpos,iYpos));
 	QTreeWidgetItem *pItem=((QTreeWidget *)widget())->itemAt(pPoint);
 	if (!pItem) c->returnValue()->setHObject((kvs_hobject_t)0);
-	else  c->returnValue()->setHObject(KviKvsObject_treewidgetitem::itemToHandle(pItem));
+	else  c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle(pItem));
 	return true;
 }
-KVSO_CLASS_FUNCTION(treewidget,topLevelItemCount)
+KVSO_CLASS_FUNCTION(treeWidget,topLevelItemCount)
 {
         if (!widget()) return true;
 	c->returnValue()->setInteger(((QTreeWidget *)widget())->topLevelItemCount());
         return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,addColumn)
+KVSO_CLASS_FUNCTION(treeWidget,addColumn)
 {
 	if (!widget()) return true;
 	QString szLabel;
@@ -330,7 +330,7 @@ KVSO_CLASS_FUNCTION(treewidget,addColumn)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,setAcceptDrops)
+KVSO_CLASS_FUNCTION(treeWidget,setAcceptDrops)
 {
 	bool bEnable;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -341,7 +341,7 @@ KVSO_CLASS_FUNCTION(treewidget,setAcceptDrops)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,clear)
+KVSO_CLASS_FUNCTION(treeWidget,clear)
 {
 	Q_UNUSED(c);
 	if (widget())
@@ -349,7 +349,7 @@ KVSO_CLASS_FUNCTION(treewidget,clear)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,selectedItems)
+KVSO_CLASS_FUNCTION(treeWidget,selectedItems)
 {
 	if(widget())
 	{
@@ -357,32 +357,32 @@ KVSO_CLASS_FUNCTION(treewidget,selectedItems)
 		KviKvsArray * pArray = new KviKvsArray();
 		c->returnValue()->setArray(pArray);
 		for (int i=0;i<list.count();i++)
-			pArray->set(i,new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle((QTreeWidgetItem*)list.at(i))));
+			pArray->set(i,new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem*)list.at(i))));
 	}
 	else
 		c->returnValue()->setHObject((kvs_hobject_t)0);
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,firstChild)
+KVSO_CLASS_FUNCTION(treeWidget,firstChild)
 {
 	if(widget())
-		c->returnValue()->setHObject(KviKvsObject_treewidgetitem::itemToHandle((QTreeWidgetItem*)((QTreeWidget *)widget())->topLevelItem(0)));
+		c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem*)((QTreeWidget *)widget())->topLevelItem(0)));
 	else
 		c->returnValue()->setHObject((kvs_hobject_t)0);
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,currentItem)
+KVSO_CLASS_FUNCTION(treeWidget,currentItem)
 {
 	if(widget())
-		c->returnValue()->setHObject(KviKvsObject_treewidgetitem::itemToHandle((QTreeWidgetItem*)((QTreeWidget *)widget())->currentItem()));
+		c->returnValue()->setHObject(KvsObject_treeWidgetItem::itemToHandle((QTreeWidgetItem*)((QTreeWidget *)widget())->currentItem()));
 	else
 		c->returnValue()->setHObject((kvs_hobject_t)0);
 	return true;
 }
 /*
-KVSO_CLASS_FUNCTION(treewidget,setColumnText)
+KVSO_CLASS_FUNCTION(treeWidget,setColumnText)
 {
 	kvs_int_t uCol;
 	QString szText;
@@ -394,7 +394,7 @@ KVSO_CLASS_FUNCTION(treewidget,setColumnText)
     return true;
 }
 */
-KVSO_CLASS_FUNCTION(treewidget,setColumnCount)
+KVSO_CLASS_FUNCTION(treeWidget,setColumnCount)
 {
 	kvs_uint_t uCol;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -404,7 +404,7 @@ KVSO_CLASS_FUNCTION(treewidget,setColumnCount)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,setSelectionMode)
+KVSO_CLASS_FUNCTION(treeWidget,setSelectionMode)
 {
 	QString szMode;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -423,7 +423,7 @@ KVSO_CLASS_FUNCTION(treewidget,setSelectionMode)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,setSorting)
+KVSO_CLASS_FUNCTION(treeWidget,setSorting)
 {
 	kvs_int_t iCol;
 	QString szOrder;
@@ -437,7 +437,7 @@ KVSO_CLASS_FUNCTION(treewidget,setSorting)
 	else c->warning(__tr2qs_ctx("Unknown '%Q' sort order: switching to ascending order","objects"),&szOrder);
 	return true;
 }
-KVSO_CLASS_FUNCTION(treewidget,setSortingEnabled)
+KVSO_CLASS_FUNCTION(treeWidget,setSortingEnabled)
 {
 	bool bEnables;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -448,7 +448,7 @@ KVSO_CLASS_FUNCTION(treewidget,setSortingEnabled)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,setRootIsDecorated)
+KVSO_CLASS_FUNCTION(treeWidget,setRootIsDecorated)
 {
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -458,7 +458,7 @@ KVSO_CLASS_FUNCTION(treewidget,setRootIsDecorated)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,setAllColumnsShowFocus)
+KVSO_CLASS_FUNCTION(treeWidget,setAllColumnsShowFocus)
 {
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -468,52 +468,52 @@ KVSO_CLASS_FUNCTION(treewidget,setAllColumnsShowFocus)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,hideListViewHeader)
+KVSO_CLASS_FUNCTION(treeWidget,hideListViewHeader)
 {
 	Q_UNUSED(c);
 	((QTreeWidget *)widget())->header()->hide();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,showListViewHeader)
+KVSO_CLASS_FUNCTION(treeWidget,showListViewHeader)
 {
 	Q_UNUSED(c);
 	((QTreeWidget *)widget())->header()->show();
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,listViewHeaderIsVisible)
+KVSO_CLASS_FUNCTION(treeWidget,listViewHeaderIsVisible)
 {
 	c->returnValue()->setBoolean(((QTreeWidget *)widget())->header()->isVisible());
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidget,itemClickedEvent)
+KVSO_CLASS_FUNCTION(treeWidget,itemClickedEvent)
 {
 	emitSignal("itemClicked",c,c->params());
 	return true;
 }
 
-void KviKvsObject_treewidget::slotClicked(QTreeWidgetItem * i,int col)
+void KvsObject_treeWidget::slotClicked(QTreeWidgetItem * i,int col)
 {
 	KviKvsVariant *column=new KviKvsVariant((kvs_int_t)col);
 
-	KviKvsVariantList params(new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle(i)),column);
+	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)),column);
 	callFunction(this,"itemClickedEvent",0,&params);
 }
 
-KVSO_CLASS_FUNCTION(treewidget,selectionChangedEvent)
+KVSO_CLASS_FUNCTION(treeWidget,selectionChangedEvent)
 {
 	emitSignal("selectionChanged",c,c->params());
 	return true;
 }
 
-void KviKvsObject_treewidget::slotSelectionChanged()
+void KvsObject_treeWidget::slotSelectionChanged()
 {
 	if (((QTreeWidget *)widget())->selectionMode()==QTreeWidget::SingleSelection)
 	{
 		QTreeWidgetItem *it=(QTreeWidgetItem *) ((QTreeWidget *)widget())->currentItem();
-		KviKvsVariantList params(new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle(it)));
+		KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(it)));
 		callFunction(this,"selectionChangedEvent",0,&params);
 	}
 	else{
@@ -522,93 +522,93 @@ void KviKvsObject_treewidget::slotSelectionChanged()
 	}
 }
 
-KVSO_CLASS_FUNCTION(treewidget,currentChangedEvent)
+KVSO_CLASS_FUNCTION(treeWidget,currentChangedEvent)
 {
 	emitSignal("currentChanged",c,c->params());
 	return true;
 }
 
-void KviKvsObject_treewidget::slotCurrentChanged(QTreeWidgetItem * i,QTreeWidgetItem *prev)
+void KvsObject_treeWidget::slotCurrentChanged(QTreeWidgetItem * i,QTreeWidgetItem *prev)
 {
-	KviKvsVariantList params(new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle(i)),new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle(prev)));
+	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)),new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(prev)));
 	callFunction(this,"currentChangedEvent",0,&params);
 }
 
-KVSO_CLASS_FUNCTION(treewidget,itemActivatedEvent)
+KVSO_CLASS_FUNCTION(treeWidget,itemActivatedEvent)
 {
         emitSignal("itemActivated",c,c->params());
 	return true;
 }
 
-void KviKvsObject_treewidget::slotItemActivated(QTreeWidgetItem * i,int col)
+void KvsObject_treeWidget::slotItemActivated(QTreeWidgetItem * i,int col)
 {
 	KviKvsVariant *column=new KviKvsVariant((kvs_int_t)col);
-	KviKvsVariantList params(new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle(i)),column);
+	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)),column);
 	callFunction(this,"itemActivatedEvent",0,&params);
 }
 
-KVSO_CLASS_FUNCTION(treewidget,onItemEvent)
+KVSO_CLASS_FUNCTION(treeWidget,onItemEvent)
 {
 
 	emitSignal("onItem",c,c->params());
 	return true;
 }
 
-void KviKvsObject_treewidget::slotOnItemEntered(QTreeWidgetItem * i,int col)
+void KvsObject_treeWidget::slotOnItemEntered(QTreeWidgetItem * i,int col)
 {
 	KviKvsVariant *column=new KviKvsVariant((kvs_int_t)col);
 
-	KviKvsVariantList params(new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle(i)),column);
+	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)),column);
 	callFunction(this,"onItemEvent",0,&params);
 }
 
-KVSO_CLASS_FUNCTION(treewidget,itemExpandedEvent)
+KVSO_CLASS_FUNCTION(treeWidget,itemExpandedEvent)
 {
 	emitSignal("itemExpanded",c,c->params());
 	return true;
 }
 
-void KviKvsObject_treewidget::slotItemExpanded(QTreeWidgetItem * i)
+void KvsObject_treeWidget::slotItemExpanded(QTreeWidgetItem * i)
 {
-	KviKvsVariantList params(new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle(i)));
+	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)));
 	callFunction(this,"itemExpandedEvent",0,&params);
 }
 
-KVSO_CLASS_FUNCTION(treewidget,itemCollapsedEvent)
+KVSO_CLASS_FUNCTION(treeWidget,itemCollapsedEvent)
 {
 	emitSignal("itemCollapsed",c,c->params());
 	return true;
 }
 
-void KviKvsObject_treewidget::slotItemCollapsed(QTreeWidgetItem * i)
+void KvsObject_treeWidget::slotItemCollapsed(QTreeWidgetItem * i)
 {
-	KviKvsVariantList params(new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle(i)));
+	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(i)));
 	callFunction(this,"itemCollapsedEvent",0,&params);
 }
 
 
 
-KVSO_CLASS_FUNCTION(treewidget,itemChangedEvent)
+KVSO_CLASS_FUNCTION(treeWidget,itemChangedEvent)
 {
 	emitSignal("itemChanged",c,c->params());
 	return true;
 }
 
-void KviKvsObject_treewidget::slotItemChanged(QTreeWidgetItem *item,int col)
+void KvsObject_treeWidget::slotItemChanged(QTreeWidgetItem *item,int col)
 {
 	KviKvsVariant *column=new KviKvsVariant((kvs_int_t)col);
-	KviKvsVariantList params(new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle(item)),column);
+	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(item)),column);
 	callFunction(this,"itemChangedEvent",0,&params);
 }
 
-void KviKvsObject_treewidget::fileDropped(QString &szFile,QTreeWidgetItem *item)
+void KvsObject_treeWidget::fileDropped(QString &szFile,QTreeWidgetItem *item)
 {
 	KviKvsVariant *file=new KviKvsVariant(szFile);
-	KviKvsVariantList params(new KviKvsVariant(KviKvsObject_treewidgetitem::itemToHandle(item)),file);
+	KviKvsVariantList params(new KviKvsVariant(KvsObject_treeWidgetItem::itemToHandle(item)),file);
 	callFunction(this,"fileDroppedEvent",0,&params);
 }
 
-KviKvsTreeWidget::KviKvsTreeWidget(QWidget * par,const char *,KviKvsObject_treewidget *parent)
+KviKvsTreeWidget::KviKvsTreeWidget(QWidget * par,const char *,KvsObject_treeWidget *parent)
 :QTreeWidget(par)
 {
 	m_pParentScript=parent;
@@ -662,5 +662,5 @@ void KviKvsTreeWidget::dropEvent(QDropEvent * e)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_treewidget.moc"
+#include "m_KvsObject_treeWidget.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_treewidget.h b/src/modules/objects/KvsObject_treeWidget.h
index 579bce997..05fb3f4cc 100644
--- a/src/modules/objects/class_treewidget.h
+++ b/src/modules/objects/KvsObject_treeWidget.h
@@ -2,7 +2,7 @@
 #define _CLASS_TREEWIDGET_H_
 //=============================================================================
 //
-//   File : class_treewidget.h
+//   File : KvsObject_treeWidget.h
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -25,17 +25,17 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
-#include "class_treewidgetitem.h"
+#include "KvsObject_widget.h"
+#include "KvsObject_treeWidgeteItem.h"
 #include "object_macros.h"
 
 #include <QTreeWidget>
 
-class KviKvsObject_treewidget : public KviKvsObject_widget
+class KvsObject_treeWidget : public KvsObject_widget
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_treewidget)
+	KVSO_DECLARE_OBJECT(KvsObject_treeWidget)
 
 public:
 	QWidget * widget() { return (QWidget *)object(); };
@@ -87,10 +87,10 @@ class KviKvsTreeWidget : public QTreeWidget
 {
 	Q_OBJECT
 public:
-	KviKvsTreeWidget(QWidget * par, const char * name, KviKvsObject_treewidget *);
+	KviKvsTreeWidget(QWidget * par, const char * name, KvsObject_treeWidget *);
 	virtual ~KviKvsTreeWidget();
 protected:
-	KviKvsObject_treewidget * m_pParentScript;
+	KvsObject_treeWidget * m_pParentScript;
 protected:
 	void dropEvent(QDropEvent * e);
 	void dragEnterEvent(QDragEnterEvent * e);
diff --git a/src/modules/objects/class_treewidgetitem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
index e9ac48c1a..da7422687 100644
--- a/src/modules/objects/class_treewidgetitem.cpp
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_treewidgetitem.cpp
+//   File : KvsObject_treeWidgeteItem.cpp
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,8 +23,8 @@
 //
 //=============================================================================
 
-#include "class_treewidgetitem.h"
-#include "class_pixmap.h"
+#include "KvsObject_treeWidgeteItem.h"
+#include "KvsObject_pixmap.h"
 
 #include "KviError.h"
 #include "kvi_debug.h"
@@ -142,39 +142,39 @@ const char * const itemflags_tbl[] = {
 
 //===========================================================================================
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_treewidgetitem,"listviewitem","object")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setText)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,text)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setPixmap);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setItemEditable);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,isItemEditable);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setEnabled);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,isEnabled);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setOpen);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,isOpen);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setCheckable);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,isCheckable);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setChecked);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,isChecked);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_treewidgetitem,setFlags);
+KVSO_BEGIN_REGISTERCLASS(KvsObject_treeWidgetItem,"listviewitem","object")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,setText)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,text)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,setPixmap);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,setItemEditable);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,isItemEditable);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,setEnabled);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,isEnabled);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,setOpen);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,isOpen);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,setCheckable);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,isCheckable);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,setChecked);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,isChecked);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_treeWidgetItem,setFlags);
 
-KVSO_END_REGISTERCLASS(KviKvsObject_treewidgetitem)
+KVSO_END_REGISTERCLASS(KvsObject_treeWidgetItem)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_treewidgetitem,KviKvsObject)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_treeWidgetItem,KviKvsObject)
 
 	m_pTreeWidgetItem = 0;
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_treewidgetitem)
+KVSO_END_CONSTRUCTOR(KvsObject_treeWidgetItem)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_treewidgetitem)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_treeWidgetItem)
 
 	if(m_pTreeWidgetItem)delete m_pTreeWidgetItem;
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_treewidgetitem)
+KVSO_END_CONSTRUCTOR(KvsObject_treeWidgetItem)
 
-bool KviKvsObject_treewidgetitem::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *)
+bool KvsObject_treeWidgetItem::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *)
 {
 	if (!parentObject())
 	{
@@ -183,7 +183,7 @@ bool KviKvsObject_treewidgetitem::init(KviKvsRunTimeContext * pContext,KviKvsVar
 	}
 	if(parentObject()->inheritsClass("listviewitem"))
 	{
-		 m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,((KviKvsObject_treewidgetitem *)parentObject())->m_pTreeWidgetItem);
+		 m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,((KvsObject_treeWidgetItem *)parentObject())->m_pTreeWidgetItem);
 	} else {
 		if(parentObject()->inheritsClass("listview"))
 			m_pTreeWidgetItem = new KviKvsStandardTreeWidgetItem(this,((QTreeWidget *)parentScriptWidget()));
@@ -195,19 +195,19 @@ bool KviKvsObject_treewidgetitem::init(KviKvsRunTimeContext * pContext,KviKvsVar
 	return true;
 }
 
-void KviKvsObject_treewidgetitem::childDestroyed()
+void KvsObject_treeWidgetItem::childDestroyed()
 {
 	if(m_pTreeWidgetItem == 0)return;
 	m_pTreeWidgetItem = 0;
 	die();
 }
 
-KviKvsStandardTreeWidgetItem::KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,QTreeWidget * par)
+KviKvsStandardTreeWidgetItem::KviKvsStandardTreeWidgetItem(KvsObject_treeWidgetItem * ob,QTreeWidget * par)
 :QTreeWidgetItem(par), m_pMasterObject(ob)
 {
 }
 
-KviKvsStandardTreeWidgetItem::KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,QTreeWidgetItem * par)
+KviKvsStandardTreeWidgetItem::KviKvsStandardTreeWidgetItem(KvsObject_treeWidgetItem * ob,QTreeWidgetItem * par)
 :QTreeWidgetItem(par), m_pMasterObject(ob)
 {
 }
@@ -217,16 +217,16 @@ KviKvsStandardTreeWidgetItem::~KviKvsStandardTreeWidgetItem()
 	if(m_pMasterObject)m_pMasterObject->childDestroyed();
 }
 
-kvs_hobject_t KviKvsObject_treewidgetitem::itemToHandle(QTreeWidgetItem * it)
+kvs_hobject_t KvsObject_treeWidgetItem::itemToHandle(QTreeWidgetItem * it)
 {
 	if(!it)return (kvs_hobject_t)0;
-	KviKvsObject_treewidgetitem * pObject;
+	KvsObject_treeWidgetItem * pObject;
 	pObject = ((KviKvsStandardTreeWidgetItem *)it)->masterObject();
 	if(!pObject)return (kvs_hobject_t)0;
 	return pObject->handle();
 }
 
-KVSO_CLASS_FUNCTION(treewidgetitem,setText)
+KVSO_CLASS_FUNCTION(treeWidgetItem,setText)
 {
 	kvs_uint_t uCol;
 	QString szText;
@@ -240,7 +240,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setText)
 }
 
 
-KVSO_CLASS_FUNCTION(treewidgetitem,setItemEditable)
+KVSO_CLASS_FUNCTION(treeWidgetItem,setItemEditable)
 {
         bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -250,7 +250,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setItemEditable)
             m_pTreeWidgetItem->setFlags(bEnabled?m_pTreeWidgetItem->flags()|Qt::ItemIsEditable:m_pTreeWidgetItem->flags()&~Qt::ItemIsEditable);
 	return true;
 }
-KVSO_CLASS_FUNCTION(treewidgetitem,isItemEditable)
+KVSO_CLASS_FUNCTION(treeWidgetItem,isItemEditable)
 {
         if(!m_pTreeWidgetItem)
         {
@@ -260,7 +260,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,isItemEditable)
         c->returnValue()->setBoolean(m_pTreeWidgetItem->flags()&Qt::ItemIsEditable);
         return true;
 }
-KVSO_CLASS_FUNCTION(treewidgetitem,setFlags)
+KVSO_CLASS_FUNCTION(treeWidgetItem,setFlags)
 {
 	QStringList itemflags;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -292,7 +292,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setFlags)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidgetitem,setEnabled)
+KVSO_CLASS_FUNCTION(treeWidgetItem,setEnabled)
 {
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -303,7 +303,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setEnabled)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidgetitem,isEnabled)
+KVSO_CLASS_FUNCTION(treeWidgetItem,isEnabled)
 {
 	if(!m_pTreeWidgetItem)
 	{
@@ -314,7 +314,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,isEnabled)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidgetitem,setOpen)
+KVSO_CLASS_FUNCTION(treeWidgetItem,setOpen)
 {
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -325,7 +325,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setOpen)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidgetitem,isOpen)
+KVSO_CLASS_FUNCTION(treeWidgetItem,isOpen)
 {
 	if(!m_pTreeWidgetItem)
 	{
@@ -336,7 +336,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,isOpen)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidgetitem,setChecked)
+KVSO_CLASS_FUNCTION(treeWidgetItem,setChecked)
 {
 	bool bChecked;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -347,7 +347,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setChecked)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidgetitem,isChecked)
+KVSO_CLASS_FUNCTION(treeWidgetItem,isChecked)
 {
 	if(!m_pTreeWidgetItem)
 	{
@@ -358,7 +358,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,isChecked)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidgetitem,setCheckable)
+KVSO_CLASS_FUNCTION(treeWidgetItem,setCheckable)
 {
         bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -369,7 +369,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setCheckable)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidgetitem,isCheckable)
+KVSO_CLASS_FUNCTION(treeWidgetItem,isCheckable)
 {
 	if(!m_pTreeWidgetItem)
 	{
@@ -380,7 +380,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,isCheckable)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidgetitem,text)
+KVSO_CLASS_FUNCTION(treeWidgetItem,text)
 {
 	kvs_uint_t uCol;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -391,7 +391,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,text)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(treewidgetitem,setPixmap)
+KVSO_CLASS_FUNCTION(treeWidgetItem,setPixmap)
 {
 	kvs_uint_t uCol;
 	KviKvsObject *obPixmap;
@@ -412,7 +412,7 @@ KVSO_CLASS_FUNCTION(treewidgetitem,setPixmap)
                         c->warning(__tr2qs_ctx("Pixmap object or image Id required","objects"));
 			return true;
 		}
-		pix=((KviKvsObject_pixmap *)obPixmap)->getPixmap();
+		pix=((KvsObject_pixmap *)obPixmap)->getPixmap();
 	} else {
 		QString szPix;
 		vPixmap->asString(szPix);
diff --git a/src/modules/objects/class_treewidgetitem.h b/src/modules/objects/KvsObject_treeWidgeteItem.h
index 8700232d2..d2c56b8c6 100644
--- a/src/modules/objects/class_treewidgetitem.h
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.h
@@ -2,7 +2,7 @@
 #define _CLASS_TREEWIDGETITEM_H_
 //=============================================================================
 //
-//   File : class_treewidgetitem.h
+//   File : KvsObject_treeWidgeteItem.h
 //   Creation date : Fri Jan 28 14:21:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -26,15 +26,15 @@
 //=============================================================================
 
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
 #include <QTreeWidget>
 
-class KviKvsObject_treewidgetitem : public KviKvsObject
+class KvsObject_treeWidgetItem : public KviKvsObject
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_treewidgetitem)
+	KVSO_DECLARE_OBJECT(KvsObject_treeWidgetItem)
 	void childDestroyed();
 protected:
 	QTreeWidgetItem * m_pTreeWidgetItem;
@@ -65,13 +65,13 @@ public:
 class KviKvsStandardTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,QTreeWidget * par);
-	KviKvsStandardTreeWidgetItem(KviKvsObject_treewidgetitem * ob,QTreeWidgetItem * par);
+	KviKvsStandardTreeWidgetItem(KvsObject_treeWidgetItem * ob,QTreeWidget * par);
+	KviKvsStandardTreeWidgetItem(KvsObject_treeWidgetItem * ob,QTreeWidgetItem * par);
 	virtual ~KviKvsStandardTreeWidgetItem();
 protected:
-	KviKvsObject_treewidgetitem * m_pMasterObject;
+	KvsObject_treeWidgetItem * m_pMasterObject;
 public:
-	KviKvsObject_treewidgetitem * masterObject(){ return m_pMasterObject; }
+	KvsObject_treeWidgetItem * masterObject(){ return m_pMasterObject; }
 };
 
 
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/KvsObject_vBox.cpp
index b2f6251a7..65fced903 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/KvsObject_vBox.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_vbox.cpp
+//   File : KvsObject_vBox.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -27,7 +27,7 @@
 #include "kvi_debug.h"
 #include "KviLocale.h"
 
-#include "class_vbox.h"
+#include "KvsObject_vBox.h"
 
 #include "KviTalVBox.h"
 
@@ -87,24 +87,24 @@ const int align_cod[] = {
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_vbox,"vbox","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_vbox,setMargin)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_vbox,setSpacing)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_vbox,setStretchFactor)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_vbox,addStretch)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_vbox,setAlignment)
-KVSO_END_REGISTERCLASS(KviKvsObject_vbox)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_vBox,"vbox","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_vBox,setMargin)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_vBox,setSpacing)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_vBox,setStretchFactor)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_vBox,addStretch)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_vBox,setAlignment)
+KVSO_END_REGISTERCLASS(KvsObject_vBox)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_vbox,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_vBox,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_vbox)
+KVSO_END_CONSTRUCTOR(KvsObject_vBox)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_vbox)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_vBox)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_vbox)
+KVSO_END_CONSTRUCTOR(KvsObject_vBox)
 
-bool KviKvsObject_vbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
+bool KvsObject_vBox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	Q_UNUSED(pContext);
 	Q_UNUSED(pParams);
@@ -113,7 +113,7 @@ bool KviKvsObject_vbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(vbox,setMargin)
+KVSO_CLASS_FUNCTION(vBox,setMargin)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iMargin;
@@ -124,7 +124,7 @@ KVSO_CLASS_FUNCTION(vbox,setMargin)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(vbox,setSpacing)
+KVSO_CLASS_FUNCTION(vBox,setSpacing)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iSpacing;
@@ -135,7 +135,7 @@ KVSO_CLASS_FUNCTION(vbox,setSpacing)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(vbox,setStretchFactor)
+KVSO_CLASS_FUNCTION(vBox,setStretchFactor)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	KviKvsObject * pObject;
@@ -148,7 +148,7 @@ KVSO_CLASS_FUNCTION(vbox,setStretchFactor)
 	pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 	return true;
 	CHECK_HOBJECT_IS_WIDGET(pObject)
-	if(((KviKvsObject_widget *)pObject)->widget()->parentWidget() != widget())
+	if(((KvsObject_widget *)pObject)->widget()->parentWidget() != widget())
 	{
 		c->warning(__tr2qs_ctx("The widget must be a child of this vbox","objects"));
 		return true;
@@ -156,7 +156,7 @@ KVSO_CLASS_FUNCTION(vbox,setStretchFactor)
 	((KviTalVBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
 	return true;
 }
-KVSO_CLASS_FUNCTION(vbox,addStretch)
+KVSO_CLASS_FUNCTION(vBox,addStretch)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	kvs_int_t iStretch;
@@ -166,7 +166,7 @@ KVSO_CLASS_FUNCTION(vbox,addStretch)
 	((KviTalVBox *)widget())->addStretch(iStretch);
 	return true;
 }
-KVSO_CLASS_FUNCTION(vbox,setAlignment)
+KVSO_CLASS_FUNCTION(vBox,setAlignment)
 {
 	CHECK_INTERNAL_POINTER(widget())
 	QStringList alignment;
@@ -178,7 +178,7 @@ KVSO_CLASS_FUNCTION(vbox,setAlignment)
 	KVSO_PARAMETERS_END(c)
 	pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 	CHECK_HOBJECT_IS_WIDGET(pObject)
-	if(((KviKvsObject_widget *)pObject)->widget()->parentWidget() != widget())
+	if(((KvsObject_widget *)pObject)->widget()->parentWidget() != widget())
 	{
 		c->warning(__tr2qs_ctx("The widget must be a child of this hbox","objects"));
 		return true;
diff --git a/src/modules/objects/class_vbox.h b/src/modules/objects/KvsObject_vBox.h
index 844f6ff8a..08342bea2 100644
--- a/src/modules/objects/class_vbox.h
+++ b/src/modules/objects/KvsObject_vBox.h
@@ -2,7 +2,7 @@
 #define _CLASS_VBOX_H_
 //=============================================================================
 //
-//   File : class_vbox.h
+//   File : KvsObject_vBox.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -26,13 +26,13 @@
 //=============================================================================
 
 #include "KviCString.h"
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_vbox : public KviKvsObject_widget
+class KvsObject_vBox : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_vbox)
+	KVSO_DECLARE_OBJECT(KvsObject_vBox)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index 5cc799272..c0598b7ae 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_widget.cpp
+//   File : KvsObject_widget.cpp
 //   Creation date : Mon Sep 11 16:35:32 CET 2000 by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,8 +23,8 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
-#include "class_pixmap.h"
+#include "KvsObject_widget.h"
+#include "KvsObject_pixmap.h"
 
 #include "KviMemory.h"
 #include "kvi_debug.h"
@@ -35,7 +35,7 @@
 #include "KviApplication.h"
 #include "KviMainWindow.h"
 #include "KviStatusBar.h"
-#include "class_painter.h"
+#include "KvsObject_painter.h"
 
 #include <QKeyEvent>
 #include <QDesktopWidget>
@@ -61,7 +61,7 @@
 	#include <QtWebKit/QWebView>
 #endif
 
-KviKvsWidget::KviKvsWidget(KviKvsObject_widget * object,QWidget * par)
+KviKvsWidget::KviKvsWidget(KvsObject_widget * object,QWidget * par)
 :QWidget(par), m_pObject(object)
 {
 }
@@ -617,112 +617,112 @@ const char * const widgettypes_tbl[] = {
 
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_widget,"widget","object")
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setParent)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_widget,"widget","object")
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setParent)
 	// apparence
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,show)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,hide)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,update)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,show)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,hide)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,update)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,repaint)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,isTopLevel)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,isVisible)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,raise)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,lower)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setEnabled)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,isEnabled)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMouseTracking)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setWindowTitle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setWindowTitle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,windowTitle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,windowTitle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,hasFocus)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setFocus)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setToolTip)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setWFlags)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setWindowIcon)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,repaint)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,isTopLevel)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,isVisible)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,raise)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,lower)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setEnabled)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,isEnabled)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setMouseTracking)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setWindowTitle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setWindowTitle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,windowTitle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,windowTitle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,hasFocus)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setFocus)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setToolTip)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setWFlags)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setWindowIcon)
 	// fonts
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,fontDescent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,fontAscent)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,fontMetricsWidth)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,fontMetricsHeight)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setFont)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,fontDescent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,fontAscent)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,fontMetricsWidth)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,fontMetricsHeight)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setFont)
 	// geometry
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,screenResolution)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,centerToScreen)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,geometry)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setGeometry)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,mapToGlobal)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,mapFromGlobal)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,y)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,x)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,screenResolution)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,centerToScreen)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,geometry)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setGeometry)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,mapToGlobal)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,mapFromGlobal)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,y)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,x)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,globalCursorX)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,globalCursorY)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,globalCursorX)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,globalCursorY)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,width)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,height)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMinimumWidth)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMinimumHeight)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMaximumWidth)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMaximumHeight)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,move)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,sizeHint)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,resize)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,width)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,height)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setMinimumWidth)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setMinimumHeight)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setMaximumWidth)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setMaximumHeight)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,move)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,sizeHint)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,resize)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setFocusPolicy)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,addWidgetToWrappedLayout)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setFocusPolicy)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,addWidgetToWrappedLayout)
 
 	// colors and image
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setForegroundColor)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setBackgroundColor)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setBackgroundImage)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,backgroundColor)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,foregroundColor)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setMask)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setAttribute)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,colorPalette)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setStyleSheet)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setKeyShortcut)
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setForegroundColor)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setBackgroundColor)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setBackgroundImage)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,backgroundColor)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,foregroundColor)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setMask)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setAttribute)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,colorPalette)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setStyleSheet)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setKeyShortcut)
 
 	// statusbar
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,insertIntoStatusBar)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,removeFromStatusBar)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,insertIntoStatusBar)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,removeFromStatusBar)
 	// events
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"mousePressEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"mouseReleaseEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"mouseDoubleClickEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"mouseMoveEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"focusInEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"focusOutEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"mouseLeaveEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"mouseEnterEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"showEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"hideEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"closeEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"resizeEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"moveEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"paintEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"keyPressEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"sizeHintRequestEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"maybeTipEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"shortCutEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_widget,"customContextMenuRequestedEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"mousePressEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"mouseReleaseEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"mouseDoubleClickEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"mouseMoveEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"focusInEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"focusOutEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"mouseLeaveEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"mouseEnterEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"showEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"hideEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"closeEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"resizeEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"moveEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"paintEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"keyPressEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"sizeHintRequestEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"maybeTipEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"shortCutEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_widget,"customContextMenuRequestedEvent")
 
 #ifdef COMPILE_WEBKIT_SUPPORT
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_widget,setWebView)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_widget,setWebView)
 #endif
-KVSO_END_REGISTERCLASS(KviKvsObject_widget)
+KVSO_END_REGISTERCLASS(KvsObject_widget)
 
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_widget,KviKvsObject)
-KVSO_END_CONSTRUCTOR(KviKvsObject_widget)
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_widget,KviKvsObject)
+KVSO_END_CONSTRUCTOR(KvsObject_widget)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_widget)
 emit aboutToDie();
 //	if (webview) delete webview;
-KVSO_END_CONSTRUCTOR(KviKvsObject_widget)
+KVSO_END_CONSTRUCTOR(KvsObject_widget)
 
-bool KviKvsObject_widget::init(KviKvsRunTimeContext *c,KviKvsVariantList *)
+bool KvsObject_widget::init(KviKvsRunTimeContext *c,KviKvsVariantList *)
 {
 	setObject(new KviKvsWidget(this,parentScriptWidget()));
         m_pContext=c;
@@ -730,7 +730,7 @@ bool KviKvsObject_widget::init(KviKvsRunTimeContext *c,KviKvsVariantList *)
 	return true;
 }
 
-bool KviKvsObject_widget::eventFilter(QObject *o,QEvent *e)
+bool KvsObject_widget::eventFilter(QObject *o,QEvent *e)
 {
 	if(o == object())
 	{
@@ -774,7 +774,7 @@ bool KviKvsObject_widget::eventFilter(QObject *o,QEvent *e)
                                 KviKvsVariantList params;
                                 KviKvsObject * pObject = pClass->allocateInstance(0,"internalpainter",m_pContext,&params);
                                 QPainter p(widget());
-                                ((KviKvsObject_painter *)pObject)->setInternalPainter(&p);
+                                ((KvsObject_painter *)pObject)->setInternalPainter(&p);
                                 p.setClipRect(rect);
                                 kvs_hobject_t hobj=pObject->handle();
                                 KviKvsVariantList params2(new KviKvsVariant(hobj),new KviKvsVariant((kvs_int_t)rect.x()),new KviKvsVariant((kvs_int_t)rect.y()),new KviKvsVariant((kvs_int_t)rect.width()),new KviKvsVariant((kvs_int_t)rect.height()));
@@ -1896,7 +1896,7 @@ KVSO_CLASS_FUNCTION(widget,setMask)
 		c->warning(__tr2qs_ctx("Pixmap object required","objects"));
 		return true;
 	}
-	QPixmap * pm=((KviKvsObject_pixmap *)obj)->getPixmap();
+	QPixmap * pm=((KvsObject_pixmap *)obj)->getPixmap();
 	QBitmap mask(pm->mask());
 	if (mask.isNull()) c->warning(__tr2qs_ctx("Null mask","objects"));
 	widget()->setMask(mask);
@@ -2026,5 +2026,5 @@ KVSO_CLASS_FUNCTION(widget,setWebView)
 #endif //COMPILE_WEBKIT_SUPPORT
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_widget.moc"
+#include "m_KvsObject_widget.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/class_widget.h b/src/modules/objects/KvsObject_widget.h
index 14dc1655d..cc2610ff0 100644
--- a/src/modules/objects/class_widget.h
+++ b/src/modules/objects/KvsObject_widget.h
@@ -2,7 +2,7 @@
 #define _CLASS_WIDGET_H_
 //=============================================================================
 //
-//   File : class_widget.h
+//   File : KvsObject_widget.h
 //   Creation date : Mon Sep 11 16:35:32 CET 2000 by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -34,11 +34,11 @@
 	#include <QtWebKit/QWebView>
 #endif
 
-class KviKvsObject_widget : public KviKvsObject
+class KvsObject_widget : public KviKvsObject
 {
 	Q_OBJECT
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_widget)
+	KVSO_DECLARE_OBJECT(KvsObject_widget)
 
 public:
 	QWidget * widget() { return (QWidget *)object(); };
@@ -133,12 +133,12 @@ class KviKvsWidget : public QWidget
 	Q_OBJECT
 	Q_PROPERTY(QSize sizeHint READ sizeHint)
 public:
-	KviKvsWidget(KviKvsObject_widget * ob,QWidget * par);
+	KviKvsWidget(KvsObject_widget * ob,QWidget * par);
 
 
 	virtual ~KviKvsWidget();
 protected:
-	KviKvsObject_widget * m_pObject;
+	KvsObject_widget * m_pObject;
 public:
 	QSize sizeHint() const;
 };
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/KvsObject_window.cpp
index 6276a7964..8e797f0eb 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/KvsObject_window.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_window.cpp
+//   File : KvsObject_window.cpp
 //   Creation date : Tue Now 26 21:39:59 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "class_window.h"
+#include "KvsObject_window.h"
 
 #include "KviError.h"
 #include "kvi_debug.h"
@@ -44,7 +44,7 @@ KviKvsScriptWindowWindow::~KviKvsScriptWindowWindow()
 {
 }
 
-void KviKvsScriptWindowWindow::setCentralWidget(KviKvsObject_widget *o,QWidget * w)
+void KviKvsScriptWindowWindow::setCentralWidget(KvsObject_widget *o,QWidget * w)
 {
 	m_pCentralWidgetObject = o;
 	m_pCentralWidget = w;
@@ -95,21 +95,21 @@ void KviKvsScriptWindowWindow::centralWidgetDestroyed()
 */
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_window,"window","widget")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_window,setWindowTitle)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_window,setCentralWidget)
-KVSO_END_REGISTERCLASS(KviKvsObject_window)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_window,"window","widget")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_window,setWindowTitle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_window,setCentralWidget)
+KVSO_END_REGISTERCLASS(KvsObject_window)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_window,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_window,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_window)
+KVSO_END_CONSTRUCTOR(KvsObject_window)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_window)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_window)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_window)
+KVSO_END_CONSTRUCTOR(KvsObject_window)
 
-bool KviKvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *)
+bool KvsObject_window::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *)
 {
 	KviWindow * w = new KviKvsScriptWindowWindow(pContext->window()->frame(),getName());
 	setObject(w);
@@ -148,11 +148,11 @@ KVSO_CLASS_FUNCTION(window,setCentralWidget)
 		c->warning(__tr2qs_ctx("Can't add a non-widget object","objects"));
 		return true;
 	}
-	((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KviKvsObject_widget *)ob,((KviKvsObject_widget *)ob)->widget());
+	((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KvsObject_widget *)ob,((KvsObject_widget *)ob)->widget());
 	return true;
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_window.moc"
+#include "m_KvsObject_window.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_window.h b/src/modules/objects/KvsObject_window.h
index acc3509a5..7131d8722 100644
--- a/src/modules/objects/class_window.h
+++ b/src/modules/objects/KvsObject_window.h
@@ -2,7 +2,7 @@
 #define _CLASS_WINDOW_H_
 //=============================================================================
 //
-//   File : class_window.h
+//   File : KvsObject_window.h
 //   Creation date : Tue Nov 26 21:37:48 CEST 2002 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,14 +24,14 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "KviWindow.h"
 #include "object_macros.h"
 
-class KviKvsObject_window : public KviKvsObject_widget
+class KvsObject_window : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_window)
+	KVSO_DECLARE_OBJECT(KvsObject_window)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 
@@ -51,10 +51,10 @@ public:
 	KviKvsScriptWindowWindow(KviMainWindow * pParent,const QString &szName);
 	~KviKvsScriptWindowWindow();
 protected:
-	KviKvsObject_widget * m_pCentralWidgetObject;
+	KvsObject_widget * m_pCentralWidgetObject;
 	QWidget * m_pCentralWidget;
 public:
-	void setCentralWidget(KviKvsObject_widget *o,QWidget * w);
+	void setCentralWidget(KvsObject_widget *o,QWidget * w);
 	void setWindowTitleString(const QString &s){ setFixedCaption(s); };
 	virtual void resizeEvent(QResizeEvent *e);
 protected slots:
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/KvsObject_wizard.cpp
index 668056d02..22be0754e 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/KvsObject_wizard.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_wizard.cpp
+//   File : KvsObject_wizard.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -25,7 +25,7 @@
 
 #include <KviTalWizard.h>
 
-#include "class_wizard.h"
+#include "KvsObject_wizard.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 
@@ -91,40 +91,40 @@
 
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_wizard,"wizard","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_wizard,"wizard","widget")
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,addPage)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,insertPage)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setTitle)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,addPage)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,insertPage)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,setTitle)
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setBackEnabled);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setNextEnabled);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setFinishEnabled);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setHelpEnabled);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,setBackEnabled);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,setNextEnabled);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,setFinishEnabled);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,setHelpEnabled);
 
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setBackBtnText);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setNextBtnText);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setFinishBtnText);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,setHelpBtnText);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,nextClickedEvent);
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_wizard,backClickedEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,setBackBtnText);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,setNextBtnText);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,setFinishBtnText);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,setHelpBtnText);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,nextClickedEvent);
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_wizard,backClickedEvent);
 
 
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_wizard,"acceptEvent")
-	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KviKvsObject_wizard,"rejectEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_wizard,"acceptEvent")
+	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_wizard,"rejectEvent")
 
-KVSO_END_REGISTERCLASS(KviKvsObject_wizard)
+KVSO_END_REGISTERCLASS(KvsObject_wizard)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_wizard,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_wizard,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_wizard)
+KVSO_END_CONSTRUCTOR(KvsObject_wizard)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_wizard)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_wizard)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_wizard)
+KVSO_END_CONSTRUCTOR(KvsObject_wizard)
 
-bool KviKvsObject_wizard::init(KviKvsRunTimeContext *,KviKvsVariantList *)
+bool KvsObject_wizard::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	setObject(new KviKvsMdmWizard(parentScriptWidget(), getName().toUtf8().data(),this), true);
 
@@ -316,13 +316,13 @@ KVSO_CLASS_FUNCTION(wizard,setFinishBtnText)
 	((KviTalWizard *)widget())->KviTalWizard::finishButton()->setText(szText);
 	return true;
 }
-bool KviKvsObject_wizard::accept()
+bool KvsObject_wizard::accept()
 {
 	KviKvsVariantList * pParams = 0;
 	callFunction(this,"acceptEvent",0,pParams);
 	return true;
 }
-bool KviKvsObject_wizard::reject()
+bool KvsObject_wizard::reject()
 {
 	KviKvsVariantList * pParams = 0;
 	callFunction(this,"rejectEvent",0,pParams);
@@ -334,7 +334,7 @@ KVSO_CLASS_FUNCTION(wizard,nextClickedEvent)
 	return true;
 }
 
-void KviKvsObject_wizard::nextClicked()
+void KvsObject_wizard::nextClicked()
 {
 	KviKvsVariantList *params=0;
 	callFunction(this,"nextClickedEvent",params);
@@ -345,12 +345,12 @@ KVSO_CLASS_FUNCTION(wizard,backClickedEvent)
 	return true;
 }
 
-void KviKvsObject_wizard::backClicked()
+void KvsObject_wizard::backClicked()
 {
 	KviKvsVariantList *params=0;
 	callFunction(this,"backClickedEvent",params);
 }
-KviKvsMdmWizard::KviKvsMdmWizard(QWidget * par,const char * name,KviKvsObject_wizard * parent)
+KviKvsMdmWizard::KviKvsMdmWizard(QWidget * par,const char * name,KvsObject_wizard * parent)
 :KviTalWizard(par)
 {
 	m_pParentScript=parent;
@@ -381,6 +381,6 @@ KviKvsMdmWizard::~KviKvsMdmWizard()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_class_wizard.moc"
+#include "m_KvsObject_wizard.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/class_wizard.h b/src/modules/objects/KvsObject_wizard.h
index c59f626ff..a68705860 100644
--- a/src/modules/objects/class_wizard.h
+++ b/src/modules/objects/KvsObject_wizard.h
@@ -2,7 +2,7 @@
 #define _CLASS_WIZARD_H_
 //=============================================================================
 //
-//   File : class_wizard.h
+//   File : KvsObject_wizard.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -26,13 +26,13 @@
 //=============================================================================
 
 #include <KviTalWizard.h>
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "object_macros.h"
 
-class KviKvsObject_wizard : public KviKvsObject_widget
+class KvsObject_wizard : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_wizard)
+	KVSO_DECLARE_OBJECT(KvsObject_wizard)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 	bool accept();
@@ -67,12 +67,12 @@ class KviKvsMdmWizard :  public KviTalWizard
 {
 	Q_OBJECT
 public:
-	KviKvsMdmWizard(QWidget * par,const char * name,KviKvsObject_wizard *);
+	KviKvsMdmWizard(QWidget * par,const char * name,KvsObject_wizard *);
 	void accept();
 	void reject();
 	virtual ~KviKvsMdmWizard();
 protected:
-	KviKvsObject_wizard *m_pParentScript;
+	KvsObject_wizard *m_pParentScript;
 protected slots:
 	void slotNextClicked();
 	void slotBackClicked();
diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/KvsObject_workspace.cpp
index a05be907b..8b3858e42 100644
--- a/src/modules/objects/class_workspace.cpp
+++ b/src/modules/objects/KvsObject_workspace.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_workspace.cpp
+//   File : KvsObject_workspace.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -24,7 +24,7 @@
 //=============================================================================
 
 
-#include "class_workspace.h"
+#include "KvsObject_workspace.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 #include "KviLocale.h"
@@ -166,34 +166,34 @@
 
 */
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_workspace,"workspace","widget")
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_workspace,addSubWindow);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_workspace,removeSubWindow);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_workspace,activeWindow);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_workspace,scrollBarsEnabled);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_workspace,setscrollBarsEnabled);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_workspace,cascade);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_workspace,tile);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_workspace,closeActiveWindow);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_workspace,closeAllWindows);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_workspace,activateNextWindow);
-        KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_workspace,activatePrevWindow);
-KVSO_END_REGISTERCLASS(KviKvsObject_workspace)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_workspace,"workspace","widget")
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_workspace,addSubWindow);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_workspace,removeSubWindow);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_workspace,activeWindow);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_workspace,scrollBarsEnabled);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_workspace,setscrollBarsEnabled);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_workspace,cascade);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_workspace,tile);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_workspace,closeActiveWindow);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_workspace,closeAllWindows);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_workspace,activateNextWindow);
+        KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_workspace,activatePrevWindow);
+KVSO_END_REGISTERCLASS(KvsObject_workspace)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_workspace,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_workspace,KvsObject_widget)
 pWidgetDict=new QHash<kvs_hobject_t,QMdiSubWindow *>;
-KVSO_END_CONSTRUCTOR(KviKvsObject_workspace)
+KVSO_END_CONSTRUCTOR(KvsObject_workspace)
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_workspace)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_workspace)
 if (pWidgetDict)
 {
     pWidgetDict->clear();
     delete pWidgetDict;
     pWidgetDict=0;
 }
-KVSO_END_CONSTRUCTOR(KviKvsObject_workspace)
+KVSO_END_CONSTRUCTOR(KvsObject_workspace)
 
-bool KviKvsObject_workspace::init(KviKvsRunTimeContext *, KviKvsVariantList *)
+bool KvsObject_workspace::init(KviKvsRunTimeContext *, KviKvsVariantList *)
 {
         SET_OBJECT(QMdiArea);
 	return true;
diff --git a/src/modules/objects/class_workspace.h b/src/modules/objects/KvsObject_workspace.h
index 778baf314..16652955f 100644
--- a/src/modules/objects/class_workspace.h
+++ b/src/modules/objects/KvsObject_workspace.h
@@ -2,7 +2,7 @@
 #define _CLASS_WORKSPACE_H_
 //=============================================================================
 //
-//   File : class_workspace.h
+//   File : KvsObject_workspace.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -25,13 +25,13 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include <QHash>
 #include <QMdiSubWindow>
-class KviKvsObject_workspace : public KviKvsObject_widget
+class KvsObject_workspace : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_workspace)
+	KVSO_DECLARE_OBJECT(KvsObject_workspace)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/KvsObject_wrapper.cpp
index 081d242f1..fa6b2ea75 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/KvsObject_wrapper.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_wrapper.cpp
+//   File : KvsObject_wrapper.cpp
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -23,14 +23,14 @@
 //
 //=============================================================================
 
-#include "class_wrapper.h"
+#include "KvsObject_wrapper.h"
 #include "KviError.h"
 #include "kvi_debug.h"
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include <qwidget.h>
 #include "KviApplication.h"
 #include "KviMainWindow.h"
@@ -102,20 +102,20 @@
 
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_wrapper,"wrapper","widget")
+KVSO_BEGIN_REGISTERCLASS(KvsObject_wrapper,"wrapper","widget")
 
-KVSO_END_REGISTERCLASS(KviKvsObject_wrapper)
+KVSO_END_REGISTERCLASS(KvsObject_wrapper)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_wrapper,KviKvsObject_widget)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_wrapper,KvsObject_widget)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_wrapper)
+KVSO_END_CONSTRUCTOR(KvsObject_wrapper)
 
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_wrapper)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_wrapper)
 
-KVSO_END_CONSTRUCTOR(KviKvsObject_wrapper)
+KVSO_END_CONSTRUCTOR(KvsObject_wrapper)
 
-bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
+bool KvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	if( !pParams ) return false;
 	QWidget *pWidget = 0;
@@ -178,7 +178,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 	setObject(pWidget,false);
 	return true;
 }
-QWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const QString szClass, const QString szName)
+QWidget *KvsObject_wrapper::findTopLevelWidgetToWrap(const QString szClass, const QString szName)
 {
 	QWidgetList list = g_pApp->topLevelWidgets();
 	if( !list.count() ) return 0;
@@ -202,7 +202,7 @@ QWidget *KviKvsObject_wrapper::findTopLevelWidgetToWrap(const QString szClass, c
 	return 0;
 }
 
-QWidget *KviKvsObject_wrapper::findWidgetToWrap(const QString szClass, const QString szName, QWidget *childOf)
+QWidget *KvsObject_wrapper::findWidgetToWrap(const QString szClass, const QString szName, QWidget *childOf)
 {
 	QList<QObject *> list=childOf->children();
 	if( !list.count() ) return 0;
diff --git a/src/modules/objects/class_wrapper.h b/src/modules/objects/KvsObject_wrapper.h
index dc1b54347..46865ee80 100644
--- a/src/modules/objects/class_wrapper.h
+++ b/src/modules/objects/KvsObject_wrapper.h
@@ -2,7 +2,7 @@
 #define _CLASS_WRAPPER_H_
 //=============================================================================
 //
-//   File : class_wrapper.h
+//   File : KvsObject_wrapper.h
 //   Creation date : Fri Mar 18 14:30:48 CEST 2005
 //   by Tonino Imbesi(Grifisx) and Alessandro Carbone(Noldor)
 //
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "class_widget.h"
+#include "KvsObject_widget.h"
 #include "qlistview.h"
 
 
@@ -33,10 +33,10 @@
 
 #include "object_macros.h"
 
-class KviKvsObject_wrapper : public KviKvsObject_widget
+class KvsObject_wrapper : public KvsObject_widget
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_wrapper)
+	KVSO_DECLARE_OBJECT(KvsObject_wrapper)
 public:
 	QWidget * widget() { return (QWidget *)object(); };
 protected:
diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp
index 07219359d..b528ed3e9 100644
--- a/src/modules/objects/class_xmlreader.cpp
+++ b/src/modules/objects/KvsObject_xmlreader.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : class_xmlreader.cpp
+//   File : KvsObject_xmlreader.cpp
 //   Created on Tue 27 Dec 2005 00:14:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "class_xmlreader.h"
-#include "class_memorybuffer.h"
+#include "KvsObject_xmlreader.h"
+#include "KvsObject_memoryBuffer.h"
 #include "KviLocale.h"
 
 #include "KviKvsVariantList.h"
@@ -135,10 +135,10 @@
 class KviXmlHandler : public QXmlDefaultHandler
 {
 protected:
-	KviKvsObject_xmlreader * m_pReader;
+	KvsObject_xmlReader * m_pReader;
 	QString m_szErrorString;
 public:
-	KviXmlHandler(KviKvsObject_xmlreader * pReader)
+	KviXmlHandler(KvsObject_xmlReader * pReader)
 	{
 		m_pReader = pReader;
 	}
@@ -276,26 +276,26 @@ public:
 #endif // !QT_NO_XML
 
 
-KVSO_BEGIN_REGISTERCLASS(KviKvsObject_xmlreader,"xmlreader","object")
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_xmlreader,lastError)
-	KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_xmlreader,parse)
+KVSO_BEGIN_REGISTERCLASS(KvsObject_xmlReader,"xmlreader","object")
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_xmlReader,lastError)
+	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_xmlReader,parse)
 
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KviKvsObject_xmlreader,"onDocumentStart")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KviKvsObject_xmlreader,"onDocumentEnd")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KviKvsObject_xmlreader,"onElementStart")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KviKvsObject_xmlreader,"onElementEnd")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KviKvsObject_xmlreader,"onText")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KviKvsObject_xmlreader,"onWarning")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KviKvsObject_xmlreader,"onError")
-KVSO_END_REGISTERCLASS(KviKvsObject_xmlreader)
+	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onDocumentStart")
+	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onDocumentEnd")
+	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onElementStart")
+	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onElementEnd")
+	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onText")
+	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onWarning")
+	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onError")
+KVSO_END_REGISTERCLASS(KvsObject_xmlReader)
 
-KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_xmlreader,KviKvsObject)
-KVSO_END_CONSTRUCTOR(KviKvsObject_xmlreader)
+KVSO_BEGIN_CONSTRUCTOR(KvsObject_xmlReader,KviKvsObject)
+KVSO_END_CONSTRUCTOR(KvsObject_xmlReader)
 
-KVSO_BEGIN_DESTRUCTOR(KviKvsObject_xmlreader)
-KVSO_END_DESTRUCTOR(KviKvsObject_xmlreader)
+KVSO_BEGIN_DESTRUCTOR(KvsObject_xmlReader)
+KVSO_END_DESTRUCTOR(KvsObject_xmlReader)
 
-void KviKvsObject_xmlreader::fatalError(const QString &szError)
+void KvsObject_xmlReader::fatalError(const QString &szError)
 {
 	m_szLastError = szError;
 
@@ -304,7 +304,7 @@ void KviKvsObject_xmlreader::fatalError(const QString &szError)
 	callFunction(this,"onError",&vArgs);
 }
 
-KVSO_CLASS_FUNCTION(xmlreader,parse)
+KVSO_CLASS_FUNCTION(xmlReader,parse)
 {
 	KviKvsVariant * pVariantData;
 
@@ -332,7 +332,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
 		}
 		if (pObject->inheritsClass("memorybuffer"))
 		{
-			source.setData(*((KviKvsObject_memorybuffer *)pObject)->pBuffer());
+			source.setData(*((KvsObject_memoryBuffer *)pObject)->pBuffer());
 		}
 		else
 		{
@@ -366,7 +366,7 @@ KVSO_CLASS_FUNCTION(xmlreader,parse)
 	return true;
 }
 
-KVSO_CLASS_FUNCTION(xmlreader,lastError)
+KVSO_CLASS_FUNCTION(xmlReader,lastError)
 {
 	c->returnValue()->setString(m_szLastError);
 	return true;
diff --git a/src/modules/objects/class_xmlreader.h b/src/modules/objects/KvsObject_xmlreader.h
index eddad1d38..2c702e327 100644
--- a/src/modules/objects/class_xmlreader.h
+++ b/src/modules/objects/KvsObject_xmlreader.h
@@ -2,7 +2,7 @@
 #define _CLASS_XMLREADER_H_
 //=============================================================================
 //
-//   File : class_xmlreader.h
+//   File : KvsObject_xmlreader.h
 //   Created on Tue 27 Dec 2005 00:14:09 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -29,10 +29,10 @@
 
 #include "object_macros.h"
 
-class KviKvsObject_xmlreader : public KviKvsObject
+class KvsObject_xmlReader : public KviKvsObject
 {
 public:
-	KVSO_DECLARE_OBJECT(KviKvsObject_xmlreader)
+	KVSO_DECLARE_OBJECT(KvsObject_xmlReader)
 public:
 	bool parse(KviKvsObjectFunctionCall *c);
 	bool lastError(KviKvsObjectFunctionCall *c);
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 3ad1673a7..b0e443b8a 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -22,53 +22,53 @@
 //
 //=============================================================================
 
-#include "class_button.h"
-#include "class_checkbox.h"
-#include "class_combobox.h"
-#include "class_dialog.h"
-#include "class_dockwindow.h"
-#include "class_file.h"
-#include "class_ftp.h"
-#include "class_groupbox.h"
-#include "class_buttongroup.h"
-#include "class_hbox.h"
-#include "class_http.h"
-#include "class_label.h"
-#include "class_layout.h"
-#include "class_lcd.h"
-#include "class_lineedit.h"
-#include "class_list.h"
-#include "class_listwidget.h"
-#include "class_mainwindow.h"
-#include "class_memorybuffer.h"
-#include "class_menubar.h"
-#include "class_multilineedit.h"
-#include "class_painter.h"
-#include "class_pixmap.h"
-#include "class_popupmenu.h"
-#include "class_process.h"
-#include "class_progressbar.h"
-#include "class_radiobutton.h"
-#include "class_slider.h"
-#include "class_socket.h"
-#include "class_spinbox.h"
-#include "class_tabwidget.h"
-#include "class_tablewidget.h"
-#include "class_tbrowser.h"
-#include "class_toolbar.h"
-#include "class_toolbutton.h"
-#include "class_trayicon.h"
-#include "class_treewidget.h"
-#include "class_treewidgetitem.h"
-#include "class_vbox.h"
-#include "class_widget.h"
-#include "class_window.h"
-#include "class_wizard.h"
-#include "class_workspace.h"
-#include "class_wrapper.h"
-#include "class_xmlreader.h"
-#include "class_sql.h"
-#include "class_datetimeedit.h"
+#include "KvsObject_button.h"
+#include "KvsObject_checkBox.h"
+#include "KvsObject_comboBox.h"
+#include "KvsObject_dialog.h"
+#include "KvsObject_dockWindow.h"
+#include "KvsObject_file.h"
+#include "KvsObject_ftp.h"
+#include "KvsObject_groupBox.h"
+#include "KvsObject_buttonGroup.h"
+#include "KvsObject_hBox.h"
+#include "KvsObject_http.h"
+#include "KvsObject_label.h"
+#include "KvsObject_layout.h"
+#include "KvsObject_lcd.h"
+#include "KvsObject_lineEdit.h"
+#include "KvsObject_list.h"
+#include "KvsObject_listWidget.h"
+#include "KvsObject_mainWindow.h"
+#include "KvsObject_memoryBuffer.h"
+#include "KvsObject_menuBar.h"
+#include "KvsObject_multiLineEdit.h"
+#include "KvsObject_painter.h"
+#include "KvsObject_pixmap.h"
+#include "KvsObject_popupMenu.h"
+#include "KvsObject_process.h"
+#include "KvsObject_progressBar.h"
+#include "KvsObject_radioButton.h"
+#include "KvsObject_slider.h"
+#include "KvsObject_socket.h"
+#include "KvsObject_spinBox.h"
+#include "KvsObject_tabWidget.h"
+#include "KvsObject_tableWidget.h"
+#include "KvsObject_textBrowser.h"
+#include "KvsObject_toolBar.h"
+#include "KvsObject_toolButton.h"
+#include "KvsObject_trayIcon.h"
+#include "KvsObject_treeWidget.h"
+#include "KvsObject_treeWidgeteItem.h"
+#include "KvsObject_vBox.h"
+#include "KvsObject_widget.h"
+#include "KvsObject_window.h"
+#include "KvsObject_wizard.h"
+#include "KvsObject_workspace.h"
+#include "KvsObject_wrapper.h"
+#include "KvsObject_xmlreader.h"
+#include "KvsObject_sql.h"
+#include "KvsObject_dateTimeEdit.h"
 
 
 #include "KviIconManager.h"
@@ -95,53 +95,53 @@ static bool objects_module_cleanup(KviModule *)
 	// Don't attempt to change the order of these calls.
 	// Derived classes must be unregistered before the base ones.
 
-        KviKvsObject_memorybuffer::unregisterSelf();
-	KviKvsObject_process::unregisterSelf();
-        KviKvsObject_trayicon::unregisterSelf();
-	KviKvsObject_ftp::unregisterSelf();
-	KviKvsObject_http::unregisterSelf();
-	KviKvsObject_socket::unregisterSelf();
-	KviKvsObject_xmlreader::unregisterSelf();
-	KviKvsObject_wrapper::unregisterSelf();
-	KviKvsObject_file::unregisterSelf();
-	KviKvsObject_progressbar::unregisterSelf();
-	KviKvsObject_dockwindow::unregisterSelf();
-	KviKvsObject_wizard::unregisterSelf();
-	KviKvsObject_window::unregisterSelf();
-	KviKvsObject_toolbutton::unregisterSelf();
-	KviKvsObject_toolbar::unregisterSelf();
-	KviKvsObject_tabwidget::unregisterSelf();
-	KviKvsObject_spinbox::unregisterSelf();
-	KviKvsObject_slider::unregisterSelf();
-	KviKvsObject_radiobutton::unregisterSelf();
-	KviKvsObject_popupmenu::unregisterSelf();
-	KviKvsObject_pixmap::unregisterSelf();
-	KviKvsObject_painter::unregisterSelf();
-	KviKvsObject_mainwindow::unregisterSelf();
-	KviKvsObject_treewidgetitem::unregisterSelf();
-	KviKvsObject_treewidget::unregisterSelf();
-	KviKvsObject_listwidget::unregisterSelf();
-	KviKvsObject_combobox::unregisterSelf();
-	KviKvsObject_workspace::unregisterSelf();
-	KviKvsObject_menubar::unregisterSelf();
-	KviKvsObject_lineedit::unregisterSelf();
-	KviKvsObject_lcd::unregisterSelf();
-	KviKvsObject_layout::unregisterSelf();
-	KviKvsObject_hbox::unregisterSelf();
-	KviKvsObject_vbox::unregisterSelf();
-	KviKvsObject_label::unregisterSelf();
-	KviKvsObject_groupbox::unregisterSelf();
-	KviKvsObject_dialog::unregisterSelf();
-	KviKvsObject_checkbox::unregisterSelf();
-	KviKvsObject_textbrowser::unregisterSelf();
-	KviKvsObject_textedit::unregisterSelf();
-	KviKvsObject_button::unregisterSelf();
-        KviKvsObject_datetimeedit::unregisterSelf();
-        KviKvsObject_tablewidget::unregisterSelf();
-        KviKvsObject_widget::unregisterSelf();
-	KviKvsObject_list::unregisterSelf();
-        KviKvsObject_sql::unregisterSelf();
-	KviKvsObject_buttongroup::unregisterSelf();
+        KvsObject_memoryBuffer::unregisterSelf();
+	KvsObject_process::unregisterSelf();
+        KvsObject_trayIcon::unregisterSelf();
+	KvsObject_ftp::unregisterSelf();
+	KvsObject_http::unregisterSelf();
+	KvsObject_socket::unregisterSelf();
+	KvsObject_xmlReader::unregisterSelf();
+	KvsObject_wrapper::unregisterSelf();
+	KvsObject_file::unregisterSelf();
+	KvsObject_progressBar::unregisterSelf();
+	KvsObject_dockWindow::unregisterSelf();
+	KvsObject_wizard::unregisterSelf();
+	KvsObject_window::unregisterSelf();
+	KvsObject_toolButton::unregisterSelf();
+	KvsObject_toolBar::unregisterSelf();
+	KvsObject_tabWidget::unregisterSelf();
+	KvsObject_spinBox::unregisterSelf();
+	KvsObject_slider::unregisterSelf();
+	KvsObject_radioButton::unregisterSelf();
+	KvsObject_popupMenu::unregisterSelf();
+	KvsObject_pixmap::unregisterSelf();
+	KvsObject_painter::unregisterSelf();
+	KvsObject_mainWindow::unregisterSelf();
+	KvsObject_treeWidgetItem::unregisterSelf();
+	KvsObject_treeWidget::unregisterSelf();
+	KvsObject_listWidget::unregisterSelf();
+	KvsObject_comboBox::unregisterSelf();
+	KvsObject_workspace::unregisterSelf();
+	KvsObject_menuBar::unregisterSelf();
+	KvsObject_lineEdit::unregisterSelf();
+	KvsObject_lcd::unregisterSelf();
+	KvsObject_layout::unregisterSelf();
+	KvsObject_hBox::unregisterSelf();
+	KvsObject_vBox::unregisterSelf();
+	KvsObject_label::unregisterSelf();
+	KvsObject_groupBox::unregisterSelf();
+	KvsObject_dialog::unregisterSelf();
+	KvsObject_checkBox::unregisterSelf();
+	KvsObject_textBrowser::unregisterSelf();
+	KvsObject_textedit::unregisterSelf();
+	KvsObject_button::unregisterSelf();
+        KvsObject_dateTimeEdit::unregisterSelf();
+        KvsObject_tableWidget::unregisterSelf();
+        KvsObject_widget::unregisterSelf();
+	KvsObject_list::unregisterSelf();
+        KvsObject_sql::unregisterSelf();
+	KvsObject_buttonGroup::unregisterSelf();
 
 	return true;
 }
@@ -752,54 +752,54 @@ static bool objects_module_init(KviModule * m)
 	// Don't attempt to change the order of these calls.
 	// Derived classes must be registered after the base ones.
 
-	KviKvsObject_buttongroup::registerSelf();
+	KvsObject_buttonGroup::registerSelf();
 
-	KviKvsObject_sql::registerSelf();
-	KviKvsObject_list::registerSelf();
-	KviKvsObject_widget::registerSelf();
-	KviKvsObject_tablewidget::registerSelf();
-	KviKvsObject_datetimeedit::registerSelf();
-	KviKvsObject_button::registerSelf();
-	KviKvsObject_textedit::registerSelf();
-	KviKvsObject_textbrowser::registerSelf();
-	KviKvsObject_checkbox::registerSelf();
-	KviKvsObject_dialog::registerSelf();
-	KviKvsObject_groupbox::registerSelf();
-	KviKvsObject_label::registerSelf();
-	KviKvsObject_vbox::registerSelf();
-	KviKvsObject_hbox::registerSelf();
-	KviKvsObject_layout::registerSelf();
-	KviKvsObject_lcd::registerSelf();
-	KviKvsObject_lineedit::registerSelf();
-	KviKvsObject_menubar::registerSelf();
-	KviKvsObject_workspace::registerSelf();
-	KviKvsObject_combobox::registerSelf();
-	KviKvsObject_listwidget::registerSelf();
-	KviKvsObject_treewidget::registerSelf();
-	KviKvsObject_treewidgetitem::registerSelf();
-	KviKvsObject_mainwindow::registerSelf();
-	KviKvsObject_painter::registerSelf();
-	KviKvsObject_pixmap::registerSelf();
-	KviKvsObject_popupmenu::registerSelf();
-	KviKvsObject_radiobutton::registerSelf();
-	KviKvsObject_slider::registerSelf();
-	KviKvsObject_spinbox::registerSelf();
-	KviKvsObject_tabwidget::registerSelf();
-	KviKvsObject_toolbar::registerSelf();
-	KviKvsObject_toolbutton::registerSelf();
-	KviKvsObject_window::registerSelf();
-	KviKvsObject_wizard::registerSelf();
-	KviKvsObject_dockwindow::registerSelf();
-	KviKvsObject_progressbar::registerSelf();
-	KviKvsObject_file::registerSelf();
-	KviKvsObject_wrapper::registerSelf();
-	KviKvsObject_xmlreader::registerSelf();
-	KviKvsObject_socket::registerSelf();
-	KviKvsObject_http::registerSelf();
-	KviKvsObject_ftp::registerSelf();
-        KviKvsObject_trayicon::registerSelf();
-	KviKvsObject_process::registerSelf();
-	KviKvsObject_memorybuffer::registerSelf();
+	KvsObject_sql::registerSelf();
+	KvsObject_list::registerSelf();
+	KvsObject_widget::registerSelf();
+	KvsObject_tableWidget::registerSelf();
+	KvsObject_dateTimeEdit::registerSelf();
+	KvsObject_button::registerSelf();
+	KvsObject_textedit::registerSelf();
+	KvsObject_textBrowser::registerSelf();
+	KvsObject_checkBox::registerSelf();
+	KvsObject_dialog::registerSelf();
+	KvsObject_groupBox::registerSelf();
+	KvsObject_label::registerSelf();
+	KvsObject_vBox::registerSelf();
+	KvsObject_hBox::registerSelf();
+	KvsObject_layout::registerSelf();
+	KvsObject_lcd::registerSelf();
+	KvsObject_lineEdit::registerSelf();
+	KvsObject_menuBar::registerSelf();
+	KvsObject_workspace::registerSelf();
+	KvsObject_comboBox::registerSelf();
+	KvsObject_listWidget::registerSelf();
+	KvsObject_treeWidget::registerSelf();
+	KvsObject_treeWidgetItem::registerSelf();
+	KvsObject_mainWindow::registerSelf();
+	KvsObject_painter::registerSelf();
+	KvsObject_pixmap::registerSelf();
+	KvsObject_popupMenu::registerSelf();
+	KvsObject_radioButton::registerSelf();
+	KvsObject_slider::registerSelf();
+	KvsObject_spinBox::registerSelf();
+	KvsObject_tabWidget::registerSelf();
+	KvsObject_toolBar::registerSelf();
+	KvsObject_toolButton::registerSelf();
+	KvsObject_window::registerSelf();
+	KvsObject_wizard::registerSelf();
+	KvsObject_dockWindow::registerSelf();
+	KvsObject_progressBar::registerSelf();
+	KvsObject_file::registerSelf();
+	KvsObject_wrapper::registerSelf();
+	KvsObject_xmlReader::registerSelf();
+	KvsObject_socket::registerSelf();
+	KvsObject_http::registerSelf();
+	KvsObject_ftp::registerSelf();
+        KvsObject_trayIcon::registerSelf();
+	KvsObject_process::registerSelf();
+	KvsObject_memoryBuffer::registerSelf();
 
 	return true;
 }
diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h
index 68b821956..b12ed3f3a 100644
--- a/src/modules/objects/object_macros.h
+++ b/src/modules/objects/object_macros.h
@@ -96,7 +96,7 @@ g_pKvs##__className##Class->registerFunctionHandler(#__szName,(KviKvsObjectFunct
 	}
 
 #define KVSO_CLASS_FUNCTION(__className,__functionName)\
-	bool KviKvsObject_##__className::__functionName(KviKvsObjectFunctionCall * c)
+	bool KvsObject_##__className::__functionName(KviKvsObjectFunctionCall * c)
 
 #define CHECK_INTERNAL_POINTER(__pointer)\
 	if(!__pointer) \
diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt
index eb96bbeaa..7973f9be0 100644
--- a/src/modules/options/CMakeLists.txt
+++ b/src/modules/options/CMakeLists.txt
@@ -1,94 +1,94 @@
 # CMakeLists for src/modules/options
 
 SET(kvioptions_MOC_HDRS
-	container.h
+	OptionsWidgetContainer.h
 	dialog.h
-	instances.h
-	optw_antispam.h
-	optw_avatar.h
-	optw_channel.h
-	optw_connection.h
-	optw_ctcp.h
-	optw_ctcpfloodprotection.h
-	optw_dcc.h
-	optw_generalopt.h
-	optw_highlighting.h
-	optw_identity.h
-	optw_ignore.h
-	optw_input.h
-	optw_interfacefeatures.h
-	optw_interfacelookglobal.h
-	optw_irc.h
-	optw_ircoutput.h
-	optw_ircview.h
-	optw_lag.h
-	optw_logging.h
-	optw_mediatypes.h
-	optw_messages.h
-	optw_nickserv.h
-	optw_notify.h
-	optw_notifier.h
-	optw_protection.h
-	optw_proxy.h
-	optw_query.h
-	optw_servers.h
-	optw_sound.h
-	optw_windowlist.h
-	optw_textencoding.h
-	optw_texticons.h
-	optw_tools.h
-	optw_topiclabel.h
-	optw_away.h
-	optw_uparser.h
-	optw_urlhandlers.h
-	optw_userlist.h
-	optw_tray.h
+	OptionsInstanceManager.h
+	OptionsWidget_antiSpam.h
+	OptionsWidget_avatar.h
+	OptionsWidget_channel.h
+	OptionsWidget_connection.h
+	OptionsWidget_ctcp.h
+	OptionsWidget_ctcpFloodProtection.h
+	OptionsWidget_dcc.h
+	OptionsWidget_general.h
+	OptionsWidget_alertsAndHighlighting.h
+	OptionsWidget_identity.h
+	OptionsWidget_ignore.h
+	OptionsWidget_input.h
+	OptionsWidget_interfaceFeatures.h
+	OptionsWidget_theme.h
+	OptionsWidget_irc.h
+	OptionsWidget_ircOutput.h
+	OptionsWidget_ircView.h
+	OptionsWidget_lag.h
+	OptionsWidget_logging.h
+	OptionsWidget_mediaTypes.h
+	OptionsWidget_message.h
+	OptionsWidget_nickserv.h
+	OptionsWidget_notify.h
+	OptionsWidget_notifier.h
+	OptionsWidget_protection.h
+	OptionsWidget_proxy.h
+	OptionsWidget_query.h
+	OptionsWidget_servers.h
+	OptionsWidget_sound.h
+	OptionsWidget_windowList.h
+	OptionsWidget_textEncoding.h
+	OptionsWidget_textIcons.h
+	OptionsWidget_tools.h
+	OptionsWidget_topicLabel.h
+	OptionsWidget_away.h
+	OptionsWidget_uparser.h
+	OptionsWidget_urlHandlers.h
+	OptionsWidget_userList.h
+	OptionsWidget_tray.h
 )
 
 SET(kvioptions_SRCS
 	libkvioptions.cpp
-	container.cpp
+	OptionsWidgetContainer.cpp
 	dialog.cpp
-	instances.cpp
-	optw_antispam.cpp
-	optw_avatar.cpp
-	optw_channel.cpp
-	optw_connection.cpp
-	optw_ctcp.cpp
-	optw_ctcpfloodprotection.cpp
-	optw_dcc.cpp
-	optw_generalopt.cpp
-	optw_highlighting.cpp
-	optw_identity.cpp
-	optw_ignore.cpp
-	optw_input.cpp
-	optw_interfacefeatures.cpp
-	optw_interfacelookglobal.cpp
-	optw_irc.cpp
-	optw_ircoutput.cpp
-	optw_ircview.cpp
-	optw_lag.cpp
-	optw_logging.cpp
-	optw_mediatypes.cpp
-	optw_messages.cpp
-	optw_nickserv.cpp
-	optw_notify.cpp
-	optw_notifier.cpp
-	optw_protection.cpp
-	optw_proxy.cpp
-	optw_query.cpp
-	optw_servers.cpp
-	optw_sound.cpp
-	optw_windowlist.cpp
-	optw_textencoding.cpp
-	optw_texticons.cpp
-	optw_tools.cpp
-	optw_topiclabel.cpp
-	optw_away.cpp
-	optw_uparser.cpp
-	optw_urlhandlers.cpp
-	optw_userlist.cpp
-	optw_tray.cpp
+	OptionsInstanceManager.cpp
+	OptionsWidget_antiSpam.cpp
+	OptionsWidget_avatar.cpp
+	OptionsWidget_channel.cpp
+	OptionsWidget_connection.cpp
+	OptionsWidget_ctcp.cpp
+	OptionsWidget_ctcpFloodProtection.cpp
+	OptionsWidget_dcc.cpp
+	OptionsWidget_general.cpp
+	OptionsWidget_alertsAndHighlighting.cpp
+	OptionsWidget_identity.cpp
+	OptionsWidget_ignore.cpp
+	OptionsWidget_input.cpp
+	OptionsWidget_interfaceFeatures.cpp
+	OptionsWidget_theme.cpp
+	OptionsWidget_irc.cpp
+	OptionsWidget_ircOutput.cpp
+	OptionsWidget_ircView.cpp
+	OptionsWidget_lag.cpp
+	OptionsWidget_logging.cpp
+	OptionsWidget_mediaTypes.cpp
+	OptionsWidget_message.cpp
+	OptionsWidget_nickserv.cpp
+	OptionsWidget_notify.cpp
+	OptionsWidget_notifier.cpp
+	OptionsWidget_protection.cpp
+	OptionsWidget_proxy.cpp
+	OptionsWidget_query.cpp
+	OptionsWidget_servers.cpp
+	OptionsWidget_sound.cpp
+	OptionsWidget_windowList.cpp
+	OptionsWidget_textEncoding.cpp
+	OptionsWidget_textIcons.cpp
+	OptionsWidget_tools.cpp
+	OptionsWidget_topicLabel.cpp
+	OptionsWidget_away.cpp
+	OptionsWidget_uparser.cpp
+	OptionsWidget_urlHandlers.cpp
+	OptionsWidget_userList.cpp
+	OptionsWidget_tray.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/options/instances.cpp b/src/modules/options/OptionsInstanceManager.cpp
index b45fb4c9a..9e767f36e 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/OptionsInstanceManager.cpp
@@ -2,7 +2,7 @@
 
 //=============================================================================
 //
-//   File : instances.cpp
+//   File : OptionsInstanceManager.cpp
 //
 //   This file is part of the KVIrc irc client distribution
 //   Copyright (C) 2001-2008 Szymon Stefanek (stefanek@tin.it)
@@ -30,180 +30,180 @@
 // so any change should go in that script
 //
 
-#include "optw_antispam.h"
-#include "optw_avatar.h"
-#include "optw_away.h"
-#include "optw_channel.h"
-#include "optw_connection.h"
-#include "optw_ctcp.h"
-#include "optw_ctcpfloodprotection.h"
-#include "optw_dcc.h"
-#include "optw_generalopt.h"
-#include "optw_highlighting.h"
-#include "optw_identity.h"
-#include "optw_ignore.h"
-#include "optw_input.h"
-#include "optw_interfacefeatures.h"
-#include "optw_interfacelookglobal.h"
-#include "optw_irc.h"
-#include "optw_ircoutput.h"
-#include "optw_ircview.h"
-#include "optw_lag.h"
-#include "optw_logging.h"
-#include "optw_mediatypes.h"
-#include "optw_messages.h"
-#include "optw_nickserv.h"
-#include "optw_notifier.h"
-#include "optw_notify.h"
-#include "optw_protection.h"
-#include "optw_proxy.h"
-#include "optw_query.h"
-#include "optw_servers.h"
-#include "optw_sound.h"
-#include "optw_textencoding.h"
-#include "optw_texticons.h"
-#include "optw_tools.h"
-#include "optw_topiclabel.h"
-#include "optw_tray.h"
-#include "optw_uparser.h"
-#include "optw_urlhandlers.h"
-#include "optw_userlist.h"
-#include "optw_windowlist.h"
+#include "OptionsWidget_antiSpam.h"
+#include "OptionsWidget_avatar.h"
+#include "OptionsWidget_away.h"
+#include "OptionsWidget_channel.h"
+#include "OptionsWidget_connection.h"
+#include "OptionsWidget_ctcp.h"
+#include "OptionsWidget_ctcpFloodProtection.h"
+#include "OptionsWidget_dcc.h"
+#include "OptionsWidget_general.h"
+#include "OptionsWidget_alertsAndHighlighting.h"
+#include "OptionsWidget_identity.h"
+#include "OptionsWidget_ignore.h"
+#include "OptionsWidget_input.h"
+#include "OptionsWidget_interfaceFeatures.h"
+#include "OptionsWidget_theme.h"
+#include "OptionsWidget_irc.h"
+#include "OptionsWidget_ircOutput.h"
+#include "OptionsWidget_ircView.h"
+#include "OptionsWidget_lag.h"
+#include "OptionsWidget_logging.h"
+#include "OptionsWidget_mediaTypes.h"
+#include "OptionsWidget_message.h"
+#include "OptionsWidget_nickserv.h"
+#include "OptionsWidget_notifier.h"
+#include "OptionsWidget_notify.h"
+#include "OptionsWidget_protection.h"
+#include "OptionsWidget_proxy.h"
+#include "OptionsWidget_query.h"
+#include "OptionsWidget_servers.h"
+#include "OptionsWidget_sound.h"
+#include "OptionsWidget_textEncoding.h"
+#include "OptionsWidget_textIcons.h"
+#include "OptionsWidget_tools.h"
+#include "OptionsWidget_topicLabel.h"
+#include "OptionsWidget_tray.h"
+#include "OptionsWidget_uparser.h"
+#include "OptionsWidget_urlHandlers.h"
+#include "OptionsWidget_userList.h"
+#include "OptionsWidget_windowList.h"
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
-#include "instances.h"
+#include "OptionsInstanceManager.h"
 
 int g_iOptionWidgetInstances = 0;
 
 KviOptionsWidget * classKviAntispamOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviAntispamOptionsWidget(parent);
+	return new OptionsWidget_antispam(parent);
 }
 
 KviOptionsWidget * classKviAvatarAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviAvatarAdvancedOptionsWidget(parent);
+	return new OptionsWidget_avatar(parent);
 }
 
 KviOptionsWidget * classKviAwayOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviAwayOptionsWidget(parent);
+	return new OptionsWidget_away(parent);
 }
 
 KviOptionsWidget * classKviChannelOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviChannelOptionsWidget(parent);
+	return new OptionsWidget_channel(parent);
 }
 
 KviOptionsWidget * classKviChannelGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviChannelGeneralOptionsWidget(parent);
+	return new OptionsWidget_channelGeneral(parent);
 }
 
 KviOptionsWidget * classKviChannelAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviChannelAdvancedOptionsWidget(parent);
+	return new OptionsWidget_channelAdvanced(parent);
 }
 
 KviOptionsWidget * classKviConnectionOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviConnectionOptionsWidget(parent);
+	return new OptionsWidget_connection(parent);
 }
 
 KviOptionsWidget * classKviConnectionAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviConnectionAdvancedOptionsWidget(parent);
+	return new OptionsWidget_connectionAdvanced(parent);
 }
 
 KviOptionsWidget * classKviSSLOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviSSLOptionsWidget(parent);
+	return new OptionsWidget_connectionSsl(parent);
 }
 
 KviOptionsWidget * classKviTransportOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTransportOptionsWidget(parent);
+	return new OptionsWidget_connectionSocket(parent);
 }
 
 KviOptionsWidget * classKviIdentOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIdentOptionsWidget(parent);
+	return new OptionsWidget_identService(parent);
 }
 
 KviOptionsWidget * classKviCtcpOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviCtcpOptionsWidget(parent);
+	return new OptionsWidget_ctcp(parent);
 }
 
 KviOptionsWidget * classKviCtcpFloodProtectionOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviCtcpFloodProtectionOptionsWidget(parent);
+	return new OptionsWidget_ctcpFloodProtection(parent);
 }
 
 KviOptionsWidget * classKviDccOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccOptionsWidget(parent);
+	return new OptionsWidget_dcc(parent);
 }
 
 KviOptionsWidget * classKviDccGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccGeneralOptionsWidget(parent);
+	return new OptionsWidget_dccGeneral(parent);
 }
 
 KviOptionsWidget * classKviDccAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccAdvancedOptionsWidget(parent);
+	return new OptionsWidget_dccAdvanced(parent);
 }
 
 KviOptionsWidget * classKviDccSendOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccSendOptionsWidget(parent);
+	return new OptionsWidget_dccSend(parent);
 }
 
 KviOptionsWidget * classKviDccSendGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccSendGeneralOptionsWidget(parent);
+	return new OptionsWidget_dccSendGeneral(parent);
 }
 
 KviOptionsWidget * classKviDccSendAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccSendAdvancedOptionsWidget(parent);
+	return new OptionsWidget_dccSendAdvanced(parent);
 }
 
 KviOptionsWidget * classKviDccChatOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccChatOptionsWidget(parent);
+	return new OptionsWidget_dccChat(parent);
 }
 
 KviOptionsWidget * classKviDccVoiceOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviDccVoiceOptionsWidget(parent);
+	return new OptionsWidget_dccVoice(parent);
 }
 
 KviOptionsWidget * classKviGeneralOptOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviGeneralOptOptionsWidget(parent);
+	return new OptionsWidget_general(parent);
 }
 
 KviOptionsWidget * classKviAlertHighlightingOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviAlertHighlightingOptionsWidget(parent);
+	return new OptionsWidget_alertsAndHighlighting(parent);
 }
 
 KviOptionsWidget * classKviHighlightingOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviHighlightingOptionsWidget(parent);
+	return new OptionsWidget_highlighting(parent);
 }
 
 KviOptionsWidget * classKviAlertOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviAlertOptionsWidget(parent);
+	return new OptionsWidget_alerts(parent);
 }
 
 KviOptionsWidget * classKviIdentityOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIdentityOptionsWidget(parent);
+	return new OptionsWidget_identity(parent);
 }
 
 KviOptionsWidget * classKviIdentityGeneralOptionsWidget_createInstanceProc(QWidget * parent)
@@ -213,465 +213,465 @@ KviOptionsWidget * classKviIdentityGeneralOptionsWidget_createInstanceProc(QWidg
 
 KviOptionsWidget * classKviIdentityAvatarOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIdentityAvatarOptionsWidget(parent);
+	return new OptionsWidget_identityAvatar(parent);
 }
 
 KviOptionsWidget * classKviIdentityAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIdentityAdvancedOptionsWidget(parent);
+	return new OptionsWidget_identityAdvanced(parent);
 }
 
 KviOptionsWidget * classKviIdentityProfileOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIdentityProfileOptionsWidget(parent);
+	return new OptionsWidget_identityProfile(parent);
 }
 
 KviOptionsWidget * classKviIgnoreOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIgnoreOptionsWidget(parent);
+	return new OptionsWidget_ignore(parent);
 }
 
 KviOptionsWidget * classKviInputLookOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviInputLookOptionsWidget(parent);
+	return new OptionsWidget_inputLook(parent);
 }
 
 KviOptionsWidget * classKviInputFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviInputFeaturesOptionsWidget(parent);
+	return new OptionsWidget_inputFeatures(parent);
 }
 
 KviOptionsWidget * classKviInterfaceFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviInterfaceFeaturesOptionsWidget(parent);
+	return new OptionsWidget_interfaceFeatures(parent);
 }
 
 KviOptionsWidget * classKviThemeGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviThemeGeneralOptionsWidget(parent);
+	return new OptionsWidget_theme(parent);
 }
 
 KviOptionsWidget * classKviThemeTransparencyOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviThemeTransparencyOptionsWidget(parent);
+	return new OptionsWidget_themeTransparency(parent);
 }
 
 KviOptionsWidget * classKviThemeMdiAreaOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviThemeMdiAreaOptionsWidget(parent);
+	return new OptionsWidget_themeMdiArea(parent);
 }
 
 KviOptionsWidget * classKviThemeToolBarAppletsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviThemeToolBarAppletsOptionsWidget(parent);
+	return new OptionsWidget_themeToolBarApplets(parent);
 }
 
 KviOptionsWidget * classKviIrcOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcOptionsWidget(parent);
+	return new OptionsWidget_irc(parent);
 }
 
 KviOptionsWidget * classKviIrcGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcGeneralOptionsWidget(parent);
+	return new OptionsWidget_ircGeneral(parent);
 }
 
 KviOptionsWidget * classKviIrcAdvancedOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcAdvancedOptionsWidget(parent);
+	return new OptionsWidget_ircAdvanced(parent);
 }
 
 KviOptionsWidget * classKviIrcOutputOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcOutputOptionsWidget(parent);
+	return new OptionsWidget_ircOutput(parent);
 }
 
 KviOptionsWidget * classKviIrcViewThemeOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcViewThemeOptionsWidget(parent);
+	return new OptionsWidget_ircViewTheme(parent);
 }
 
 KviOptionsWidget * classKviIrcViewLookOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcViewLookOptionsWidget(parent);
+	return new OptionsWidget_ircViewLook(parent);
 }
 
 KviOptionsWidget * classKviIrcViewFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcViewFeaturesOptionsWidget(parent);
+	return new OptionsWidget_ircViewFeatures(parent);
 }
 
 KviOptionsWidget * classKviIrcViewMarkerOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcViewMarkerOptionsWidget(parent);
+	return new OptionsWidget_ircViewMarker(parent);
 }
 
 KviOptionsWidget * classKviLagOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviLagOptionsWidget(parent);
+	return new OptionsWidget_lag(parent);
 }
 
 KviOptionsWidget * classKviLoggingOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviLoggingOptionsWidget(parent);
+	return new OptionsWidget_logging(parent);
 }
 
 KviOptionsWidget * classKviMediaTypesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviMediaTypesOptionsWidget(parent);
+	return new OptionsWidget_mediaTypes(parent);
 }
 
 KviOptionsWidget * classKviMessageOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviMessageOptionsWidget(parent);
+	return new OptionsWidget_message(parent);
 }
 
 KviOptionsWidget * classKviPrivmsgOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviPrivmsgOptionsWidget(parent);
+	return new OptionsWidget_privmsg(parent);
 }
 
 KviOptionsWidget * classKviTimestampOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTimestampOptionsWidget(parent);
+	return new OptionsWidget_timestamp(parent);
 }
 
 KviOptionsWidget * classKviMessageColorsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviMessageColorsOptionsWidget(parent);
+	return new OptionsWidget_messageColors(parent);
 }
 
 KviOptionsWidget * classKviStandardColorsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviStandardColorsOptionsWidget(parent);
+	return new OptionsWidget_standardColors(parent);
 }
 
 KviOptionsWidget * classKviNickServOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviNickServOptionsWidget(parent);
+	return new OptionsWidget_nickServ(parent);
 }
 
 KviOptionsWidget * classKviNotifierLookOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviNotifierLookOptionsWidget(parent);
+	return new OptionsWidget_notifierLook(parent);
 }
 
 KviOptionsWidget * classKviNotifierOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviNotifierOptionsWidget(parent);
+	return new OptionsWidget_notifier(parent);
 }
 
 KviOptionsWidget * classKviNotifyOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviNotifyOptionsWidget(parent);
+	return new OptionsWidget_notify(parent);
 }
 
 KviOptionsWidget * classKviProtectionOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviProtectionOptionsWidget(parent);
+	return new OptionsWidget_protection(parent);
 }
 
 KviOptionsWidget * classKviProxyOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviProxyOptionsWidget(parent);
+	return new OptionsWidget_proxy(parent);
 }
 
 KviOptionsWidget * classKviQueryOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviQueryOptionsWidget(parent);
+	return new OptionsWidget_query(parent);
 }
 
 KviOptionsWidget * classKviIrcServerOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviIrcServerOptionsWidget(parent);
+	return new OptionsWidget_servers(parent);
 }
 
 KviOptionsWidget * classKviSoundOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviSoundOptionsWidget(parent);
+	return new OptionsWidget_sound(parent);
 }
 
 KviOptionsWidget * classKviSoundGeneralOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviSoundGeneralOptionsWidget(parent);
+	return new OptionsWidget_soundGeneral(parent);
 }
 
 KviOptionsWidget * classKviSoundsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviSoundsOptionsWidget(parent);
+	return new OptionsWidget_sounds(parent);
 }
 
 KviOptionsWidget * classKviTextEncodingOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTextEncodingOptionsWidget(parent);
+	return new OptionsWidget_textEncoding(parent);
 }
 
 KviOptionsWidget * classKviTextIconsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTextIconsOptionsWidget(parent);
+	return new OptionsWidget_textIcons(parent);
 }
 
 KviOptionsWidget * classKviToolsOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviToolsOptionsWidget(parent);
+	return new OptionsWidget_tools(parent);
 }
 
 KviOptionsWidget * classKviTopicLabelLookOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTopicLabelLookOptionsWidget(parent);
+	return new OptionsWidget_topicLabel(parent);
 }
 
 KviOptionsWidget * classKviTrayOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTrayOptionsWidget(parent);
+	return new OptionsWidget_tray(parent);
 }
 
 KviOptionsWidget * classKviUParserOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUParserOptionsWidget(parent);
+	return new OptionsWidget_uparser(parent);
 }
 
 KviOptionsWidget * classKviUrlHandlersOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUrlHandlersOptionsWidget(parent);
+	return new OptionsWidget_urlHandlers(parent);
 }
 
 KviOptionsWidget * classKviUserListLookOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUserListLookOptionsWidget(parent);
+	return new OptionsWidget_userList(parent);
 }
 
 KviOptionsWidget * classKviUserListLookBackgroundOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUserListLookBackgroundOptionsWidget(parent);
+	return new OptionsWidget_userListBackground(parent);
 }
 
 KviOptionsWidget * classKviUserListLookForegroundOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUserListLookForegroundOptionsWidget(parent);
+	return new OptionsWidget_userListForeground(parent);
 }
 
 KviOptionsWidget * classKviUserListGridOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUserListGridOptionsWidget(parent);
+	return new OptionsWidget_userListGrid(parent);
 }
 
 KviOptionsWidget * classKviUserListFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviUserListFeaturesOptionsWidget(parent);
+	return new OptionsWidget_userListFeatures(parent);
 }
 
 KviOptionsWidget * classKviWindowListOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviWindowListOptionsWidget(parent);
+	return new OptionsWidget_windowList(parent);
 }
 
 KviOptionsWidget * classKviTreeWindowListOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTreeWindowListOptionsWidget(parent);
+	return new OptionsWidget_windowListTree(parent);
 }
 
 KviOptionsWidget * classKviTreeWindowListForegroundOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTreeWindowListForegroundOptionsWidget(parent);
+	return new OptionsWidget_windowListTreeForeground(parent);
 }
 
 KviOptionsWidget * classKviTreeWindowListBackgroundOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTreeWindowListBackgroundOptionsWidget(parent);
+	return new OptionsWidget_windowListTreeBackground(parent);
 }
 
 KviOptionsWidget * classKviTreeWindowListFeaturesOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviTreeWindowListFeaturesOptionsWidget(parent);
+	return new OptionsWidget_windowListTreeFeatures(parent);
 }
 
 KviOptionsWidget * classKviClassicWindowListOptionsWidget_createInstanceProc(QWidget * parent)
 {
-	return new KviClassicWindowListOptionsWidget(parent);
+	return new OptionsWidget_windowListClassic(parent);
 }
 
 
 
 static const char * g_szName_KviAntispamOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAntispamOptionsWidget;
-static const char * g_szClassName_KviAntispamOptionsWidget = "KviAntispamOptionsWidget";
+static const char * g_szClassName_KviAntispamOptionsWidget = "OptionsWidget_antispam";
 static const char * g_szName_KviAvatarAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAvatarAdvancedOptionsWidget;
-static const char * g_szClassName_KviAvatarAdvancedOptionsWidget = "KviAvatarAdvancedOptionsWidget";
+static const char * g_szClassName_KviAvatarAdvancedOptionsWidget = "OptionsWidget_avatar";
 static const char * g_szName_KviAwayOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAwayOptionsWidget;
-static const char * g_szClassName_KviAwayOptionsWidget = "KviAwayOptionsWidget";
+static const char * g_szClassName_KviAwayOptionsWidget = "OptionsWidget_away";
 static const char * g_szName_KviChannelOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelOptionsWidget;
-static const char * g_szClassName_KviChannelOptionsWidget = "KviChannelOptionsWidget";
+static const char * g_szClassName_KviChannelOptionsWidget = "OptionsWidget_channel";
 static const char * g_szName_KviChannelGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelGeneralOptionsWidget;
-static const char * g_szClassName_KviChannelGeneralOptionsWidget = "KviChannelGeneralOptionsWidget";
+static const char * g_szClassName_KviChannelGeneralOptionsWidget = "OptionsWidget_channelGeneral";
 static const char * g_szName_KviChannelAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviChannelAdvancedOptionsWidget;
-static const char * g_szClassName_KviChannelAdvancedOptionsWidget = "KviChannelAdvancedOptionsWidget";
+static const char * g_szClassName_KviChannelAdvancedOptionsWidget = "OptionsWidget_channelAdvanced";
 static const char * g_szName_KviConnectionOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviConnectionOptionsWidget;
-static const char * g_szClassName_KviConnectionOptionsWidget = "KviConnectionOptionsWidget";
+static const char * g_szClassName_KviConnectionOptionsWidget = "OptionsWidget_connection";
 static const char * g_szName_KviConnectionAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviConnectionAdvancedOptionsWidget;
-static const char * g_szClassName_KviConnectionAdvancedOptionsWidget = "KviConnectionAdvancedOptionsWidget";
+static const char * g_szClassName_KviConnectionAdvancedOptionsWidget = "OptionsWidget_connectionAdvanced";
 static const char * g_szName_KviSSLOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSSLOptionsWidget;
-static const char * g_szClassName_KviSSLOptionsWidget = "KviSSLOptionsWidget";
+static const char * g_szClassName_KviSSLOptionsWidget = "OptionsWidget_connectionSsl";
 static const char * g_szName_KviTransportOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTransportOptionsWidget;
-static const char * g_szClassName_KviTransportOptionsWidget = "KviTransportOptionsWidget";
+static const char * g_szClassName_KviTransportOptionsWidget = "OptionsWidget_connectionSocket";
 static const char * g_szName_KviIdentOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentOptionsWidget;
-static const char * g_szClassName_KviIdentOptionsWidget = "KviIdentOptionsWidget";
+static const char * g_szClassName_KviIdentOptionsWidget = "OptionsWidget_identService";
 static const char * g_szName_KviCtcpOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviCtcpOptionsWidget;
-static const char * g_szClassName_KviCtcpOptionsWidget = "KviCtcpOptionsWidget";
+static const char * g_szClassName_KviCtcpOptionsWidget = "OptionsWidget_ctcp";
 static const char * g_szName_KviCtcpFloodProtectionOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviCtcpFloodProtectionOptionsWidget;
-static const char * g_szClassName_KviCtcpFloodProtectionOptionsWidget = "KviCtcpFloodProtectionOptionsWidget";
+static const char * g_szClassName_KviCtcpFloodProtectionOptionsWidget = "OptionsWidget_ctcpFloodProtection";
 static const char * g_szName_KviDccOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccOptionsWidget;
-static const char * g_szClassName_KviDccOptionsWidget = "KviDccOptionsWidget";
+static const char * g_szClassName_KviDccOptionsWidget = "OptionsWidget_dcc";
 static const char * g_szName_KviDccGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccGeneralOptionsWidget;
-static const char * g_szClassName_KviDccGeneralOptionsWidget = "KviDccGeneralOptionsWidget";
+static const char * g_szClassName_KviDccGeneralOptionsWidget = "OptionsWidget_dccGeneral";
 static const char * g_szName_KviDccAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccAdvancedOptionsWidget;
-static const char * g_szClassName_KviDccAdvancedOptionsWidget = "KviDccAdvancedOptionsWidget";
+static const char * g_szClassName_KviDccAdvancedOptionsWidget = "OptionsWidget_dccAdvanced";
 static const char * g_szName_KviDccSendOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccSendOptionsWidget;
-static const char * g_szClassName_KviDccSendOptionsWidget = "KviDccSendOptionsWidget";
+static const char * g_szClassName_KviDccSendOptionsWidget = "OptionsWidget_dccSend";
 static const char * g_szName_KviDccSendGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccSendGeneralOptionsWidget;
-static const char * g_szClassName_KviDccSendGeneralOptionsWidget = "KviDccSendGeneralOptionsWidget";
+static const char * g_szClassName_KviDccSendGeneralOptionsWidget = "OptionsWidget_dccSendGeneral";
 static const char * g_szName_KviDccSendAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccSendAdvancedOptionsWidget;
-static const char * g_szClassName_KviDccSendAdvancedOptionsWidget = "KviDccSendAdvancedOptionsWidget";
+static const char * g_szClassName_KviDccSendAdvancedOptionsWidget = "OptionsWidget_dccSendAdvanced";
 static const char * g_szName_KviDccChatOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccChatOptionsWidget;
-static const char * g_szClassName_KviDccChatOptionsWidget = "KviDccChatOptionsWidget";
+static const char * g_szClassName_KviDccChatOptionsWidget = "OptionsWidget_dccChat";
 static const char * g_szName_KviDccVoiceOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviDccVoiceOptionsWidget;
-static const char * g_szClassName_KviDccVoiceOptionsWidget = "KviDccVoiceOptionsWidget";
+static const char * g_szClassName_KviDccVoiceOptionsWidget = "OptionsWidget_dccVoice";
 static const char * g_szName_KviGeneralOptOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviGeneralOptOptionsWidget;
-static const char * g_szClassName_KviGeneralOptOptionsWidget = "KviGeneralOptOptionsWidget";
+static const char * g_szClassName_KviGeneralOptOptionsWidget = "OptionsWidget_general";
 static const char * g_szName_KviAlertHighlightingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAlertHighlightingOptionsWidget;
-static const char * g_szClassName_KviAlertHighlightingOptionsWidget = "KviAlertHighlightingOptionsWidget";
+static const char * g_szClassName_KviAlertHighlightingOptionsWidget = "OptionsWidget_alertsAndHighlighting";
 static const char * g_szName_KviHighlightingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviHighlightingOptionsWidget;
-static const char * g_szClassName_KviHighlightingOptionsWidget = "KviHighlightingOptionsWidget";
+static const char * g_szClassName_KviHighlightingOptionsWidget = "OptionsWidget_highlighting";
 static const char * g_szName_KviAlertOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviAlertOptionsWidget;
-static const char * g_szClassName_KviAlertOptionsWidget = "KviAlertOptionsWidget";
+static const char * g_szClassName_KviAlertOptionsWidget = "OptionsWidget_alerts";
 static const char * g_szName_KviIdentityOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityOptionsWidget;
-static const char * g_szClassName_KviIdentityOptionsWidget = "KviIdentityOptionsWidget";
+static const char * g_szClassName_KviIdentityOptionsWidget = "OptionsWidget_identity";
 static const char * g_szName_KviIdentityGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget;
 static const char * g_szClassName_KviIdentityGeneralOptionsWidget = "KviIdentityGeneralOptionsWidget";
 static const char * g_szName_KviIdentityAvatarOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityAvatarOptionsWidget;
-static const char * g_szClassName_KviIdentityAvatarOptionsWidget = "KviIdentityAvatarOptionsWidget";
+static const char * g_szClassName_KviIdentityAvatarOptionsWidget = "OptionsWidget_identityAvatar";
 static const char * g_szName_KviIdentityAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityAdvancedOptionsWidget;
-static const char * g_szClassName_KviIdentityAdvancedOptionsWidget = "KviIdentityAdvancedOptionsWidget";
+static const char * g_szClassName_KviIdentityAdvancedOptionsWidget = "OptionsWidget_identityAdvanced";
 static const char * g_szName_KviIdentityProfileOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIdentityProfileOptionsWidget;
-static const char * g_szClassName_KviIdentityProfileOptionsWidget = "KviIdentityProfileOptionsWidget";
+static const char * g_szClassName_KviIdentityProfileOptionsWidget = "OptionsWidget_identityProfile";
 static const char * g_szName_KviIgnoreOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIgnoreOptionsWidget;
-static const char * g_szClassName_KviIgnoreOptionsWidget = "KviIgnoreOptionsWidget";
+static const char * g_szClassName_KviIgnoreOptionsWidget = "OptionsWidget_ignore";
 static const char * g_szName_KviInputLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviInputLookOptionsWidget;
-static const char * g_szClassName_KviInputLookOptionsWidget = "KviInputLookOptionsWidget";
+static const char * g_szClassName_KviInputLookOptionsWidget = "OptionsWidget_inputLook";
 static const char * g_szName_KviInputFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviInputFeaturesOptionsWidget;
-static const char * g_szClassName_KviInputFeaturesOptionsWidget = "KviInputFeaturesOptionsWidget";
+static const char * g_szClassName_KviInputFeaturesOptionsWidget = "OptionsWidget_inputFeatures";
 static const char * g_szName_KviInterfaceFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviInterfaceFeaturesOptionsWidget;
-static const char * g_szClassName_KviInterfaceFeaturesOptionsWidget = "KviInterfaceFeaturesOptionsWidget";
+static const char * g_szClassName_KviInterfaceFeaturesOptionsWidget = "OptionsWidget_interfaceFeatures";
 static const char * g_szName_KviThemeGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeGeneralOptionsWidget;
-static const char * g_szClassName_KviThemeGeneralOptionsWidget = "KviThemeGeneralOptionsWidget";
+static const char * g_szClassName_KviThemeGeneralOptionsWidget = "OptionsWidget_theme";
 static const char * g_szName_KviThemeTransparencyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeTransparencyOptionsWidget;
-static const char * g_szClassName_KviThemeTransparencyOptionsWidget = "KviThemeTransparencyOptionsWidget";
+static const char * g_szClassName_KviThemeTransparencyOptionsWidget = "OptionsWidget_themeTransparency";
 static const char * g_szName_KviThemeMdiAreaOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeMdiAreaOptionsWidget;
-static const char * g_szClassName_KviThemeMdiAreaOptionsWidget = "KviThemeMdiAreaOptionsWidget";
+static const char * g_szClassName_KviThemeMdiAreaOptionsWidget = "OptionsWidget_themeMdiArea";
 static const char * g_szName_KviThemeToolBarAppletsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviThemeToolBarAppletsOptionsWidget;
-static const char * g_szClassName_KviThemeToolBarAppletsOptionsWidget = "KviThemeToolBarAppletsOptionsWidget";
+static const char * g_szClassName_KviThemeToolBarAppletsOptionsWidget = "OptionsWidget_themeToolBarApplets";
 static const char * g_szName_KviIrcOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcOptionsWidget;
-static const char * g_szClassName_KviIrcOptionsWidget = "KviIrcOptionsWidget";
+static const char * g_szClassName_KviIrcOptionsWidget = "OptionsWidget_irc";
 static const char * g_szName_KviIrcGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcGeneralOptionsWidget;
-static const char * g_szClassName_KviIrcGeneralOptionsWidget = "KviIrcGeneralOptionsWidget";
+static const char * g_szClassName_KviIrcGeneralOptionsWidget = "OptionsWidget_ircGeneral";
 static const char * g_szName_KviIrcAdvancedOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcAdvancedOptionsWidget;
-static const char * g_szClassName_KviIrcAdvancedOptionsWidget = "KviIrcAdvancedOptionsWidget";
+static const char * g_szClassName_KviIrcAdvancedOptionsWidget = "OptionsWidget_ircAdvanced";
 static const char * g_szName_KviIrcOutputOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcOutputOptionsWidget;
-static const char * g_szClassName_KviIrcOutputOptionsWidget = "KviIrcOutputOptionsWidget";
+static const char * g_szClassName_KviIrcOutputOptionsWidget = "OptionsWidget_ircOutput";
 static const char * g_szName_KviIrcViewThemeOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewThemeOptionsWidget;
-static const char * g_szClassName_KviIrcViewThemeOptionsWidget = "KviIrcViewThemeOptionsWidget";
+static const char * g_szClassName_KviIrcViewThemeOptionsWidget = "OptionsWidget_ircViewTheme";
 static const char * g_szName_KviIrcViewLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewLookOptionsWidget;
-static const char * g_szClassName_KviIrcViewLookOptionsWidget = "KviIrcViewLookOptionsWidget";
+static const char * g_szClassName_KviIrcViewLookOptionsWidget = "OptionsWidget_ircViewLook";
 static const char * g_szName_KviIrcViewFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewFeaturesOptionsWidget;
-static const char * g_szClassName_KviIrcViewFeaturesOptionsWidget = "KviIrcViewFeaturesOptionsWidget";
+static const char * g_szClassName_KviIrcViewFeaturesOptionsWidget = "OptionsWidget_ircViewFeatures";
 static const char * g_szName_KviIrcViewMarkerOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcViewMarkerOptionsWidget;
-static const char * g_szClassName_KviIrcViewMarkerOptionsWidget = "KviIrcViewMarkerOptionsWidget";
+static const char * g_szClassName_KviIrcViewMarkerOptionsWidget = "OptionsWidget_ircViewMarker";
 static const char * g_szName_KviLagOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviLagOptionsWidget;
-static const char * g_szClassName_KviLagOptionsWidget = "KviLagOptionsWidget";
+static const char * g_szClassName_KviLagOptionsWidget = "OptionsWidget_lag";
 static const char * g_szName_KviLoggingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviLoggingOptionsWidget;
-static const char * g_szClassName_KviLoggingOptionsWidget = "KviLoggingOptionsWidget";
+static const char * g_szClassName_KviLoggingOptionsWidget = "OptionsWidget_logging";
 static const char * g_szName_KviMediaTypesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviMediaTypesOptionsWidget;
-static const char * g_szClassName_KviMediaTypesOptionsWidget = "KviMediaTypesOptionsWidget";
+static const char * g_szClassName_KviMediaTypesOptionsWidget = "OptionsWidget_mediaTypes";
 static const char * g_szName_KviMessageOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviMessageOptionsWidget;
-static const char * g_szClassName_KviMessageOptionsWidget = "KviMessageOptionsWidget";
+static const char * g_szClassName_KviMessageOptionsWidget = "OptionsWidget_message";
 static const char * g_szName_KviPrivmsgOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviPrivmsgOptionsWidget;
-static const char * g_szClassName_KviPrivmsgOptionsWidget = "KviPrivmsgOptionsWidget";
+static const char * g_szClassName_KviPrivmsgOptionsWidget = "OptionsWidget_privmsg";
 static const char * g_szName_KviTimestampOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTimestampOptionsWidget;
-static const char * g_szClassName_KviTimestampOptionsWidget = "KviTimestampOptionsWidget";
+static const char * g_szClassName_KviTimestampOptionsWidget = "OptionsWidget_timestamp";
 static const char * g_szName_KviMessageColorsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviMessageColorsOptionsWidget;
-static const char * g_szClassName_KviMessageColorsOptionsWidget = "KviMessageColorsOptionsWidget";
+static const char * g_szClassName_KviMessageColorsOptionsWidget = "OptionsWidget_messageColors";
 static const char * g_szName_KviStandardColorsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviStandardColorsOptionsWidget;
-static const char * g_szClassName_KviStandardColorsOptionsWidget = "KviStandardColorsOptionsWidget";
+static const char * g_szClassName_KviStandardColorsOptionsWidget = "OptionsWidget_standardColors";
 static const char * g_szName_KviNickServOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNickServOptionsWidget;
-static const char * g_szClassName_KviNickServOptionsWidget = "KviNickServOptionsWidget";
+static const char * g_szClassName_KviNickServOptionsWidget = "OptionsWidget_nickServ";
 static const char * g_szName_KviNotifierLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifierLookOptionsWidget;
-static const char * g_szClassName_KviNotifierLookOptionsWidget = "KviNotifierLookOptionsWidget";
+static const char * g_szClassName_KviNotifierLookOptionsWidget = "OptionsWidget_notifierLook";
 static const char * g_szName_KviNotifierOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifierOptionsWidget;
-static const char * g_szClassName_KviNotifierOptionsWidget = "KviNotifierOptionsWidget";
+static const char * g_szClassName_KviNotifierOptionsWidget = "OptionsWidget_notifier";
 static const char * g_szName_KviNotifyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviNotifyOptionsWidget;
-static const char * g_szClassName_KviNotifyOptionsWidget = "KviNotifyOptionsWidget";
+static const char * g_szClassName_KviNotifyOptionsWidget = "OptionsWidget_notify";
 static const char * g_szName_KviProtectionOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviProtectionOptionsWidget;
-static const char * g_szClassName_KviProtectionOptionsWidget = "KviProtectionOptionsWidget";
+static const char * g_szClassName_KviProtectionOptionsWidget = "OptionsWidget_protection";
 static const char * g_szName_KviProxyOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviProxyOptionsWidget;
-static const char * g_szClassName_KviProxyOptionsWidget = "KviProxyOptionsWidget";
+static const char * g_szClassName_KviProxyOptionsWidget = "OptionsWidget_proxy";
 static const char * g_szName_KviQueryOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviQueryOptionsWidget;
-static const char * g_szClassName_KviQueryOptionsWidget = "KviQueryOptionsWidget";
+static const char * g_szClassName_KviQueryOptionsWidget = "OptionsWidget_query";
 static const char * g_szName_KviIrcServerOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviIrcServerOptionsWidget;
-static const char * g_szClassName_KviIrcServerOptionsWidget = "KviIrcServerOptionsWidget";
+static const char * g_szClassName_KviIrcServerOptionsWidget = "OptionsWidget_servers";
 static const char * g_szName_KviSoundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundOptionsWidget;
-static const char * g_szClassName_KviSoundOptionsWidget = "KviSoundOptionsWidget";
+static const char * g_szClassName_KviSoundOptionsWidget = "OptionsWidget_sound";
 static const char * g_szName_KviSoundGeneralOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundGeneralOptionsWidget;
-static const char * g_szClassName_KviSoundGeneralOptionsWidget = "KviSoundGeneralOptionsWidget";
+static const char * g_szClassName_KviSoundGeneralOptionsWidget = "OptionsWidget_soundGeneral";
 static const char * g_szName_KviSoundsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviSoundsOptionsWidget;
-static const char * g_szClassName_KviSoundsOptionsWidget = "KviSoundsOptionsWidget";
+static const char * g_szClassName_KviSoundsOptionsWidget = "OptionsWidget_sounds";
 static const char * g_szName_KviTextEncodingOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTextEncodingOptionsWidget;
-static const char * g_szClassName_KviTextEncodingOptionsWidget = "KviTextEncodingOptionsWidget";
+static const char * g_szClassName_KviTextEncodingOptionsWidget = "OptionsWidget_textEncoding";
 static const char * g_szName_KviTextIconsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTextIconsOptionsWidget;
-static const char * g_szClassName_KviTextIconsOptionsWidget = "KviTextIconsOptionsWidget";
+static const char * g_szClassName_KviTextIconsOptionsWidget = "OptionsWidget_textIcons";
 static const char * g_szName_KviToolsOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviToolsOptionsWidget;
-static const char * g_szClassName_KviToolsOptionsWidget = "KviToolsOptionsWidget";
+static const char * g_szClassName_KviToolsOptionsWidget = "OptionsWidget_tools";
 static const char * g_szName_KviTopicLabelLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTopicLabelLookOptionsWidget;
-static const char * g_szClassName_KviTopicLabelLookOptionsWidget = "KviTopicLabelLookOptionsWidget";
+static const char * g_szClassName_KviTopicLabelLookOptionsWidget = "OptionsWidget_topicLabel";
 static const char * g_szName_KviTrayOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTrayOptionsWidget;
-static const char * g_szClassName_KviTrayOptionsWidget = "KviTrayOptionsWidget";
+static const char * g_szClassName_KviTrayOptionsWidget = "OptionsWidget_tray";
 static const char * g_szName_KviUParserOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUParserOptionsWidget;
-static const char * g_szClassName_KviUParserOptionsWidget = "KviUParserOptionsWidget";
+static const char * g_szClassName_KviUParserOptionsWidget = "OptionsWidget_uparser";
 static const char * g_szName_KviUrlHandlersOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUrlHandlersOptionsWidget;
-static const char * g_szClassName_KviUrlHandlersOptionsWidget = "KviUrlHandlersOptionsWidget";
+static const char * g_szClassName_KviUrlHandlersOptionsWidget = "OptionsWidget_urlHandlers";
 static const char * g_szName_KviUserListLookOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListLookOptionsWidget;
-static const char * g_szClassName_KviUserListLookOptionsWidget = "KviUserListLookOptionsWidget";
+static const char * g_szClassName_KviUserListLookOptionsWidget = "OptionsWidget_userList";
 static const char * g_szName_KviUserListLookBackgroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListLookBackgroundOptionsWidget;
-static const char * g_szClassName_KviUserListLookBackgroundOptionsWidget = "KviUserListLookBackgroundOptionsWidget";
+static const char * g_szClassName_KviUserListLookBackgroundOptionsWidget = "OptionsWidget_userListBackground";
 static const char * g_szName_KviUserListLookForegroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListLookForegroundOptionsWidget;
-static const char * g_szClassName_KviUserListLookForegroundOptionsWidget = "KviUserListLookForegroundOptionsWidget";
+static const char * g_szClassName_KviUserListLookForegroundOptionsWidget = "OptionsWidget_userListForeground";
 static const char * g_szName_KviUserListGridOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListGridOptionsWidget;
-static const char * g_szClassName_KviUserListGridOptionsWidget = "KviUserListGridOptionsWidget";
+static const char * g_szClassName_KviUserListGridOptionsWidget = "OptionsWidget_userListGrid";
 static const char * g_szName_KviUserListFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviUserListFeaturesOptionsWidget;
-static const char * g_szClassName_KviUserListFeaturesOptionsWidget = "KviUserListFeaturesOptionsWidget";
+static const char * g_szClassName_KviUserListFeaturesOptionsWidget = "OptionsWidget_userListFeatures";
 static const char * g_szName_KviWindowListOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviWindowListOptionsWidget;
-static const char * g_szClassName_KviWindowListOptionsWidget = "KviWindowListOptionsWidget";
+static const char * g_szClassName_KviWindowListOptionsWidget = "OptionsWidget_windowList";
 static const char * g_szName_KviTreeWindowListOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListOptionsWidget;
-static const char * g_szClassName_KviTreeWindowListOptionsWidget = "KviTreeWindowListOptionsWidget";
+static const char * g_szClassName_KviTreeWindowListOptionsWidget = "OptionsWidget_windowListTree";
 static const char * g_szName_KviTreeWindowListForegroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListForegroundOptionsWidget;
-static const char * g_szClassName_KviTreeWindowListForegroundOptionsWidget = "KviTreeWindowListForegroundOptionsWidget";
+static const char * g_szClassName_KviTreeWindowListForegroundOptionsWidget = "OptionsWidget_windowListTreeForeground";
 static const char * g_szName_KviTreeWindowListBackgroundOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListBackgroundOptionsWidget;
-static const char * g_szClassName_KviTreeWindowListBackgroundOptionsWidget = "KviTreeWindowListBackgroundOptionsWidget";
+static const char * g_szClassName_KviTreeWindowListBackgroundOptionsWidget = "OptionsWidget_windowListTreeBackground";
 static const char * g_szName_KviTreeWindowListFeaturesOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListFeaturesOptionsWidget;
-static const char * g_szClassName_KviTreeWindowListFeaturesOptionsWidget = "KviTreeWindowListFeaturesOptionsWidget";
+static const char * g_szClassName_KviTreeWindowListFeaturesOptionsWidget = "OptionsWidget_windowListTreeFeatures";
 static const char * g_szName_KviClassicWindowListOptionsWidget = KVI_OPTIONS_WIDGET_NAME_KviClassicWindowListOptionsWidget;
-static const char * g_szClassName_KviClassicWindowListOptionsWidget = "KviClassicWindowListOptionsWidget";
+static const char * g_szClassName_KviClassicWindowListOptionsWidget = "OptionsWidget_windowListClassic";
 
-KviOptionsInstanceManager::KviOptionsInstanceManager()
+OptionsInstanceManager::OptionsInstanceManager()
 : QObject(0)
 {
 
 	//qDebug("Instantiating");
 	// Create the global widget dict : case sensitive, do not copy keys
-	m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	m_pInstanceTree = new KviPointerList<OptionsWidgetInstanceEntry>;
 	m_pInstanceTree->setAutoDelete(true);
 
 
-	KviOptionsWidgetInstanceEntry * e0;
-	e0 = new KviOptionsWidgetInstanceEntry;
+	OptionsWidgetInstanceEntry * e0;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviConnectionOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviConnectionOptionsWidget;
@@ -704,11 +704,11 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviConnectionOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		KviOptionsWidgetInstanceEntry * e1;
-		e1 = new KviOptionsWidgetInstanceEntry;
+		OptionsWidgetInstanceEntry * e1;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviConnectionAdvancedOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviConnectionAdvancedOptionsWidget;
@@ -741,11 +741,11 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviConnectionAdvancedOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			KviOptionsWidgetInstanceEntry * e2;
-			e2 = new KviOptionsWidgetInstanceEntry;
+			OptionsWidgetInstanceEntry * e2;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviSSLOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviSSLOptionsWidget;
@@ -779,7 +779,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviTransportOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviTransportOptionsWidget;
@@ -813,7 +813,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviIdentOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviIdentOptionsWidget;
@@ -847,7 +847,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviProxyOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviProxyOptionsWidget;
@@ -881,7 +881,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviDccOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviDccOptionsWidget;
@@ -914,10 +914,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviDccGeneralOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviDccGeneralOptionsWidget;
@@ -951,7 +951,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviDccAdvancedOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviDccAdvancedOptionsWidget;
@@ -985,7 +985,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviDccSendOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviDccSendOptionsWidget;
@@ -1018,10 +1018,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviDccSendOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviDccSendGeneralOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviDccSendGeneralOptionsWidget;
@@ -1055,7 +1055,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviDccSendAdvancedOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviDccSendAdvancedOptionsWidget;
@@ -1089,7 +1089,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviDccChatOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviDccChatOptionsWidget;
@@ -1123,7 +1123,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviDccVoiceOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviDccVoiceOptionsWidget;
@@ -1157,7 +1157,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviGeneralOptOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviGeneralOptOptionsWidget;
@@ -1190,10 +1190,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviGeneralOptOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviMediaTypesOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviMediaTypesOptionsWidget;
@@ -1227,7 +1227,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviSoundOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviSoundOptionsWidget;
@@ -1260,10 +1260,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviSoundOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviSoundGeneralOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviSoundGeneralOptionsWidget;
@@ -1297,7 +1297,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviSoundsOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviSoundsOptionsWidget;
@@ -1331,7 +1331,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviTextEncodingOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviTextEncodingOptionsWidget;
@@ -1365,7 +1365,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUParserOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUParserOptionsWidget;
@@ -1399,7 +1399,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUrlHandlersOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUrlHandlersOptionsWidget;
@@ -1433,7 +1433,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviIdentityOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviIdentityOptionsWidget;
@@ -1466,10 +1466,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIdentityGeneralOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIdentityGeneralOptionsWidget;
@@ -1503,7 +1503,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIdentityAvatarOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIdentityAvatarOptionsWidget;
@@ -1537,7 +1537,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIdentityAdvancedOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIdentityAdvancedOptionsWidget;
@@ -1571,7 +1571,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIdentityProfileOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIdentityProfileOptionsWidget;
@@ -1605,7 +1605,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviInputLookOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviInputLookOptionsWidget;
@@ -1639,7 +1639,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviInterfaceFeaturesOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviInterfaceFeaturesOptionsWidget;
@@ -1672,10 +1672,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviInterfaceFeaturesOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviInputFeaturesOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviInputFeaturesOptionsWidget;
@@ -1709,7 +1709,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviNotifierOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviNotifierOptionsWidget;
@@ -1743,7 +1743,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviTrayOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviTrayOptionsWidget;
@@ -1777,7 +1777,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviThemeGeneralOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviThemeGeneralOptionsWidget;
@@ -1811,7 +1811,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviThemeTransparencyOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviThemeTransparencyOptionsWidget;
@@ -1845,7 +1845,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviThemeMdiAreaOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviThemeMdiAreaOptionsWidget;
@@ -1879,7 +1879,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviThemeToolBarAppletsOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviThemeToolBarAppletsOptionsWidget;
@@ -1913,7 +1913,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviIrcOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviIrcOptionsWidget;
@@ -1946,10 +1946,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviChannelOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviChannelOptionsWidget;
@@ -1982,10 +1982,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviChannelOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviChannelGeneralOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviChannelGeneralOptionsWidget;
@@ -2019,7 +2019,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviChannelAdvancedOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviChannelAdvancedOptionsWidget;
@@ -2053,7 +2053,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcGeneralOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcGeneralOptionsWidget;
@@ -2087,7 +2087,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcAdvancedOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcAdvancedOptionsWidget;
@@ -2121,7 +2121,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcOutputOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcOutputOptionsWidget;
@@ -2155,7 +2155,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviProtectionOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviProtectionOptionsWidget;
@@ -2188,10 +2188,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviProtectionOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviAntispamOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviAntispamOptionsWidget;
@@ -2225,7 +2225,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviCtcpFloodProtectionOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviCtcpFloodProtectionOptionsWidget;
@@ -2259,7 +2259,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviIgnoreOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviIgnoreOptionsWidget;
@@ -2293,7 +2293,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviQueryOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviQueryOptionsWidget;
@@ -2327,7 +2327,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviToolsOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviToolsOptionsWidget;
@@ -2360,10 +2360,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviToolsOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviAvatarAdvancedOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviAvatarAdvancedOptionsWidget;
@@ -2397,7 +2397,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviAwayOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviAwayOptionsWidget;
@@ -2431,7 +2431,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviCtcpOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviCtcpOptionsWidget;
@@ -2465,7 +2465,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviAlertHighlightingOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviAlertHighlightingOptionsWidget;
@@ -2498,11 +2498,11 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e2->szName = __tr2qs_ctx_no_xgettext(g_szName_KviAlertHighlightingOptionsWidget,"options");
 			e1->pChildList->append(e2);
 
-			e2->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+			e2->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 			e2->pChildList->setAutoDelete(true);
 
-				KviOptionsWidgetInstanceEntry * e3;
-				e3 = new KviOptionsWidgetInstanceEntry;
+				OptionsWidgetInstanceEntry * e3;
+				e3 = new OptionsWidgetInstanceEntry;
 				e3->createProc = &classKviHighlightingOptionsWidget_createInstanceProc;
 				e3->pWidget = 0;
 				e3->szClassName = g_szClassName_KviHighlightingOptionsWidget;
@@ -2536,7 +2536,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 				e2->pChildList->append(e3);
 				e3->pChildList = 0;
 
-				e3 = new KviOptionsWidgetInstanceEntry;
+				e3 = new OptionsWidgetInstanceEntry;
 				e3->createProc = &classKviAlertOptionsWidget_createInstanceProc;
 				e3->pWidget = 0;
 				e3->szClassName = g_szClassName_KviAlertOptionsWidget;
@@ -2570,7 +2570,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 				e2->pChildList->append(e3);
 				e3->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviLagOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviLagOptionsWidget;
@@ -2604,7 +2604,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviLoggingOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviLoggingOptionsWidget;
@@ -2638,7 +2638,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviNickServOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviNickServOptionsWidget;
@@ -2672,7 +2672,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviNotifyOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviNotifyOptionsWidget;
@@ -2706,7 +2706,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviTextIconsOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviTextIconsOptionsWidget;
@@ -2740,7 +2740,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviIrcViewThemeOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviIrcViewThemeOptionsWidget;
@@ -2773,10 +2773,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIrcViewThemeOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcViewLookOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcViewLookOptionsWidget;
@@ -2810,7 +2810,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcViewFeaturesOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcViewFeaturesOptionsWidget;
@@ -2844,7 +2844,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviIrcViewMarkerOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviIrcViewMarkerOptionsWidget;
@@ -2878,7 +2878,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviMessageOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviMessageOptionsWidget;
@@ -2911,10 +2911,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviMessageOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviPrivmsgOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviPrivmsgOptionsWidget;
@@ -2948,7 +2948,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviTimestampOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviTimestampOptionsWidget;
@@ -2982,7 +2982,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviMessageColorsOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviMessageColorsOptionsWidget;
@@ -3016,7 +3016,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviStandardColorsOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviStandardColorsOptionsWidget;
@@ -3050,7 +3050,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviNotifierLookOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviNotifierLookOptionsWidget;
@@ -3084,7 +3084,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviIrcServerOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviIrcServerOptionsWidget;
@@ -3118,7 +3118,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviTopicLabelLookOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviTopicLabelLookOptionsWidget;
@@ -3152,7 +3152,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	m_pInstanceTree->append(e0);
 	e0->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviUserListLookOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviUserListLookOptionsWidget;
@@ -3185,10 +3185,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviUserListLookOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUserListLookBackgroundOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUserListLookBackgroundOptionsWidget;
@@ -3222,7 +3222,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUserListLookForegroundOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUserListLookForegroundOptionsWidget;
@@ -3256,7 +3256,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUserListGridOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUserListGridOptionsWidget;
@@ -3290,7 +3290,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviUserListFeaturesOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviUserListFeaturesOptionsWidget;
@@ -3324,7 +3324,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e0->pChildList->append(e1);
 		e1->pChildList = 0;
 
-	e0 = new KviOptionsWidgetInstanceEntry;
+	e0 = new OptionsWidgetInstanceEntry;
 	e0->createProc = &classKviWindowListOptionsWidget_createInstanceProc;
 	e0->pWidget = 0;
 	e0->szClassName = g_szClassName_KviWindowListOptionsWidget;
@@ -3357,10 +3357,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 	e0->szName = __tr2qs_ctx_no_xgettext(g_szName_KviWindowListOptionsWidget,"options");
 	m_pInstanceTree->append(e0);
 
-	e0->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	e0->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 	e0->pChildList->setAutoDelete(true);
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviTreeWindowListOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviTreeWindowListOptionsWidget;
@@ -3393,10 +3393,10 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 		e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviTreeWindowListOptionsWidget,"options");
 		e0->pChildList->append(e1);
 
-		e1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+		e1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;
 		e1->pChildList->setAutoDelete(true);
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviTreeWindowListForegroundOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviTreeWindowListForegroundOptionsWidget;
@@ -3430,7 +3430,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviTreeWindowListBackgroundOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviTreeWindowListBackgroundOptionsWidget;
@@ -3464,7 +3464,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-			e2 = new KviOptionsWidgetInstanceEntry;
+			e2 = new OptionsWidgetInstanceEntry;
 			e2->createProc = &classKviTreeWindowListFeaturesOptionsWidget_createInstanceProc;
 			e2->pWidget = 0;
 			e2->szClassName = g_szClassName_KviTreeWindowListFeaturesOptionsWidget;
@@ -3498,7 +3498,7 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 			e1->pChildList->append(e2);
 			e2->pChildList = 0;
 
-		e1 = new KviOptionsWidgetInstanceEntry;
+		e1 = new OptionsWidgetInstanceEntry;
 		e1->createProc = &classKviClassicWindowListOptionsWidget_createInstanceProc;
 		e1->pWidget = 0;
 		e1->szClassName = g_szClassName_KviClassicWindowListOptionsWidget;
@@ -3534,15 +3534,15 @@ KviOptionsInstanceManager::KviOptionsInstanceManager()
 
 }
 
-void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(e->pWidget)
 			{
-				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
+				if(e->pWidget->parent()->inherits("OptionsWidgetContainer"))
 				{
 					disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
 					delete e->pWidget->parent();
@@ -3558,21 +3558,21 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 }
 
 
-KviOptionsInstanceManager::~KviOptionsInstanceManager()
+OptionsInstanceManager::~OptionsInstanceManager()
 {
 	if(m_pInstanceTree)
-		qDebug("Ops...KviOptionsInstanceManager::cleanup() not called ?");
+		qDebug("Ops...OptionsInstanceManager::cleanup() not called ?");
 }
 
-void KviOptionsInstanceManager::cleanup(KviModule *)
+void OptionsInstanceManager::cleanup(KviModule *)
 {
 	deleteInstanceTree(m_pInstanceTree);
 	m_pInstanceTree = 0;
 }
 
-void KviOptionsInstanceManager::widgetDestroyed()
+void OptionsInstanceManager::widgetDestroyed()
 {
-	KviOptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree);
+	OptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree);
 	if(e)
 		e->pWidget = 0;
 	if(g_iOptionWidgetInstances > 0)
@@ -3580,7 +3580,7 @@ void KviOptionsInstanceManager::widgetDestroyed()
 
 }
 
-KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par)
+KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * e,QWidget * par)
 {
 	if(!e)
 		return NULL;
@@ -3609,7 +3609,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	{
 		QWidget * oldPar = (QWidget *)e->pWidget->parent();
 		e->pWidget->setParent(par); //reparent(par,QPoint(0,0));
-		if(oldPar->inherits("KviOptionsWidgetContainer"))
+		if(oldPar->inherits("OptionsWidgetContainer"))
 			delete oldPar;
 		// else it's very likely a QStackedWidget, child of a KviOptionsWidget: don't delete
 	}
@@ -3620,15 +3620,15 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 		e->pWidget->createTabbedPage();
 		if(e->pChildList)
 		{
-			KviPointerList<KviOptionsWidgetInstanceEntry> tmp;
+			KviPointerList<OptionsWidgetInstanceEntry> tmp;
 			tmp.setAutoDelete(false);
 
-			for(KviOptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next())
+			for(OptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next())
 			{
 				// add only non containers and widgets not explicitly marked as noncontained
 				if((!e2->bIsContainer) && (!e2->bIsNotContained))
 				{
-					KviOptionsWidgetInstanceEntry * ee = tmp.first();
+					OptionsWidgetInstanceEntry * ee = tmp.first();
 					int idx = 0;
 					while(ee)
 					{
@@ -3640,7 +3640,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 				}
 			}
 
-			for(KviOptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev())
+			for(OptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev())
 			{
 				KviOptionsWidget * ow = getInstance(e3,e->pWidget->tabWidget());
 				e->pWidget->addOptionsWidget(e3->szName,*(g_pIconManager->getSmallIcon(e3->iIcon)),ow);
@@ -3650,16 +3650,16 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	return e->pWidget;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(ptr == e->pWidget)return e;
 			if(e->pChildList)
 			{
-				KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList);
+				OptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList);
 				if(e2)return e2;
 			}
 		}
@@ -3667,16 +3667,16 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 	return 0;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(kvi_strEqualCI(e->szClassName,clName))return e;
 			if(e->pChildList)
 			{
-				KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList);
+				OptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList);
 				if(e2)return e2;
 			}
 		}
@@ -3684,12 +3684,12 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 	return 0;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName)
 {
 	return findInstanceEntry(clName,m_pInstanceTree);
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "m_instances.moc"
+	#include "m_OptionsInstanceManager.moc"
 #endif
 
diff --git a/src/modules/options/instances.h b/src/modules/options/OptionsInstanceManager.h
index 99e9d8d8e..0380c9ca0 100644
--- a/src/modules/options/instances.h
+++ b/src/modules/options/OptionsInstanceManager.h
@@ -5,7 +5,7 @@
 
 //=============================================================================
 //
-//   File : instances.h
+//   File : OptionsInstanceManager.h
 //
 //   This file is part of the KVIrc irc client distribution
 //   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
@@ -38,10 +38,10 @@
 #include "KviPointerList.h"
 #include "KviQString.h"
 
-typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
+typedef struct _OptionsWidgetInstanceEntry OptionsWidgetInstanceEntry;
 
 
-typedef struct _KviOptionsWidgetInstanceEntry
+typedef struct _OptionsWidgetInstanceEntry
 {
 	KviOptionsWidget                          * (*createProc)(QWidget *);
 	KviOptionsWidget                          * pWidget;   // singleton
@@ -55,28 +55,28 @@ typedef struct _KviOptionsWidgetInstanceEntry
 	QString                                     szGroup;
 	bool                                        bIsContainer;
 	bool                                        bIsNotContained;
-	KviPointerList<KviOptionsWidgetInstanceEntry> * pChildList;
-	bool                                        bDoInsert; // a helper for KviOptionsDialog::fillListView()
-} KviOptionsWidgetInstanceEntry;
+	KviPointerList<OptionsWidgetInstanceEntry> * pChildList;
+	bool                                        bDoInsert; // a helper for OptionsDialog::fillListView()
+} OptionsWidgetInstanceEntry;
 
 
-class KviOptionsInstanceManager : public QObject
+class OptionsInstanceManager : public QObject
 {
 	Q_OBJECT
 public:
-	KviOptionsInstanceManager();
-	virtual ~KviOptionsInstanceManager();
+	OptionsInstanceManager();
+	virtual ~OptionsInstanceManager();
 protected:
-	KviPointerList<KviOptionsWidgetInstanceEntry> *  m_pInstanceTree;
+	KviPointerList<OptionsWidgetInstanceEntry> *  m_pInstanceTree;
 public:
-	KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
-	KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par);
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
+	KviPointerList<OptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
+	KviOptionsWidget * getInstance(OptionsWidgetInstanceEntry * e,QWidget * par);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
 	void cleanup(KviModule * m);
 protected:
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-	void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l);
+	void deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l);
 protected slots:
 	void widgetDestroyed();
 };
diff --git a/src/modules/options/container.cpp b/src/modules/options/OptionsWidgetContainer.cpp
index d12e157e5..edb61873c 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/OptionsWidgetContainer.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : container.cpp
+//   File : OptionsWidgetContainer.cpp
 //   Creation date : Wed Nov 21 17:09:49 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "container.h"
-#include "instances.h"
+#include "OptionsWidgetContainer.h"
+#include "OptionsInstanceManager.h"
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
@@ -39,9 +39,9 @@
 #include <QIcon>
 
 
-extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
+extern OptionsInstanceManager * g_pOptionsInstanceManager;
 
-KviOptionsWidgetContainer::KviOptionsWidgetContainer(QWidget * par,bool bModal)
+OptionsWidgetContainer::OptionsWidgetContainer(QWidget * par,bool bModal)
 : QWidget(par)
 {
 	m_pLayout = new QGridLayout(this);
@@ -54,25 +54,25 @@ KviOptionsWidgetContainer::KviOptionsWidgetContainer(QWidget * par,bool bModal)
 		setWindowModality(Qt::ApplicationModal);
 }
 
-KviOptionsWidgetContainer::~KviOptionsWidgetContainer()
+OptionsWidgetContainer::~OptionsWidgetContainer()
 {
 	if(m_pOptionsWidget)
 		delete m_pOptionsWidget;
 }
 
-void KviOptionsWidgetContainer::setLeftCornerWidget(QWidget * pWidget)
+void OptionsWidgetContainer::setLeftCornerWidget(QWidget * pWidget)
 {
 	if(!pWidget)
 		return;
 	m_pLayout->addWidget(pWidget,1,0);
 }
 
-void KviOptionsWidgetContainer::optionsWidgetDestroyed()
+void OptionsWidgetContainer::optionsWidgetDestroyed()
 {
 	m_pOptionsWidget = NULL;
 }
 
-void KviOptionsWidgetContainer::childEvent(QChildEvent * e)
+void OptionsWidgetContainer::childEvent(QChildEvent * e)
 {
 	// This handles reparents which may happen when
 	// options.edit and options.dialog are used without closing
@@ -89,7 +89,7 @@ void KviOptionsWidgetContainer::childEvent(QChildEvent * e)
 	QWidget::childEvent(e);
 }
 
-void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
+void OptionsWidgetContainer::setup(KviOptionsWidget * w)
 {
 	if(m_pOptionsWidget)
 		QObject::disconnect(m_pOptionsWidget,SIGNAL(destroyed()),this,SLOT(optionsWidgetDestroyed()));
@@ -115,7 +115,7 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 	m_pLayout->setRowStretch(0,1);
 	m_pLayout->setColumnStretch(0,1);
 
-	KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->metaObject()->className());
+	OptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->metaObject()->className());
 	if(e)
 	{
 		setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(e->iIcon))));
@@ -128,13 +128,13 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 		QObject::connect(m_pOptionsWidget,SIGNAL(destroyed()),this,SLOT(optionsWidgetDestroyed()));
 }
 
-void KviOptionsWidgetContainer::closeEvent(QCloseEvent *e)
+void OptionsWidgetContainer::closeEvent(QCloseEvent *e)
 {
 	e->ignore();
 	cancelClicked();
 }
 
-void KviOptionsWidgetContainer::showEvent(QShowEvent *e)
+void OptionsWidgetContainer::showEvent(QShowEvent *e)
 {
 	if(parent() == 0)
 	{
@@ -145,12 +145,12 @@ void KviOptionsWidgetContainer::showEvent(QShowEvent *e)
 	m_pCancel->setFocus();
 }
 
-void KviOptionsWidgetContainer::reject()
+void OptionsWidgetContainer::reject()
 {
 	cancelClicked();
 }
 
-void KviOptionsWidgetContainer::okClicked()
+void OptionsWidgetContainer::okClicked()
 {
 	if(m_pOptionsWidget)
 		m_pOptionsWidget->commit();
@@ -158,11 +158,11 @@ void KviOptionsWidgetContainer::okClicked()
 	delete this;
 }
 
-void KviOptionsWidgetContainer::cancelClicked()
+void OptionsWidgetContainer::cancelClicked()
 {
 	deleteLater();
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_container.moc"
+#include "m_OptionsWidgetContainer.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/container.h b/src/modules/options/OptionsWidgetContainer.h
index cc761736b..ae5b2dcc3 100644
--- a/src/modules/options/container.h
+++ b/src/modules/options/OptionsWidgetContainer.h
@@ -2,7 +2,7 @@
 #define _CONTAINER_H_
 //=============================================================================
 //
-//   File : container.h
+//   File : OptionsWidgetContainer.h
 //   Creation date : Wed Nov 21 17:09:50 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,12 +31,12 @@
 class QPushButton;
 class QGridLayout;
 
-class KviOptionsWidgetContainer : public QWidget
+class OptionsWidgetContainer : public QWidget
 {
 	Q_OBJECT
 public:
-	KviOptionsWidgetContainer(QWidget * par,bool bModal = false);
-	~KviOptionsWidgetContainer();
+	OptionsWidgetContainer(QWidget * par,bool bModal = false);
+	~OptionsWidgetContainer();
 protected:
 	KviOptionsWidget * m_pOptionsWidget;
 	QPushButton      * m_pCancel;
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
index 4dfde1e0c..2ea8ec8dc 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
@@ -2,7 +2,7 @@
 #define _OPTW_HIGHLIGHTING_CPP_
 //=============================================================================
 //
-//   File : optw_highlighting.cpp
+//   File : OptionsWidget_alertsAndHighlighting.cpp
 //   Creation date : Sat Nov  3 18:09:35 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "optw_highlighting.h"
+#include "OptionsWidget_alertsAndHighlighting.h"
 #include "KviOptions.h"
 #include "KviLocale.h"
 
@@ -34,18 +34,18 @@
 
 #include "KviTalToolTip.h"
 
-KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(QWidget * parent)
+OptionsWidget_alertsAndHighlighting::OptionsWidget_alertsAndHighlighting(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("highlighting_options_widget");
 }
 
-KviAlertHighlightingOptionsWidget::~KviAlertHighlightingOptionsWidget()
+OptionsWidget_alertsAndHighlighting::~OptionsWidget_alertsAndHighlighting()
 {
 }
 
 
-KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(QWidget * parent)
+OptionsWidget_highlighting::OptionsWidget_highlighting(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("highlighting_options_widget");
@@ -94,11 +94,11 @@ KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(QWidget * parent)
 	addRowSpacer(0,5,0,5);
 }
 
-KviHighlightingOptionsWidget::~KviHighlightingOptionsWidget()
+OptionsWidget_highlighting::~OptionsWidget_highlighting()
 {
 }
 
-void KviHighlightingOptionsWidget::commit()
+void OptionsWidget_highlighting::commit()
 {
 	KVI_OPTION_STRING(KviOption_stringWordSplitters) = m_pWordSplitterCharactersEdit->text().trimmed();
 	KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting) = m_pHighlightAllOccurencesRadioButton->isChecked();
@@ -108,7 +108,7 @@ void KviHighlightingOptionsWidget::commit()
 
 
 
-KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * parent)
+OptionsWidget_alerts::OptionsWidget_alerts(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("highlighting_options_widget");
@@ -138,13 +138,13 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * parent)
 	addRowSpacer(0,1,0,1);
 }
 
-KviAlertOptionsWidget::~KviAlertOptionsWidget()
+OptionsWidget_alerts::~OptionsWidget_alerts()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_highlighting.moc"
+#include "m_OptionsWidget_alertsAndHighlighting.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif //_OPTW_HIGHLIGHTING_CPP_
diff --git a/src/modules/options/optw_highlighting.h b/src/modules/options/OptionsWidget_alertsAndHighlighting.h
index 6b29678d4..6a9bb506b 100644
--- a/src/modules/options/optw_highlighting.h
+++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.h
@@ -2,7 +2,7 @@
 #define _OPTW_HIGHLIGHTING_H_
 //=============================================================================
 //
-//   File : optw_highlighting.h
+//   File : OptionsWidget_alertsAndHighlighting.h
 //   Creation date : Sat Nov  3 18:09:37 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,28 +31,28 @@ class QLineEdit;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAlertHighlightingOptionsWidget KVI_SMALLICON_RAW
 #define KVI_OPTIONS_WIDGET_NAME_KviAlertHighlightingOptionsWidget __tr2qs_no_lookup("Alert/Highlight")
-#define KVI_OPTIONS_WIDGET_PARENT_KviAlertHighlightingOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviAlertHighlightingOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviAlertHighlightingOptionsWidget true
 
-class KviAlertHighlightingOptionsWidget : public KviOptionsWidget
+class OptionsWidget_alertsAndHighlighting : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviAlertHighlightingOptionsWidget(QWidget * parent);
-	~KviAlertHighlightingOptionsWidget();
+	OptionsWidget_alertsAndHighlighting(QWidget * parent);
+	~OptionsWidget_alertsAndHighlighting();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviHighlightingOptionsWidget KVI_SMALLICON_RAW
 #define KVI_OPTIONS_WIDGET_NAME_KviHighlightingOptionsWidget __tr2qs_no_lookup("Highlight")
-#define KVI_OPTIONS_WIDGET_PARENT_KviHighlightingOptionsWidget KviAlertHighlightingOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviHighlightingOptionsWidget OptionsWidget_alertsAndHighlighting
 
-class KviHighlightingOptionsWidget : public KviOptionsWidget
+class OptionsWidget_highlighting : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviHighlightingOptionsWidget(QWidget * parent);
-	~KviHighlightingOptionsWidget();
+	OptionsWidget_highlighting(QWidget * parent);
+	~OptionsWidget_highlighting();
 private:
 	QRadioButton * m_pHighlightAllOccurencesRadioButton;
 	QRadioButton * m_pHighlightWholeWordsOnlyRadioButton;
@@ -66,14 +66,14 @@ protected:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAlertOptionsWidget KVI_SMALLICON_RAW
 #define KVI_OPTIONS_WIDGET_NAME_KviAlertOptionsWidget __tr2qs_no_lookup("Window List Alert")
-#define KVI_OPTIONS_WIDGET_PARENT_KviAlertOptionsWidget KviAlertHighlightingOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviAlertOptionsWidget OptionsWidget_alertsAndHighlighting
 
-class KviAlertOptionsWidget : public KviOptionsWidget
+class OptionsWidget_alerts : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviAlertOptionsWidget(QWidget * parent);
-	~KviAlertOptionsWidget();
+	OptionsWidget_alerts(QWidget * parent);
+	~OptionsWidget_alerts();
 };
 
 
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/OptionsWidget_antiSpam.cpp
index 3127c7b79..6b7648884 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/OptionsWidget_antiSpam.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_antispam.cpp
+//   File : OptionsWidget_antiSpam.cpp
 //   Creation date : Tue Oct 16 15:47:02 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_antispam.h"
+#include "OptionsWidget_antiSpam.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -30,7 +30,7 @@
 #include <QLayout>
 #include <QLabel>
 
-KviAntispamOptionsWidget::KviAntispamOptionsWidget(QWidget * parent)
+OptionsWidget_antispam::OptionsWidget_antispam(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("antispam_options_widget");
@@ -50,11 +50,11 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(2,1);
 }
 
-KviAntispamOptionsWidget::~KviAntispamOptionsWidget()
+OptionsWidget_antispam::~OptionsWidget_antispam()
 {
 }
 
-void KviAntispamOptionsWidget::reenableStuff(bool)
+void OptionsWidget_antispam::reenableStuff(bool)
 {
 	m_b3->setEnabled(m_b1->isChecked() || m_b2->isChecked());
 	m_sl->setEnabled(m_b1->isChecked() || m_b2->isChecked());
@@ -62,5 +62,5 @@ void KviAntispamOptionsWidget::reenableStuff(bool)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_antispam.moc"
+#include "m_OptionsWidget_antiSpam.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_antispam.h b/src/modules/options/OptionsWidget_antiSpam.h
index 2e0ef7808..245ce9105 100644
--- a/src/modules/options/optw_antispam.h
+++ b/src/modules/options/OptionsWidget_antiSpam.h
@@ -2,7 +2,7 @@
 #define _OPTW_ANTISPAM_H_
 //=============================================================================
 //
-//   File : optw_antispam.h
+//   File : OptionsWidget_antiSpam.h
 //   Creation date : Tue Oct 16 15:47:03 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,14 +28,14 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAntispamOptionsWidget KVI_SMALLICON_SPAM
 #define KVI_OPTIONS_WIDGET_NAME_KviAntispamOptionsWidget __tr2qs_no_lookup("Anti-spam")
-#define KVI_OPTIONS_WIDGET_PARENT_KviAntispamOptionsWidget KviProtectionOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviAntispamOptionsWidget OptionsWidget_protection
 
-class KviAntispamOptionsWidget : public KviOptionsWidget
+class OptionsWidget_antispam : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviAntispamOptionsWidget(QWidget * parent);
-	~KviAntispamOptionsWidget();
+	OptionsWidget_antispam(QWidget * parent);
+	~OptionsWidget_antispam();
 protected:
 	KviBoolSelector * m_b1;
 	KviBoolSelector * m_b2;
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/OptionsWidget_avatar.cpp
index 9e3fd0ced..6f48d5f88 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/OptionsWidget_avatar.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_avatar.cpp
+//   File : OptionsWidget_avatar.cpp
 //   Creation date : Wed Nov 19 09:25:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_avatar.h"
+#include "OptionsWidget_avatar.h"
 
 #include "KviLocale.h"
 #include "KviSelectors.h"
 #include "KviOptions.h"
 #include "KviTalToolTip.h"
 
-KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_avatar::OptionsWidget_avatar(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("avatar_advanced_options_widget");
@@ -111,11 +111,11 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
 	addRowSpacer(0,3,0,3);
 }
 
-KviAvatarAdvancedOptionsWidget::~KviAvatarAdvancedOptionsWidget()
+OptionsWidget_avatar::~OptionsWidget_avatar()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_avatar.moc"
+#include "m_OptionsWidget_avatar.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_avatar.h b/src/modules/options/OptionsWidget_avatar.h
index bfc9a8d5f..890303b2d 100644
--- a/src/modules/options/optw_avatar.h
+++ b/src/modules/options/OptionsWidget_avatar.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_avatar.cpp
+//   File : OptionsWidget_avatar.cpp
 //   Creation date : Wed Nov 19 09:25:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,16 +30,16 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAvatarAdvancedOptionsWidget KVI_SMALLICON_AVATAR
 #define KVI_OPTIONS_WIDGET_NAME_KviAvatarAdvancedOptionsWidget __tr2qs_no_lookup("Avatars")
-#define KVI_OPTIONS_WIDGET_PARENT_KviAvatarAdvancedOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviAvatarAdvancedOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviAvatarAdvancedOptionsWidget 9
 #define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_KviAvatarAdvancedOptionsWidget 2
 
-class KviAvatarAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_avatar : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviAvatarAdvancedOptionsWidget(QWidget * parent);
-	~KviAvatarAdvancedOptionsWidget();
+	OptionsWidget_avatar(QWidget * parent);
+	~OptionsWidget_avatar();
 };
 
 #endif //!_OPTW_AVATAR_H_
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/OptionsWidget_away.cpp
index a4df53821..f4f2041de 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/OptionsWidget_away.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_away.cpp
+//   File : OptionsWidget_away.cpp
 //   Creation date : Mon Oct 29 15:37:16 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_away.h"
+#include "OptionsWidget_away.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
 
-KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent)
+OptionsWidget_away::OptionsWidget_away(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("away_options_widget");
@@ -55,20 +55,20 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviAwayOptionsWidget::~KviAwayOptionsWidget()
+OptionsWidget_away::~OptionsWidget_away()
 {
 }
 
-void KviAwayOptionsWidget::enableCustomAwayText(bool)
+void OptionsWidget_away::enableCustomAwayText(bool)
 {
 	m_pCustomAwayNick->setEnabled(m_pEnableAwayNick->isChecked() && !(m_pEnableCustomAwayNick->isChecked()));
 }
 
-void KviAwayOptionsWidget::enableAwayMessage(bool)
+void OptionsWidget_away::enableAwayMessage(bool)
 {
 	m_pAwayMessage->setEnabled(m_pEnableAwayMessage->isChecked());
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_away.moc"
+#include "m_OptionsWidget_away.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_away.h b/src/modules/options/OptionsWidget_away.h
index 45ebbdcd9..c082d06de 100644
--- a/src/modules/options/optw_away.h
+++ b/src/modules/options/OptionsWidget_away.h
@@ -2,7 +2,7 @@
 #define _OPTW_AWAY_H_
 //=============================================================================
 //
-//   File : optw_away.h
+//   File : OptionsWidget_away.h
 //   Creation date : Mon Oct 29 15:37:18 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,14 +28,14 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviAwayOptionsWidget KVI_SMALLICON_AWAY
 #define KVI_OPTIONS_WIDGET_NAME_KviAwayOptionsWidget __tr2qs_no_lookup("Away")
-#define KVI_OPTIONS_WIDGET_PARENT_KviAwayOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviAwayOptionsWidget OptionsWidget_tools
 
-class KviAwayOptionsWidget : public KviOptionsWidget
+class OptionsWidget_away : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviAwayOptionsWidget(QWidget * parent);
-	~KviAwayOptionsWidget();
+	OptionsWidget_away(QWidget * parent);
+	~OptionsWidget_away();
 protected:
 	KviBoolSelector     * m_pEnableAwayMessage;
 	KviStringSelector   * m_pAwayMessage;
diff --git a/src/modules/options/optw_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp
index ed14f947e..21db51a8a 100644
--- a/src/modules/options/optw_channel.cpp
+++ b/src/modules/options/OptionsWidget_channel.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_channel.cpp
+//   File : OptionsWidget_channel.cpp
 //   Creation date : Sat Sep 27 19:30:02 2008 GMT by Elvio Basello
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,12 +22,12 @@
 //
 //=============================================================================
 //
-// This file was originally part of optw_irc.cpp
+// This file was originally part of OptionsWidget_irc.cpp
 //
 //=============================================================================
 
 
-#include "optw_channel.h"
+#include "OptionsWidget_channel.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -36,16 +36,16 @@
 
 #include <QComboBox>
 
-KviChannelOptionsWidget::KviChannelOptionsWidget(QWidget * pParent)
+OptionsWidget_channel::OptionsWidget_channel(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
 
-KviChannelOptionsWidget::~KviChannelOptionsWidget()
+OptionsWidget_channel::~OptionsWidget_channel()
 {
 }
 
-KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent)
+OptionsWidget_channelGeneral::OptionsWidget_channelGeneral(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	createLayout();
@@ -86,12 +86,12 @@ KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent
 	addRowSpacer(0,4,0,4);
 }
 
-KviChannelGeneralOptionsWidget::~KviChannelGeneralOptionsWidget()
+OptionsWidget_channelGeneral::~OptionsWidget_channelGeneral()
 {
 }
 
 
-KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pParent)
+OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	createLayout();
@@ -150,11 +150,11 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pPare
 	addRowSpacer(0,5,4,5);
 }
 
-KviChannelAdvancedOptionsWidget::~KviChannelAdvancedOptionsWidget()
+OptionsWidget_channelAdvanced::~OptionsWidget_channelAdvanced()
 {
 }
 
-void KviChannelAdvancedOptionsWidget::commit()
+void OptionsWidget_channelAdvanced::commit()
 {
 	KVI_OPTION_UINT(KviOption_uintDefaultBanType)=m_pBanTypeCombo->currentIndex();
 	if((KVI_OPTION_UINT(KviOption_uintDefaultBanType)>26)) KVI_OPTION_UINT(KviOption_uintDefaultBanType)=7;
@@ -162,5 +162,5 @@ void KviChannelAdvancedOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_channel.moc"
+#include "m_OptionsWidget_channel.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_channel.h b/src/modules/options/OptionsWidget_channel.h
index 26528526c..85107680f 100644
--- a/src/modules/options/optw_channel.h
+++ b/src/modules/options/OptionsWidget_channel.h
@@ -2,7 +2,7 @@
 #define _OPTW_CHANNEL_H_
 //=============================================================================
 //
-//   File : optw_channel.h
+//   File : OptionsWidget_channel.h
 //   Creation date : Sat Sep 27 19:30:02 2008 GMT by Elvio Basello
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 //
-// This file was originally part of optw_irc.h
+// This file was originally part of OptionsWidget_irc.h
 //
 //=============================================================================
 
@@ -34,42 +34,42 @@ class QComboBox;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviChannelOptionsWidget KVI_SMALLICON_CHANNEL
 #define KVI_OPTIONS_WIDGET_NAME_KviChannelOptionsWidget __tr2qs_no_lookup("Channel")
-#define KVI_OPTIONS_WIDGET_PARENT_KviChannelOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviChannelOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviChannelOptionsWidget true
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviChannelOptionsWidget true
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviChannelOptionsWidget 90000
 
-class KviChannelOptionsWidget : public KviOptionsWidget
+class OptionsWidget_channel : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviChannelOptionsWidget(QWidget * parent);
-	~KviChannelOptionsWidget();
+	OptionsWidget_channel(QWidget * parent);
+	~OptionsWidget_channel();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviChannelGeneralOptionsWidget KVI_SMALLICON_CHANNEL
 #define KVI_OPTIONS_WIDGET_NAME_KviChannelGeneralOptionsWidget __tr2qs_no_lookup("General")
-#define KVI_OPTIONS_WIDGET_PARENT_KviChannelGeneralOptionsWidget KviChannelOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviChannelGeneralOptionsWidget OptionsWidget_channel
 
-class KviChannelGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_channelGeneral : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviChannelGeneralOptionsWidget(QWidget * parent);
-	~KviChannelGeneralOptionsWidget();
+	OptionsWidget_channelGeneral(QWidget * parent);
+	~OptionsWidget_channelGeneral();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviChannelAdvancedOptionsWidget KVI_SMALLICON_CHANNEL
 #define KVI_OPTIONS_WIDGET_NAME_KviChannelAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
-#define KVI_OPTIONS_WIDGET_PARENT_KviChannelAdvancedOptionsWidget KviChannelOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviChannelAdvancedOptionsWidget OptionsWidget_channel
 
-class KviChannelAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_channelAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviChannelAdvancedOptionsWidget(QWidget * parent);
-	~KviChannelAdvancedOptionsWidget();
+	OptionsWidget_channelAdvanced(QWidget * parent);
+	~OptionsWidget_channelAdvanced();
 public:
 	virtual void commit();
 protected:
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/OptionsWidget_connection.cpp
index 226e4a4db..0e5f3d2cf 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/OptionsWidget_connection.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_connection.cpp
+//   File : OptionsWidget_connection.cpp
 //   Creation date : Sat Nov 24 04:25:16 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "optw_connection.h"
+#include "OptionsWidget_connection.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
@@ -33,7 +33,7 @@
 #include <QRadioButton>
 
 
-KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
+OptionsWidget_connection::OptionsWidget_connection(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("connection_options_widget");
@@ -93,12 +93,12 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
 	addRowSpacer(0,3,4,3);
 }
 
-KviConnectionOptionsWidget::~KviConnectionOptionsWidget()
+OptionsWidget_connection::~OptionsWidget_connection()
 {
 }
 
 
-KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
+OptionsWidget_connectionSsl::OptionsWidget_connectionSsl(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ssl_options_widget");
@@ -136,12 +136,12 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
 #endif
 }
 
-KviSSLOptionsWidget::~KviSSLOptionsWidget()
+OptionsWidget_connectionSsl::~OptionsWidget_connectionSsl()
 {
 }
 
 
-KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
+OptionsWidget_connectionSocket::OptionsWidget_connectionSocket(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("transport_options_widget");
@@ -182,12 +182,12 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
 	addRowSpacer(0,5,0,5);
 }
 
-KviTransportOptionsWidget::~KviTransportOptionsWidget()
+OptionsWidget_connectionSocket::~OptionsWidget_connectionSocket()
 {
 }
 
 
-KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
+OptionsWidget_identService::OptionsWidget_identService(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ident_options_widget");
@@ -266,11 +266,11 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
 	addRowSpacer(0,5,0,5);
 }
 
-KviIdentOptionsWidget::~KviIdentOptionsWidget()
+OptionsWidget_identService::~OptionsWidget_identService()
 {
 }
 
-void KviIdentOptionsWidget::commit()
+void OptionsWidget_identService::commit()
 {
 	KviOptionsWidget::commit();
 	if(m_pConsoleRadio->isChecked())
@@ -281,7 +281,7 @@ void KviIdentOptionsWidget::commit()
 		KVI_OPTION_UINT(KviOption_uintIdentdOutputMode)=KviIdentdOutputMode::Quiet;
 }
 
-void KviIdentOptionsWidget::enableIpv4InIpv6(bool)
+void OptionsWidget_identService::enableIpv4InIpv6(bool)
 {
 #ifdef COMPILE_IPV6_SUPPORT
 	m_pIpv4InIpv6->setEnabled(m_pEnableIdent->isChecked() && m_pEnableIpv6->isChecked());
@@ -289,16 +289,16 @@ void KviIdentOptionsWidget::enableIpv4InIpv6(bool)
 }
 
 
-KviConnectionAdvancedOptionsWidget::KviConnectionAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_connectionAdvanced::OptionsWidget_connectionAdvanced(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("connection_advanced_options_widget");
 }
 
-KviConnectionAdvancedOptionsWidget::~KviConnectionAdvancedOptionsWidget()
+OptionsWidget_connectionAdvanced::~OptionsWidget_connectionAdvanced()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_connection.moc"
+#include "m_OptionsWidget_connection.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_connection.h b/src/modules/options/OptionsWidget_connection.h
index 8ab8895c8..499cc300a 100644
--- a/src/modules/options/optw_connection.h
+++ b/src/modules/options/OptionsWidget_connection.h
@@ -2,7 +2,7 @@
 #define _OPTW_CONNECTION_H_
 //=============================================================================
 //
-//   File : optw_connection.h
+//   File : OptionsWidget_connection.h
 //   Creation date : Sat Nov 24 04:25:12 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -32,73 +32,73 @@ class QRadioButton;
 #define KVI_OPTIONS_WIDGET_NAME_KviConnectionOptionsWidget __tr2qs_no_lookup("Connection")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviConnectionOptionsWidget 98000
 
-class KviConnectionOptionsWidget : public KviOptionsWidget
+class OptionsWidget_connection : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviConnectionOptionsWidget(QWidget * parent);
-	~KviConnectionOptionsWidget();
+	OptionsWidget_connection(QWidget * parent);
+	~OptionsWidget_connection();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviConnectionAdvancedOptionsWidget KVI_SMALLICON_WORLD
 #define KVI_OPTIONS_WIDGET_NAME_KviConnectionAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
-#define KVI_OPTIONS_WIDGET_PARENT_KviConnectionAdvancedOptionsWidget KviConnectionOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviConnectionAdvancedOptionsWidget OptionsWidget_connection
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviConnectionAdvancedOptionsWidget true
 
-class KviConnectionAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_connectionAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviConnectionAdvancedOptionsWidget(QWidget * parent);
-	~KviConnectionAdvancedOptionsWidget();
+	OptionsWidget_connectionAdvanced(QWidget * parent);
+	~OptionsWidget_connectionAdvanced();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviSSLOptionsWidget KVI_SMALLICON_SSL
 #define KVI_OPTIONS_WIDGET_NAME_KviSSLOptionsWidget __tr2qs_no_lookup("SSL")
-#define KVI_OPTIONS_WIDGET_PARENT_KviSSLOptionsWidget KviConnectionAdvancedOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviSSLOptionsWidget OptionsWidget_connectionAdvanced
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviSSLOptionsWidget 30
 
 
 
-class KviSSLOptionsWidget : public KviOptionsWidget
+class OptionsWidget_connectionSsl : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviSSLOptionsWidget(QWidget * parent);
-	~KviSSLOptionsWidget();
+	OptionsWidget_connectionSsl(QWidget * parent);
+	~OptionsWidget_connectionSsl();
 };
 
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTransportOptionsWidget KVI_SMALLICON_SOCKETERROR
 #define KVI_OPTIONS_WIDGET_NAME_KviTransportOptionsWidget __tr2qs_no_lookup("Socket")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTransportOptionsWidget KviConnectionAdvancedOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTransportOptionsWidget OptionsWidget_connectionAdvanced
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviTransportOptionsWidget 20
 
 
-class KviTransportOptionsWidget : public KviOptionsWidget
+class OptionsWidget_connectionSocket : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTransportOptionsWidget(QWidget * parent);
-	~KviTransportOptionsWidget();
+	OptionsWidget_connectionSocket(QWidget * parent);
+	~OptionsWidget_connectionSocket();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIdentOptionsWidget KVI_SMALLICON_IDENT
 #define KVI_OPTIONS_WIDGET_NAME_KviIdentOptionsWidget __tr2qs_no_lookup("Ident Service")
-#define KVI_OPTIONS_WIDGET_PARENT_KviIdentOptionsWidget KviConnectionAdvancedOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIdentOptionsWidget OptionsWidget_connectionAdvanced
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentOptionsWidget 10
 
 
-class KviIdentOptionsWidget : public KviOptionsWidget
+class OptionsWidget_identService : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIdentOptionsWidget(QWidget * parent);
-	~KviIdentOptionsWidget();
+	OptionsWidget_identService(QWidget * parent);
+	~OptionsWidget_identService();
 
 	virtual void commit();
 protected:
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/OptionsWidget_ctcp.cpp
index 7c84afa92..47b381c70 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/OptionsWidget_ctcp.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_ctcp.cpp
+//   File : OptionsWidget_ctcp.cpp
 //   Creation date : Sun Dec  2 20:40:43 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_ctcp.h"
+#include "OptionsWidget_ctcp.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
 #include "KviOptions.h"
 
 
-KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent)
+OptionsWidget_ctcp::OptionsWidget_ctcp(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ctcp_options_widget");
@@ -73,11 +73,11 @@ KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent)
 }
 
 
-KviCtcpOptionsWidget::~KviCtcpOptionsWidget()
+OptionsWidget_ctcp::~OptionsWidget_ctcp()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_ctcp.moc"
+#include "m_OptionsWidget_ctcp.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ctcp.h b/src/modules/options/OptionsWidget_ctcp.h
index 34d5162aa..edb6719f5 100644
--- a/src/modules/options/optw_ctcp.h
+++ b/src/modules/options/OptionsWidget_ctcp.h
@@ -2,7 +2,7 @@
 #define _OPTW_CTCP_H_
 //=============================================================================
 //
-//   File : optw_ctcp.h
+//   File : OptionsWidget_ctcp.h
 //   Creation date : Sun Dec  2 20:40:43 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,15 +28,15 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviCtcpOptionsWidget KVI_SMALLICON_CTCPREQUESTREPLIED
 #define KVI_OPTIONS_WIDGET_NAME_KviCtcpOptionsWidget __tr2qs_no_lookup("CTCP")
-#define KVI_OPTIONS_WIDGET_PARENT_KviCtcpOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviCtcpOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviCtcpOptionsWidget 70000
 
-class KviCtcpOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ctcp : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviCtcpOptionsWidget(QWidget * parent);
-	~KviCtcpOptionsWidget();
+	OptionsWidget_ctcp(QWidget * parent);
+	~OptionsWidget_ctcp();
 };
 
 
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
index 49df21a19..0abfd22ca 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_ctcpfloodprotection.cpp
+//   File : OptionsWidget_ctcpFloodProtection.cpp
 //   Creation date : Sun Jan 21 2001 14:35:06 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_ctcpfloodprotection.h"
+#include "OptionsWidget_ctcpFloodProtection.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -73,7 +73,7 @@
 */
 
 
-KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget * parent)
+OptionsWidget_ctcpFloodProtection::OptionsWidget_ctcpFloodProtection(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ctcpfloodprotection_options_widget");
@@ -108,11 +108,11 @@ KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget
 	addRowSpacer(0,3,1,3);
 }
 
-KviCtcpFloodProtectionOptionsWidget::~KviCtcpFloodProtectionOptionsWidget()
+OptionsWidget_ctcpFloodProtection::~OptionsWidget_ctcpFloodProtection()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_ctcpfloodprotection.moc"
+#include "m_OptionsWidget_ctcpFloodProtection.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ctcpfloodprotection.h b/src/modules/options/OptionsWidget_ctcpFloodProtection.h
index 89a00868a..aef0559d3 100644
--- a/src/modules/options/optw_ctcpfloodprotection.h
+++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.h
@@ -2,7 +2,7 @@
 #define _OPTW_CTCPFLOODPROTECTION_H_
 //=============================================================================
 //
-//   File : optw_ctcpfloodprotection.h
+//   File : OptionsWidget_ctcpFloodProtection.h
 //   Creation date : Sun Jan 21 2000 14:34:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,15 +28,15 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviCtcpFloodProtectionOptionsWidget KVI_SMALLICON_CTCPREQUESTFLOOD
 #define KVI_OPTIONS_WIDGET_NAME_KviCtcpFloodProtectionOptionsWidget __tr2qs_no_lookup("Flood Protection")
-#define KVI_OPTIONS_WIDGET_PARENT_KviCtcpFloodProtectionOptionsWidget KviProtectionOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviCtcpFloodProtectionOptionsWidget OptionsWidget_protection
 
-class KviCtcpFloodProtectionOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ctcpFloodProtection : public KviOptionsWidget
 {
 	Q_OBJECT
 //	Q_CLASSINFO("help","ctcpfloodprotectionoptions")
 public:
-	KviCtcpFloodProtectionOptionsWidget(QWidget * parent);
-	~KviCtcpFloodProtectionOptionsWidget();
+	OptionsWidget_ctcpFloodProtection(QWidget * parent);
+	~OptionsWidget_ctcpFloodProtection();
 };
 
 #endif //!_OPTW_CTCPFLOODPROTECTION_H_
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index 2d44350dd..bfeede363 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_dcc.cpp
+//   File : OptionsWidget_dcc.cpp
 //   Creation date : Fri Aug 17 22:08:09 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_dcc.h"
+#include "OptionsWidget_dcc.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -30,19 +30,19 @@
 #include <QLayout>
 
 
-KviDccOptionsWidget::KviDccOptionsWidget(QWidget * pParent)
+OptionsWidget_dcc::OptionsWidget_dcc(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
 
-KviDccOptionsWidget::~KviDccOptionsWidget()
+OptionsWidget_dcc::~OptionsWidget_dcc()
 {
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(QWidget * parent)
+OptionsWidget_dccGeneral::OptionsWidget_dccGeneral(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccgeneral_options_widget");
@@ -57,13 +57,13 @@ KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(QWidget * parent)
 	addRowSpacer(0,1,0,1);
 }
 
-KviDccGeneralOptionsWidget::~KviDccGeneralOptionsWidget()
+OptionsWidget_dccGeneral::~OptionsWidget_dccGeneral()
 {
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccgeneral_options_widget");
@@ -144,7 +144,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,1,4);
 }
 
-KviDccAdvancedOptionsWidget::~KviDccAdvancedOptionsWidget()
+OptionsWidget_dccAdvanced::~OptionsWidget_dccAdvanced()
 {
 }
 
@@ -152,18 +152,18 @@ KviDccAdvancedOptionsWidget::~KviDccAdvancedOptionsWidget()
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviDccSendOptionsWidget::KviDccSendOptionsWidget(QWidget * parent)
+OptionsWidget_dccSend::OptionsWidget_dccSend(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccsend_options_widget");
 }
 
-KviDccSendOptionsWidget::~KviDccSendOptionsWidget()
+OptionsWidget_dccSend::~OptionsWidget_dccSend()
 {
 }
 
 
-KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent)
+OptionsWidget_dccSendGeneral::OptionsWidget_dccSendGeneral(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccsend_options_widget");
@@ -199,12 +199,12 @@ KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviDccSendGeneralOptionsWidget::~KviDccSendGeneralOptionsWidget()
+OptionsWidget_dccSendGeneral::~OptionsWidget_dccSendGeneral()
 {
 }
 
 
-KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccsend_advanced_options_widget");
@@ -293,18 +293,18 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren
 	addRowSpacer(0,3,0,4);
 }
 
-KviDccSendAdvancedOptionsWidget::~KviDccSendAdvancedOptionsWidget()
+OptionsWidget_dccSendAdvanced::~OptionsWidget_dccSendAdvanced()
 {
 }
 
 
-//KviDccSendOptionsWidget::enableStuff(bool)
+//OptionsWidget_dccSend::enableStuff(bool)
 //{
 //	m_pOpenMinimizedAutoAccept->setEnabled(m_pAutoAccept->isChecked() && !m_pOpenMinimized->isChecked());
 //}
 
 
-KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent)
+OptionsWidget_dccChat::OptionsWidget_dccChat(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("dccchat_options_widget");
@@ -335,12 +335,12 @@ KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviDccChatOptionsWidget::~KviDccChatOptionsWidget()
+OptionsWidget_dccChat::~OptionsWidget_dccChat()
 {
 }
 
 
-KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(QWidget *p):KviOptionsWidget(p)
+OptionsWidget_dccVoice::OptionsWidget_dccVoice(QWidget *p):KviOptionsWidget(p)
 {
 	createLayout();
 
@@ -363,10 +363,10 @@ KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(QWidget *p):KviOptionsWidget(
 	addRowSpacer(0,7,0,7);
 }
 
-KviDccVoiceOptionsWidget::~KviDccVoiceOptionsWidget()
+OptionsWidget_dccVoice::~OptionsWidget_dccVoice()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_dcc.moc"
+#include "m_OptionsWidget_dcc.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_dcc.h b/src/modules/options/OptionsWidget_dcc.h
index b88886d76..c4ed7b27e 100644
--- a/src/modules/options/optw_dcc.h
+++ b/src/modules/options/OptionsWidget_dcc.h
@@ -2,7 +2,7 @@
 #define _OPTW_DCC_H_
 //=============================================================================
 //
-//   File : optw_dcc.h
+//   File : OptionsWidget_dcc.h
 //   Creation date : Fri Aug 17 22:08:08 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,12 +31,12 @@
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviDccOptionsWidget 70000
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviDccOptionsWidget true
 
-class KviDccOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dcc : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccOptionsWidget(QWidget * parent);
-	~KviDccOptionsWidget();
+	OptionsWidget_dcc(QWidget * parent);
+	~OptionsWidget_dcc();
 };
 
 
@@ -44,27 +44,27 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviDccGeneralOptionsWidget KVI_SMALLICON_DCCERROR
 #define KVI_OPTIONS_WIDGET_NAME_KviDccGeneralOptionsWidget __tr2qs_no_lookup("General")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviDccGeneralOptionsWidget 70000
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccGeneralOptionsWidget KviDccOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccGeneralOptionsWidget OptionsWidget_dcc
 
-class KviDccGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccGeneral : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccGeneralOptionsWidget(QWidget * parent);
-	~KviDccGeneralOptionsWidget();
+	OptionsWidget_dccGeneral(QWidget * parent);
+	~OptionsWidget_dccGeneral();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccAdvancedOptionsWidget KVI_SMALLICON_DCCERROR
 #define KVI_OPTIONS_WIDGET_NAME_KviDccAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviDccAdvancedOptionsWidget 70000
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccAdvancedOptionsWidget KviDccOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccAdvancedOptionsWidget OptionsWidget_dcc
 
-class KviDccAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccAdvancedOptionsWidget(QWidget * parent);
-	~KviDccAdvancedOptionsWidget();
+	OptionsWidget_dccAdvanced(QWidget * parent);
+	~OptionsWidget_dccAdvanced();
 };
 
 
@@ -72,69 +72,69 @@ public:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccSendOptionsWidget KVI_SMALLICON_DCCMSG
 #define KVI_OPTIONS_WIDGET_NAME_KviDccSendOptionsWidget __tr2qs_no_lookup("File Transfer")
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendOptionsWidget KviDccOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendOptionsWidget OptionsWidget_dcc
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviDccSendOptionsWidget true
 
 
-class KviDccSendOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccSend : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccSendOptionsWidget(QWidget * parent);
-	~KviDccSendOptionsWidget();
+	OptionsWidget_dccSend(QWidget * parent);
+	~OptionsWidget_dccSend();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccSendGeneralOptionsWidget KVI_SMALLICON_DCCMSG
 #define KVI_OPTIONS_WIDGET_NAME_KviDccSendGeneralOptionsWidget __tr2qs_no_lookup("General")
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendGeneralOptionsWidget KviDccSendOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendGeneralOptionsWidget OptionsWidget_dccSend
 
 
-class KviDccSendGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccSendGeneral : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccSendGeneralOptionsWidget(QWidget * parent);
-	~KviDccSendGeneralOptionsWidget();
+	OptionsWidget_dccSendGeneral(QWidget * parent);
+	~OptionsWidget_dccSendGeneral();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccSendAdvancedOptionsWidget KVI_SMALLICON_DCCMSG
 #define KVI_OPTIONS_WIDGET_NAME_KviDccSendAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendAdvancedOptionsWidget KviDccSendOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccSendAdvancedOptionsWidget OptionsWidget_dccSend
 
-class KviDccSendAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccSendAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccSendAdvancedOptionsWidget(QWidget * parent);
-	~KviDccSendAdvancedOptionsWidget();
+	OptionsWidget_dccSendAdvanced(QWidget * parent);
+	~OptionsWidget_dccSendAdvanced();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccChatOptionsWidget KVI_SMALLICON_DCCREQUEST
 #define KVI_OPTIONS_WIDGET_NAME_KviDccChatOptionsWidget __tr2qs_no_lookup("Chat")
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccChatOptionsWidget KviDccOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccChatOptionsWidget OptionsWidget_dcc
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccChatOptionsWidget true
 
-class KviDccChatOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccChat : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccChatOptionsWidget(QWidget * parent);
-	~KviDccChatOptionsWidget();
+	OptionsWidget_dccChat(QWidget * parent);
+	~OptionsWidget_dccChat();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviDccVoiceOptionsWidget KVI_SMALLICON_DCCVOICE
 #define KVI_OPTIONS_WIDGET_NAME_KviDccVoiceOptionsWidget __tr2qs_no_lookup("Voice")
-#define KVI_OPTIONS_WIDGET_PARENT_KviDccVoiceOptionsWidget KviDccOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviDccVoiceOptionsWidget OptionsWidget_dcc
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviDccVoiceOptionsWidget true
 
-class KviDccVoiceOptionsWidget : public KviOptionsWidget
+class OptionsWidget_dccVoice : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviDccVoiceOptionsWidget(QWidget *);
-	~KviDccVoiceOptionsWidget();
+	OptionsWidget_dccVoice(QWidget *);
+	~OptionsWidget_dccVoice();
 };
 
 
diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/OptionsWidget_general.cpp
index fac50ac3f..b3836826a 100644
--- a/src/modules/options/optw_generalopt.cpp
+++ b/src/modules/options/OptionsWidget_general.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_generalopt.cpp
+//   File : OptionsWidget_general.cpp
 //   Creation date : Wed Nov 19 09:25:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_generalopt.h"
+#include "OptionsWidget_general.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
 #include "KviOptions.h"
 
 
-KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(QWidget * parent)
+OptionsWidget_general::OptionsWidget_general(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("generalopt_options_widget");
@@ -41,11 +41,11 @@ KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(QWidget * parent)
 	addAdvancedButton(4,1,4,1);
 }
 
-KviGeneralOptOptionsWidget::~KviGeneralOptOptionsWidget()
+OptionsWidget_general::~OptionsWidget_general()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_generalopt.moc"
+#include "m_OptionsWidget_general.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_generalopt.h b/src/modules/options/OptionsWidget_general.h
index d6ca980c1..5b24c77ee 100644
--- a/src/modules/options/optw_generalopt.h
+++ b/src/modules/options/OptionsWidget_general.h
@@ -2,7 +2,7 @@
 #define _OPTW_GENERALOPT_H_
 //=============================================================================
 //
-//   File : optw_generalopt.h
+//   File : OptionsWidget_general.h
 //   Creation date : Wed Nov 19 09:25:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,12 +30,12 @@
 #define KVI_OPTIONS_WIDGET_NAME_KviGeneralOptOptionsWidget __tr2qs_no_lookup("General options")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviGeneralOptOptionsWidget 40000
 
-class KviGeneralOptOptionsWidget : public KviOptionsWidget
+class OptionsWidget_general : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviGeneralOptOptionsWidget(QWidget * parent);
-	~KviGeneralOptOptionsWidget();
+	OptionsWidget_general(QWidget * parent);
+	~OptionsWidget_general();
 };
 
 #endif //_OPTW_CONNECTION_H_
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index 7ef4ac1d3..1066ae6c7 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -1,6 +1,6 @@
 //============================================================================
 //
-//   File : optw_identity.cpp
+//   File : OptionsWidget_identity.cpp
 //   Creation date : Tue Nov 14 2000 23:06:53 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //============================================================================
 
-#include "optw_identity.h"
+#include "OptionsWidget_identity.h"
 
 #include "kvi_defaults.h"
 #include "kvi_settings.h"
@@ -53,7 +53,7 @@
 #include <QCloseEvent>
 #include <QFileInfo>
 
-KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3)
+NickAlternativesDialog::NickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3)
 : QDialog(par)
 {
 	QGridLayout * g = new QGridLayout(this);
@@ -103,11 +103,11 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString
 	g->setColumnStretch(0,1);
 }
 
-KviNickAlternativesDialog::~KviNickAlternativesDialog()
+NickAlternativesDialog::~NickAlternativesDialog()
 {
 }
 
-void KviNickAlternativesDialog::fill(QString &n1,QString &n2,QString &n3)
+void NickAlternativesDialog::fill(QString &n1,QString &n2,QString &n3)
 {
 	n1 = m_pNickEdit1->text();
 	n2 = m_pNickEdit2->text();
@@ -115,7 +115,7 @@ void KviNickAlternativesDialog::fill(QString &n1,QString &n2,QString &n3)
 }
 
 
-KviAvatarDownloadDialog::KviAvatarDownloadDialog(QWidget * par,const QString &szUrl)
+AvatarDownloadDialog::AvatarDownloadDialog(QWidget * par,const QString &szUrl)
 : QDialog(par)
 {
 	setWindowTitle(__tr2qs_ctx("Avatar Download - KVIrc","options"));
@@ -141,12 +141,12 @@ KviAvatarDownloadDialog::KviAvatarDownloadDialog(QWidget * par,const QString &sz
 	setMinimumSize(250,120);
 }
 
-KviAvatarDownloadDialog::~KviAvatarDownloadDialog()
+AvatarDownloadDialog::~AvatarDownloadDialog()
 {
 	delete m_pRequest;
 }
 
-void KviAvatarDownloadDialog::startDownload()
+void AvatarDownloadDialog::startDownload()
 {
 	connect(m_pRequest,SIGNAL(terminated(bool)),this,SLOT(downloadTerminated(bool)));
 	connect(m_pRequest,SIGNAL(status(const QString &)),this,SLOT(downloadMessage(const QString &)));
@@ -163,20 +163,20 @@ void KviAvatarDownloadDialog::startDownload()
 	}
 }
 
-void KviAvatarDownloadDialog::closeEvent(QCloseEvent * e)
+void AvatarDownloadDialog::closeEvent(QCloseEvent * e)
 {
 	m_szErrorMessage = __tr2qs_ctx("Download aborted by user","options");
 	e->ignore();
 	reject();
 }
 
-void KviAvatarDownloadDialog::cancelClicked()
+void AvatarDownloadDialog::cancelClicked()
 {
 	m_szErrorMessage = __tr2qs_ctx("Download aborted by user","options");
 	reject();
 }
 
-void KviAvatarDownloadDialog::downloadMessage(const QString &szMsg)
+void AvatarDownloadDialog::downloadMessage(const QString &szMsg)
 {
 	if(!szMsg.isEmpty())
 	{
@@ -187,7 +187,7 @@ void KviAvatarDownloadDialog::downloadMessage(const QString &szMsg)
 	}
 }
 
-void KviAvatarDownloadDialog::downloadTerminated(bool bSuccess)
+void AvatarDownloadDialog::downloadTerminated(bool bSuccess)
 {
 	if(bSuccess)
 	{
@@ -198,7 +198,7 @@ void KviAvatarDownloadDialog::downloadTerminated(bool bSuccess)
 	}
 }
 
-KviAvatarSelectionDialog::KviAvatarSelectionDialog(QWidget * par,const QString &szInitialPath)
+AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par,const QString &szInitialPath)
 : QDialog(par)
 {
 	setWindowTitle(__tr2qs_ctx("Choose Avatar - KVIrc","options"));
@@ -244,22 +244,22 @@ KviAvatarSelectionDialog::KviAvatarSelectionDialog(QWidget * par,const QString &
 	g->setColumnStretch(0,1);
 }
 
-KviAvatarSelectionDialog::~KviAvatarSelectionDialog()
+AvatarSelectionDialog::~AvatarSelectionDialog()
 {
 }
 
-void KviAvatarSelectionDialog::okClicked()
+void AvatarSelectionDialog::okClicked()
 {
 	m_szAvatarName = m_pLineEdit->text().trimmed();
 	accept();
 }
 
-void KviAvatarSelectionDialog::cancelClicked()
+void AvatarSelectionDialog::cancelClicked()
 {
 	reject();
 }
 
-void KviAvatarSelectionDialog::chooseFileClicked()
+void AvatarSelectionDialog::chooseFileClicked()
 {
 	QString tmp;
 	if(KviFileDialog::askForOpenFileName(tmp,__tr2qs_ctx("Choose an Image File - KVIrc","options"),QString(),KVI_FILTER_IMAGE,false,true,this))
@@ -268,19 +268,19 @@ void KviAvatarSelectionDialog::chooseFileClicked()
 	}
 }
 
-void KviAvatarSelectionDialog::closeEvent(QCloseEvent * e)
+void AvatarSelectionDialog::closeEvent(QCloseEvent * e)
 {
 	e->ignore();
 	reject();
 }
 
 
-KviIdentityOptionsWidget::KviIdentityOptionsWidget(QWidget * parent)
+OptionsWidget_identity::OptionsWidget_identity(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 }
 
-KviIdentityOptionsWidget::~KviIdentityOptionsWidget()
+OptionsWidget_identity::~OptionsWidget_identity()
 {
 }
 
@@ -413,7 +413,7 @@ KviIdentityGeneralOptionsWidget::~KviIdentityGeneralOptionsWidget()
 
 void KviIdentityGeneralOptionsWidget::setNickAlternatives()
 {
-	KviNickAlternativesDialog * dlg = new KviNickAlternativesDialog(this,m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]);
+	NickAlternativesDialog * dlg = new NickAlternativesDialog(this,m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]);
 	if(dlg->exec() != QDialog::Accepted)return;
 	dlg->fill(m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]);
 	delete dlg;
@@ -454,7 +454,7 @@ void KviIdentityGeneralOptionsWidget::commit()
 }
 
 
-KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(QWidget * parent)
+OptionsWidget_identityAvatar::OptionsWidget_identityAvatar(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -503,12 +503,12 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(1,2);
 }
 
-KviIdentityAvatarOptionsWidget::~KviIdentityAvatarOptionsWidget()
+OptionsWidget_identityAvatar::~OptionsWidget_identityAvatar()
 {
 	delete m_pLocalAvatar;
 }
 
-void KviIdentityAvatarOptionsWidget::commit(void)
+void OptionsWidget_identityAvatar::commit(void)
 {
 	KviOptionsWidget::commit();
 
@@ -525,11 +525,11 @@ void KviIdentityAvatarOptionsWidget::commit(void)
 	g_pApp->setAvatarFromOptions();
 }
 
-void KviIdentityAvatarOptionsWidget::chooseAvatar()
+void OptionsWidget_identityAvatar::chooseAvatar()
 {
 	QString szCurrent = m_pAvatarNameEdit->text();
 
-	KviAvatarSelectionDialog dlg(this,szCurrent);
+	AvatarSelectionDialog dlg(this,szCurrent);
 	if(dlg.exec() != QDialog::Accepted)return;
 
 	szCurrent = dlg.avatarName();
@@ -543,7 +543,7 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 		if(!a)
 		{
 			// no cache... try downloading
-			KviAvatarDownloadDialog dlg(this,szCurrent);
+			AvatarDownloadDialog dlg(this,szCurrent);
 			if(dlg.exec() == QDialog::Accepted)
 			{
 				// downloaded!
@@ -639,7 +639,7 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 }
 
 
-KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_identityAdvanced::OptionsWidget_identityAdvanced(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	m_pISelector=0;
@@ -675,11 +675,11 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(QWidget * par
 	addRowSpacer(0,2,0,2);
 }
 
-KviIdentityAdvancedOptionsWidget::~KviIdentityAdvancedOptionsWidget()
+OptionsWidget_identityAdvanced::~OptionsWidget_identityAdvanced()
 {
 }
 
-void KviIdentityAdvancedOptionsWidget::commit()
+void OptionsWidget_identityAdvanced::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -690,7 +690,7 @@ void KviIdentityAdvancedOptionsWidget::commit()
 	KVI_OPTION_STRING(KviOption_stringDefaultUserMode) = m_sModeStr.ptr();
 }
 
-KviIdentityProfileOptionsWidget::KviIdentityProfileOptionsWidget(QWidget * pParent)
+OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	setObjectName("identity_profiles_option_widget");
@@ -766,11 +766,11 @@ KviIdentityProfileOptionsWidget::KviIdentityProfileOptionsWidget(QWidget * pPare
 	toggleControls();
 }
 
-KviIdentityProfileOptionsWidget::~KviIdentityProfileOptionsWidget()
+OptionsWidget_identityProfile::~OptionsWidget_identityProfile()
 {
 }
 
-void KviIdentityProfileOptionsWidget::toggleControls()
+void OptionsWidget_identityProfile::toggleControls()
 {
 	bool bEnabled = m_pProfilesCheck->isChecked();
 	m_pTreeWidget->setEnabled(bEnabled);
@@ -781,14 +781,14 @@ void KviIdentityProfileOptionsWidget::toggleControls()
 	m_pBtnDelProfile->setEnabled(bEnabled);
 }
 
-void KviIdentityProfileOptionsWidget::addProfileEntry()
+void OptionsWidget_identityProfile::addProfileEntry()
 {
 	KviIdentityProfile profile;
 	m_iCurrentEditedProfile = -1;
 
 	if(m_pEditor)
 		delete m_pEditor;
-	m_pEditor = new KviIdentityProfileEditor(this);
+	m_pEditor = new IdentityProfileEditor(this);
 
 	if(m_pEditor->editProfile(&profile))
 	{
@@ -802,7 +802,7 @@ void KviIdentityProfileOptionsWidget::addProfileEntry()
 	}
 }
 
-void KviIdentityProfileOptionsWidget::editProfileEntry()
+void OptionsWidget_identityProfile::editProfileEntry()
 {
 	QTreeWidgetItem * pItem = (QTreeWidgetItem *)m_pTreeWidget->currentItem();
 	if(!pItem)
@@ -821,7 +821,7 @@ void KviIdentityProfileOptionsWidget::editProfileEntry()
 
 	if(m_pEditor)
 		delete m_pEditor;
-	m_pEditor = new KviIdentityProfileEditor(this);
+	m_pEditor = new IdentityProfileEditor(this);
 	if(m_pEditor->editProfile(&profile))
 	{
 		pItem->setText(0,profile.name());
@@ -833,7 +833,7 @@ void KviIdentityProfileOptionsWidget::editProfileEntry()
 	}
 }
 
-void KviIdentityProfileOptionsWidget::editProfileOkPressed()
+void OptionsWidget_identityProfile::editProfileOkPressed()
 {
 	for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++)
 	{
@@ -847,7 +847,7 @@ void KviIdentityProfileOptionsWidget::editProfileOkPressed()
 	m_pEditor->accept();
 }
 
-void KviIdentityProfileOptionsWidget::delProfileEntry()
+void OptionsWidget_identityProfile::delProfileEntry()
 {
 	QTreeWidgetItem * pItem = (QTreeWidgetItem *)m_pTreeWidget->currentItem();
 	if(!pItem)
@@ -857,7 +857,7 @@ void KviIdentityProfileOptionsWidget::delProfileEntry()
 	toggleControls();
 }
 
-void KviIdentityProfileOptionsWidget::commit()
+void OptionsWidget_identityProfile::commit()
 {
 	KviIdentityProfileSet::instance()->clear();
 	if(m_pTreeWidget->topLevelItemCount())
@@ -883,7 +883,7 @@ void KviIdentityProfileOptionsWidget::commit()
 	KviOptionsWidget::commit();
 }
 
-KviIdentityProfileEditor::KviIdentityProfileEditor(QWidget * pParent)
+IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent)
 : QDialog(pParent)
 {
 	setObjectName("identity_profile_editor");
@@ -963,11 +963,11 @@ KviIdentityProfileEditor::KviIdentityProfileEditor(QWidget * pParent)
 	setMinimumWidth(250);
 }
 
-KviIdentityProfileEditor::~KviIdentityProfileEditor()
+IdentityProfileEditor::~IdentityProfileEditor()
 {
 }
 
-bool KviIdentityProfileEditor::editProfile(KviIdentityProfile * pProfile)
+bool IdentityProfileEditor::editProfile(KviIdentityProfile * pProfile)
 {
 	// Fill in the fields
 	m_pNameEdit->setText(pProfile->name().isEmpty() ? QString(m_szName) : pProfile->name());
@@ -994,7 +994,7 @@ bool KviIdentityProfileEditor::editProfile(KviIdentityProfile * pProfile)
 	return true;
 }
 
-void KviIdentityProfileEditor::toggleButton(const QString & szText)
+void IdentityProfileEditor::toggleButton(const QString & szText)
 {
 	bool bEnabled = true;
 
@@ -1013,5 +1013,5 @@ void KviIdentityProfileEditor::toggleButton(const QString & szText)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_identity.moc"
+#include "m_OptionsWidget_identity.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_identity.h b/src/modules/options/OptionsWidget_identity.h
index ff4013e46..58628e415 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/OptionsWidget_identity.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_identity.h
+//   File : OptionsWidget_identity.h
 //   Creation date : Tue Nov 14 2000 23:06:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -42,13 +42,13 @@ class KviHttpRequest;
 class QTreeWidget;
 class KviIdentityProfile;
 
-class KviNickAlternativesDialog : public QDialog
+class NickAlternativesDialog : public QDialog
 {
 	friend class KviIdentityGeneralOptionsWidget;
 	Q_OBJECT
 protected:
-	KviNickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3);
-	~KviNickAlternativesDialog();
+	NickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3);
+	~NickAlternativesDialog();
 protected:
 	QLineEdit * m_pNickEdit1;
 	QLineEdit * m_pNickEdit2;
@@ -57,13 +57,13 @@ protected:
 	void fill(QString &n1,QString &n2,QString &n3);
 };
 
-class KviAvatarSelectionDialog : public QDialog
+class AvatarSelectionDialog : public QDialog
 {
-	friend class KviIdentityAvatarOptionsWidget;
+	friend class OptionsWidget_identityAvatar;
 	Q_OBJECT
 public:
-	KviAvatarSelectionDialog(QWidget * par,const QString &szInitialPath);
-	~KviAvatarSelectionDialog();
+	AvatarSelectionDialog(QWidget * par,const QString &szInitialPath);
+	~AvatarSelectionDialog();
 protected:
 	QLineEdit   * m_pLineEdit;
 	QString       m_szAvatarName;
@@ -77,13 +77,13 @@ protected slots:
 };
 
 
-class KviAvatarDownloadDialog : public QDialog
+class AvatarDownloadDialog : public QDialog
 {
-	friend class KviIdentityAvatarOptionsWidget;
+	friend class OptionsWidget_identityAvatar;
 	Q_OBJECT
 public:
-	KviAvatarDownloadDialog(QWidget * par,const QString &szUrl);
-	~KviAvatarDownloadDialog();
+	AvatarDownloadDialog(QWidget * par,const QString &szUrl);
+	~AvatarDownloadDialog();
 protected:
 	KviHttpRequest * m_pRequest;
 	QLabel         * m_pOutput;
@@ -104,13 +104,13 @@ protected slots:
 
 
 
-class KviIdentityProfileEditor : public QDialog
+class IdentityProfileEditor : public QDialog
 {
-	friend class KviIdentityProfileOptionsWidget;
+	friend class OptionsWidget_identityProfile;
 	Q_OBJECT
 public:
-	KviIdentityProfileEditor(QWidget * pParent);
-	~KviIdentityProfileEditor();
+	IdentityProfileEditor(QWidget * pParent);
+	~IdentityProfileEditor();
 protected:
 	QString       m_szName;
 	QString       m_szNetwork;
@@ -139,12 +139,12 @@ protected slots:
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityOptionsWidget true
 
 
-class KviIdentityOptionsWidget : public KviOptionsWidget
+class OptionsWidget_identity : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIdentityOptionsWidget(QWidget * parent);
-	~KviIdentityOptionsWidget();
+	OptionsWidget_identity(QWidget * parent);
+	~OptionsWidget_identity();
 };
 
 
@@ -152,7 +152,7 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget KVI_SMALLICON_WHO
 #define KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget __tr2qs_no_lookup("General")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget 90000
-#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityGeneralOptionsWidget KviIdentityOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityGeneralOptionsWidget OptionsWidget_identity
 
 
 class KviIdentityGeneralOptionsWidget : public KviOptionsWidget
@@ -176,15 +176,15 @@ protected:
 #define KVI_OPTIONS_WIDGET_ICON_KviIdentityAvatarOptionsWidget KVI_SMALLICON_AVATAR
 #define KVI_OPTIONS_WIDGET_NAME_KviIdentityAvatarOptionsWidget __tr2qs_no_lookup("Avatar")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityAvatarOptionsWidget 80000
-#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityAvatarOptionsWidget KviIdentityOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityAvatarOptionsWidget OptionsWidget_identity
 
 
-class KviIdentityAvatarOptionsWidget : public KviOptionsWidget
+class OptionsWidget_identityAvatar : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIdentityAvatarOptionsWidget(QWidget * pParent);
-	~KviIdentityAvatarOptionsWidget();
+	OptionsWidget_identityAvatar(QWidget * pParent);
+	~OptionsWidget_identityAvatar();
 protected:
 	QCheckBox        * m_pUseAvatarCheck;
 	QLineEdit        * m_pAvatarNameEdit;
@@ -201,15 +201,15 @@ protected:
 #define KVI_OPTIONS_WIDGET_ICON_KviIdentityAdvancedOptionsWidget KVI_SMALLICON_SPY
 #define KVI_OPTIONS_WIDGET_NAME_KviIdentityAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityAdvancedOptionsWidget 70000
-#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityAdvancedOptionsWidget KviIdentityOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityAdvancedOptionsWidget OptionsWidget_identity
 
 
-class KviIdentityAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_identityAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIdentityAdvancedOptionsWidget(QWidget * pParent);
-	~KviIdentityAdvancedOptionsWidget();
+	OptionsWidget_identityAdvanced(QWidget * pParent);
+	~OptionsWidget_identityAdvanced();
 protected:
 	bool               m_bI;
 	bool               m_bW;
@@ -226,21 +226,21 @@ protected:
 #define KVI_OPTIONS_WIDGET_ICON_KviIdentityProfileOptionsWidget KVI_SMALLICON_REGUSERS
 #define KVI_OPTIONS_WIDGET_NAME_KviIdentityProfileOptionsWidget __tr2qs_no_lookup("Profiles")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityProfileOptionsWidget 60000
-#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityProfileOptionsWidget KviIdentityOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIdentityProfileOptionsWidget OptionsWidget_identity
 
-class KviIdentityProfileOptionsWidget : public KviOptionsWidget
+class OptionsWidget_identityProfile : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIdentityProfileOptionsWidget(QWidget * pParent);
-	~KviIdentityProfileOptionsWidget();
+	OptionsWidget_identityProfile(QWidget * pParent);
+	~OptionsWidget_identityProfile();
 protected:
 	QTreeWidget              * m_pTreeWidget;
 	QCheckBox                * m_pProfilesCheck;
 	QPushButton              * m_pBtnAddProfile;
 	QPushButton              * m_pBtnEditProfile;
 	QPushButton              * m_pBtnDelProfile;
-	KviIdentityProfileEditor * m_pEditor;
+	IdentityProfileEditor * m_pEditor;
 	int                        m_iCurrentEditedProfile;
 public:
 	virtual void commit();
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/OptionsWidget_ignore.cpp
index a08396634..c8cfc6999 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/OptionsWidget_ignore.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_ignore.h
+//   File : OptionsWidget_ignore.h
 //   Creation date : Thu Feb 12 15:11:29 2002 GMT by Juanjo �lvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "optw_ignore.h"
+#include "OptionsWidget_ignore.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -31,7 +31,7 @@
 #include <QLayout>
 
 
-KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(QWidget * parent)
+OptionsWidget_ignore::OptionsWidget_ignore(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ignore_options_widget");
@@ -50,11 +50,11 @@ KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(QWidget * parent)
 	addRowSpacer(0,2,0,2);
 }
 
-KviIgnoreOptionsWidget::~KviIgnoreOptionsWidget()
+OptionsWidget_ignore::~OptionsWidget_ignore()
 {
 }
 
-void KviIgnoreOptionsWidget::enableVerbose(bool)
+void OptionsWidget_ignore::enableVerbose(bool)
 {
 	m_pVerboseIgnore->setEnabled(m_pIgnorePrivmsg->isChecked() || m_pIgnoreNotice->isChecked());
 }
@@ -62,5 +62,5 @@ void KviIgnoreOptionsWidget::enableVerbose(bool)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_ignore.moc"
+#include "m_OptionsWidget_ignore.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ignore.h b/src/modules/options/OptionsWidget_ignore.h
index 65f1c3d3e..210be1b48 100644
--- a/src/modules/options/optw_ignore.h
+++ b/src/modules/options/OptionsWidget_ignore.h
@@ -2,7 +2,7 @@
 #define _OPTW_IGNORE_H_
 //=============================================================================
 //
-//   File : optw_ignore.h
+//   File : OptionsWidget_ignore.h
 //   Creation date : Thu Feb 12 15:11:30 2002 GMT by Juanjo �lvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,15 +30,15 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIgnoreOptionsWidget KVI_SMALLICON_IGNORE
 #define KVI_OPTIONS_WIDGET_NAME_KviIgnoreOptionsWidget __tr2qs_no_lookup("Ignore")
-#define KVI_OPTIONS_WIDGET_PARENT_KviIgnoreOptionsWidget KviProtectionOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIgnoreOptionsWidget OptionsWidget_protection
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviIgnoreOptionsWidget __tr2qs_no_lookup("protection")
 
-class KviIgnoreOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ignore : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIgnoreOptionsWidget(QWidget * parent);
-	~KviIgnoreOptionsWidget();
+	OptionsWidget_ignore(QWidget * parent);
+	~OptionsWidget_ignore();
 public:
 	KviBoolSelector * m_pIgnorePrivmsg;
 	KviBoolSelector * m_pIgnoreNotice;
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/OptionsWidget_input.cpp
index 2df8bbd23..78bdc3cce 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/OptionsWidget_input.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_input.cpp
+//   File : OptionsWidget_input.cpp
 //   Creation date : Sat Aug 11 2001 04:25:52 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_input.h"
+#include "OptionsWidget_input.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
 
-KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
+OptionsWidget_inputLook::OptionsWidget_inputLook(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("inputlook_options_widget");
@@ -97,11 +97,11 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(7,1);
 }
 
-KviInputLookOptionsWidget::~KviInputLookOptionsWidget()
+OptionsWidget_inputLook::~OptionsWidget_inputLook()
 {
 }
 
-void KviInputLookOptionsWidget::commit()
+void OptionsWidget_inputLook::commit()
 {
 	int iFlags=0;
 	switch(m_pHorizontalAlign->currentIndex())
@@ -134,7 +134,7 @@ void KviInputLookOptionsWidget::commit()
 }
 
 
-KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(QWidget * parent)
+OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("ircviewfeatures_options_widget");
@@ -158,10 +158,10 @@ KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(QWidget * parent)
 	addRowSpacer(0,6,0,6);
 }
 
-KviInputFeaturesOptionsWidget::~KviInputFeaturesOptionsWidget()
+OptionsWidget_inputFeatures::~OptionsWidget_inputFeatures()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_input.moc"
+#include "m_OptionsWidget_input.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_input.h b/src/modules/options/OptionsWidget_input.h
index 71f65549b..ac92c2952 100644
--- a/src/modules/options/optw_input.h
+++ b/src/modules/options/OptionsWidget_input.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_input.h
+//   File : OptionsWidget_input.h
 //   Creation date : Sat Aug 11 2001 04:25:01 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -34,29 +34,29 @@
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviInputLookOptionsWidget __tr2qs_no_lookup("theme,colors,text")
 #define KVI_OPTIONS_WIDGET_GROUP_KviInputLookOptionsWidget "theme"
 
-class KviInputLookOptionsWidget : public KviOptionsWidget
+class OptionsWidget_inputLook : public KviOptionsWidget
 {
 	Q_OBJECT
 private:
 	QComboBox* m_pHorizontalAlign;
 	QComboBox* m_pVerticalAlign;
 public:
-	KviInputLookOptionsWidget(QWidget * parent);
-	~KviInputLookOptionsWidget();
+	OptionsWidget_inputLook(QWidget * parent);
+	~OptionsWidget_inputLook();
 
 	virtual void commit();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviInputFeaturesOptionsWidget KVI_SMALLICON_INPUT
 #define KVI_OPTIONS_WIDGET_NAME_KviInputFeaturesOptionsWidget __tr2qs_no_lookup("Input")
-#define KVI_OPTIONS_WIDGET_PARENT_KviInputFeaturesOptionsWidget KviInterfaceFeaturesOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviInputFeaturesOptionsWidget OptionsWidget_interfaceFeatures
 
-class KviInputFeaturesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_inputFeatures : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviInputFeaturesOptionsWidget(QWidget * parent);
-	~KviInputFeaturesOptionsWidget();
+	OptionsWidget_inputFeatures(QWidget * parent);
+	~OptionsWidget_inputFeatures();
 };
 
 #endif //!_OPTW_INPUT_H_
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
index e7884c502..ef3f1c2ed 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_interfacefeatures.cpp
+//   File : OptionsWidget_interfaceFeatures.cpp
 //   Creation date : Sat Jun 2 2001 14:52:53 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_interfacefeatures.h"
+#include "OptionsWidget_interfaceFeatures.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -35,7 +35,7 @@
 #include <string.h>
 
 
-KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * parent)
+OptionsWidget_interfaceFeatures::OptionsWidget_interfaceFeatures(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("interfacefeatures_options_widget");
@@ -64,11 +64,11 @@ KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * p
 	addRowSpacer(0,7,0,7);
 }
 
-KviInterfaceFeaturesOptionsWidget::~KviInterfaceFeaturesOptionsWidget()
+OptionsWidget_interfaceFeatures::~OptionsWidget_interfaceFeatures()
 {
 }
 
-void KviInterfaceFeaturesOptionsWidget::commit()
+void OptionsWidget_interfaceFeatures::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -87,5 +87,5 @@ void KviInterfaceFeaturesOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_interfacefeatures.moc"
+#include "m_OptionsWidget_interfaceFeatures.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_interfacefeatures.h b/src/modules/options/OptionsWidget_interfaceFeatures.h
index 5d8ab1293..b4e29ebf3 100644
--- a/src/modules/options/optw_interfacefeatures.h
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_interfacefeatures.h
+//   File : OptionsWidget_interfaceFeatures.h
 //   Creation date : Sat Jun 2 2001 14:50:01 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -32,12 +32,12 @@
 #define KVI_OPTIONS_WIDGET_NAME_KviInterfaceFeaturesOptionsWidget __tr2qs_no_lookup("Interface")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviInterfaceFeaturesOptionsWidget 50000
 
-class KviInterfaceFeaturesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_interfaceFeatures : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviInterfaceFeaturesOptionsWidget(QWidget * parent);
-	~KviInterfaceFeaturesOptionsWidget();
+	OptionsWidget_interfaceFeatures(QWidget * parent);
+	~OptionsWidget_interfaceFeatures();
 protected:
 	QCheckBox * m_pDisableSplash;
 public:
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/OptionsWidget_irc.cpp
index 342a31181..675eb43db 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/OptionsWidget_irc.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_irc.cpp
+//   File : OptionsWidget_irc.cpp
 //   Creation date : Sun Dec  2 18:59:48 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_irc.h"
+#include "OptionsWidget_irc.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
@@ -30,18 +30,18 @@
 #include "KviIrcMask.h"
 
 
-KviIrcOptionsWidget::KviIrcOptionsWidget(QWidget * parent)
+OptionsWidget_irc::OptionsWidget_irc(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("irc_options_widget");
 }
 
-KviIrcOptionsWidget::~KviIrcOptionsWidget()
+OptionsWidget_irc::~OptionsWidget_irc()
 {
 }
 
 
-KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(QWidget * parent)
+OptionsWidget_ircGeneral::OptionsWidget_ircGeneral(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("irc_options_widget");
@@ -56,12 +56,12 @@ KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(QWidget * parent)
 	addRowSpacer(0,2,0,2);
 }
 
-KviIrcGeneralOptionsWidget::~KviIrcGeneralOptionsWidget()
+OptionsWidget_ircGeneral::~OptionsWidget_ircGeneral()
 {
 }
 
 
-KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(QWidget * parent)
+OptionsWidget_ircAdvanced::OptionsWidget_ircAdvanced(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("irc_advanced_options_widget");
@@ -79,10 +79,10 @@ KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviIrcAdvancedOptionsWidget::~KviIrcAdvancedOptionsWidget()
+OptionsWidget_ircAdvanced::~OptionsWidget_ircAdvanced()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_irc.moc"
+#include "m_OptionsWidget_irc.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_irc.h b/src/modules/options/OptionsWidget_irc.h
index 907f8e911..c481265fa 100644
--- a/src/modules/options/optw_irc.h
+++ b/src/modules/options/OptionsWidget_irc.h
@@ -2,7 +2,7 @@
 #define _OPTW_IRC_H_
 //=============================================================================
 //
-//   File : optw_irc.h
+//   File : OptionsWidget_irc.h
 //   Creation date : Sun Dec  2 18:59:49 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,39 +31,39 @@
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcOptionsWidget 80000
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviIrcOptionsWidget true
 
-class KviIrcOptionsWidget : public KviOptionsWidget
+class OptionsWidget_irc : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcOptionsWidget(QWidget * parent);
-	~KviIrcOptionsWidget();
+	OptionsWidget_irc(QWidget * parent);
+	~OptionsWidget_irc();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcGeneralOptionsWidget KVI_SMALLICON_IRC
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcGeneralOptionsWidget __tr2qs_no_lookup("General")
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcGeneralOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcGeneralOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcGeneralOptionsWidget 80000
 
-class KviIrcGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircGeneral : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcGeneralOptionsWidget(QWidget * parent);
-	~KviIrcGeneralOptionsWidget();
+	OptionsWidget_ircGeneral(QWidget * parent);
+	~OptionsWidget_ircGeneral();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcAdvancedOptionsWidget KVI_SMALLICON_IRC
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcAdvancedOptionsWidget __tr2qs_no_lookup("Advanced")
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcAdvancedOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcAdvancedOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcAdvancedOptionsWidget 50000
 
-class KviIrcAdvancedOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircAdvanced : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcAdvancedOptionsWidget(QWidget * parent);
-	~KviIrcAdvancedOptionsWidget();
+	OptionsWidget_ircAdvanced(QWidget * parent);
+	~OptionsWidget_ircAdvanced();
 };
 
 #endif //_OPTW_IRC_H_
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp
index a02657cbc..aac001856 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/OptionsWidget_ircOutput.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_ircoutput.cpp
+//   File : OptionsWidget_ircOutput.cpp
 //   Creation date : Wed Nov 15 2000 11:45:06 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_ircoutput.h"
+#include "OptionsWidget_ircOutput.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -34,7 +34,7 @@
 #include <QLabel>
 
 
-KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * pParent)
+OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	setObjectName("ircoutput_options_widget");
@@ -88,11 +88,11 @@ KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * pParent)
 //	}
 }
 
-KviIrcOutputOptionsWidget::~KviIrcOutputOptionsWidget()
+OptionsWidget_ircOutput::~OptionsWidget_ircOutput()
 {
 }
 
-void KviIrcOutputOptionsWidget::commit()
+void OptionsWidget_ircOutput::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -107,5 +107,5 @@ void KviIrcOutputOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_ircoutput.moc"
+#include "m_OptionsWidget_ircOutput.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ircoutput.h b/src/modules/options/OptionsWidget_ircOutput.h
index b878c709c..55e61ffdd 100644
--- a/src/modules/options/optw_ircoutput.h
+++ b/src/modules/options/OptionsWidget_ircOutput.h
@@ -2,7 +2,7 @@
 #define _OPTW_IRCOUTPUT_H_
 //=============================================================================
 //
-//   File : optw_ircoutput.h
+//   File : OptionsWidget_ircOutput.h
 //   Creation date : Wed Nov 15 2000 11:47:51 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,16 +31,16 @@ class QComboBox;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcOutputOptionsWidget KVI_SMALLICON_RAW
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcOutputOptionsWidget __tr2qs_no_lookup("Verbosity And Output")
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcOutputOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcOutputOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcOutputOptionsWidget __tr2qs_no_lookup("debug")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcOutputOptionsWidget 75000
 
-class KviIrcOutputOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircOutput : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcOutputOptionsWidget(QWidget * parent);
-	~KviIrcOutputOptionsWidget();
+	OptionsWidget_ircOutput(QWidget * parent);
+	~OptionsWidget_ircOutput();
 protected:
 	QComboBox * m_pVerbosityCombo;
 	QComboBox * m_pDatetimeCombo;
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/OptionsWidget_ircView.cpp
index 34ef1e2e8..ffa514817 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/OptionsWidget_ircView.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_ircview.cpp
+//   File : OptionsWidget_ircView.cpp
 //   Creation date : Sat Aug 11 2001 03:29:52 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,25 +23,25 @@
 //
 //=============================================================================
 
-#include "optw_ircview.h"
+#include "OptionsWidget_ircView.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
 
-KviIrcViewThemeOptionsWidget::KviIrcViewThemeOptionsWidget(QWidget * pParent)
+OptionsWidget_ircViewTheme::OptionsWidget_ircViewTheme(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
 
-KviIrcViewThemeOptionsWidget::~KviIrcViewThemeOptionsWidget()
+OptionsWidget_ircViewTheme::~OptionsWidget_ircViewTheme()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
+OptionsWidget_ircViewLook::OptionsWidget_ircViewLook(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -104,11 +104,11 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(2,1);
 }
 
-KviIrcViewLookOptionsWidget::~KviIrcViewLookOptionsWidget()
+OptionsWidget_ircViewLook::~OptionsWidget_ircViewLook()
 {
 }
 
-void KviIrcViewLookOptionsWidget::commit()
+void OptionsWidget_ircViewLook::commit()
 {
 	int iFlags=0;
 	switch(m_pHorizontalAlign->currentIndex())
@@ -142,7 +142,7 @@ void KviIrcViewLookOptionsWidget::commit()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(QWidget * parent)
+OptionsWidget_ircViewFeatures::OptionsWidget_ircViewFeatures(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -171,13 +171,13 @@ KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(QWidget * paren
 	addRowSpacer(0,14,0,14);
 }
 
-KviIrcViewFeaturesOptionsWidget::~KviIrcViewFeaturesOptionsWidget()
+OptionsWidget_ircViewFeatures::~OptionsWidget_ircViewFeatures()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewMarkerOptionsWidget::KviIrcViewMarkerOptionsWidget(QWidget * parent)
+OptionsWidget_ircViewMarker::OptionsWidget_ircViewMarker(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -206,16 +206,16 @@ KviIrcViewMarkerOptionsWidget::KviIrcViewMarkerOptionsWidget(QWidget * parent)
 	m_pMarkerStyle->setCurrentIndex(uStyle < 5 ? uStyle : 0);
 }
 
-KviIrcViewMarkerOptionsWidget::~KviIrcViewMarkerOptionsWidget()
+OptionsWidget_ircViewMarker::~OptionsWidget_ircViewMarker()
 {
 }
 
-void KviIrcViewMarkerOptionsWidget::commit()
+void OptionsWidget_ircViewMarker::commit()
 {
 	KVI_OPTION_UINT(KviOption_uintIrcViewMarkerStyle)=m_pMarkerStyle->currentIndex();
 	KviOptionsWidget::commit();
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_ircview.moc"
+#include "m_OptionsWidget_ircView.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_ircview.h b/src/modules/options/OptionsWidget_ircView.h
index 4fda1ad31..eb6c43cbc 100644
--- a/src/modules/options/optw_ircview.h
+++ b/src/modules/options/OptionsWidget_ircView.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_ircview.h
+//   File : OptionsWidget_ircView.h
 //   Creation date : Sat Aug 11 2001 03:28:19 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -38,30 +38,30 @@
 #define KVI_OPTIONS_WIDGET_GROUP_KviIrcViewThemeOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviIrcViewThemeOptionsWidget true
 
-class KviIrcViewThemeOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircViewTheme : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcViewThemeOptionsWidget(QWidget * pParent);
-	~KviIrcViewThemeOptionsWidget();
+	OptionsWidget_ircViewTheme(QWidget * pParent);
+	~OptionsWidget_ircViewTheme();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcViewLookOptionsWidget KVI_SMALLICON_IRCVIEW
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcViewLookOptionsWidget __tr2qs_no_lookup("Look")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcViewLookOptionsWidget __tr2qs_no_lookup("theme,colors,output")
 #define KVI_OPTIONS_WIDGET_GROUP_KviIrcViewLookOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewLookOptionsWidget KviIrcViewThemeOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewLookOptionsWidget OptionsWidget_ircViewTheme
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewLookOptionsWidget 30
 
-class KviIrcViewLookOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircViewLook : public KviOptionsWidget
 {
 	Q_OBJECT
 private:
 	QComboBox * m_pHorizontalAlign;
 	QComboBox * m_pVerticalAlign;
 public:
-	KviIrcViewLookOptionsWidget(QWidget * parent);
-	~KviIrcViewLookOptionsWidget();
+	OptionsWidget_ircViewLook(QWidget * parent);
+	~OptionsWidget_ircViewLook();
 public:
 	virtual void commit();
 };
@@ -69,29 +69,29 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcViewFeaturesOptionsWidget KVI_SMALLICON_IRCVIEW
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcViewFeaturesOptionsWidget __tr2qs_no_lookup("Features")
 #define KVI_OPTIONS_WIDGET_GROUP_KviIrcViewFeaturesOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewFeaturesOptionsWidget KviIrcViewThemeOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewFeaturesOptionsWidget OptionsWidget_ircViewTheme
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewFeaturesOptionsWidget 20
 
-class KviIrcViewFeaturesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircViewFeatures : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcViewFeaturesOptionsWidget(QWidget * parent);
-	~KviIrcViewFeaturesOptionsWidget();
+	OptionsWidget_ircViewFeatures(QWidget * parent);
+	~OptionsWidget_ircViewFeatures();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcViewMarkerOptionsWidget KVI_SMALLICON_IRCVIEW
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcViewMarkerOptionsWidget __tr2qs_no_lookup("Marker")
 #define KVI_OPTIONS_WIDGET_GROUP_KviIrcViewMarkerOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewMarkerOptionsWidget KviIrcViewThemeOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviIrcViewMarkerOptionsWidget OptionsWidget_ircViewTheme
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcViewMarkerOptionsWidget 10
 
-class KviIrcViewMarkerOptionsWidget : public KviOptionsWidget
+class OptionsWidget_ircViewMarker : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcViewMarkerOptionsWidget(QWidget * pParent);
-	~KviIrcViewMarkerOptionsWidget();
+	OptionsWidget_ircViewMarker(QWidget * pParent);
+	~OptionsWidget_ircViewMarker();
 	virtual void commit();
 private:
 	QComboBox * m_pMarkerStyle;
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/OptionsWidget_lag.cpp
index fe7dbe617..0e2e763fd 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/OptionsWidget_lag.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_lag.cpp
+//   File : OptionsWidget_lag.cpp
 //   Creation date : Wed Cct 16 10:45:54 CEST 2002 by Juanjo �lvarez (juanjux@yahoo.es)
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "optw_lag.h"
+#include "OptionsWidget_lag.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -32,7 +32,7 @@
 #include <QLayout>
 
 
-KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent)
+OptionsWidget_lag::OptionsWidget_lag(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("lag_options_widget");
@@ -70,11 +70,11 @@ KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent)
 
 }
 
-KviLagOptionsWidget::~KviLagOptionsWidget()
+OptionsWidget_lag::~OptionsWidget_lag()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_lag.moc"
+#include "m_OptionsWidget_lag.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_lag.h b/src/modules/options/OptionsWidget_lag.h
index 7577d69c6..88164c54f 100644
--- a/src/modules/options/optw_lag.h
+++ b/src/modules/options/OptionsWidget_lag.h
@@ -2,7 +2,7 @@
 #define _OPTW_LAG_H_
 //=============================================================================
 //
-//   File : optw_lag.h
+//   File : OptionsWidget_lag.h
 //   Creation date : Wed Cct 16 10:45:54 CEST 2002 by Juanjo Álvarez (juanjux@yahoo.es)
 //
 //   This file is part of the KVIrc irc client distribution
@@ -29,15 +29,15 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviLagOptionsWidget KVI_SMALLICON_STATS
 #define KVI_OPTIONS_WIDGET_NAME_KviLagOptionsWidget __tr2qs_no_lookup("Lag")
-#define KVI_OPTIONS_WIDGET_PARENT_KviLagOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviLagOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviLagOptionsWidget __tr2qs_no_lookup("time,ping")
 
-class KviLagOptionsWidget : public KviOptionsWidget
+class OptionsWidget_lag : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviLagOptionsWidget(QWidget * parent);
-	~KviLagOptionsWidget();
+	OptionsWidget_lag(QWidget * parent);
+	~OptionsWidget_lag();
 };
 
 #endif //_OPTW_LAG_H_
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp
index 57788bd16..01ae94c14 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/OptionsWidget_logging.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_logging.cpp
+//   File : OptionsWidget_logging.cpp
 //   Creation date : Mon Oct 29 15:37:16 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_logging.h"
+#include "OptionsWidget_logging.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -30,7 +30,7 @@
 #include <QLayout>
 
 
-KviLoggingOptionsWidget::KviLoggingOptionsWidget(QWidget * parent)
+OptionsWidget_logging::OptionsWidget_logging(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("logging_options_widget");
@@ -59,12 +59,12 @@ KviLoggingOptionsWidget::KviLoggingOptionsWidget(QWidget * parent)
 	addRowSpacer(0,6,0,6);
 }
 
-KviLoggingOptionsWidget::~KviLoggingOptionsWidget()
+OptionsWidget_logging::~OptionsWidget_logging()
 {
 }
 
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_logging.moc"
+#include "m_OptionsWidget_logging.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_logging.h b/src/modules/options/OptionsWidget_logging.h
index 22a13bab6..518634b91 100644
--- a/src/modules/options/optw_logging.h
+++ b/src/modules/options/OptionsWidget_logging.h
@@ -2,7 +2,7 @@
 #define _OPTW_LOGGING_H_
 //=============================================================================
 //
-//   File : optw_logging.h
+//   File : OptionsWidget_logging.h
 //   Creation date : Mon Oct 29 15:37:18 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -29,16 +29,16 @@
 #define KVI_OPTIONS_WIDGET_ICON_KviLoggingOptionsWidget KVI_SMALLICON_LOG
 #define KVI_OPTIONS_WIDGET_NAME_KviLoggingOptionsWidget __tr2qs_no_lookup("Logging")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviLoggingOptionsWidget __tr2qs_no_lookup("save,output")
-#define KVI_OPTIONS_WIDGET_PARENT_KviLoggingOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviLoggingOptionsWidget OptionsWidget_tools
 
-//noway #define KVI_OPTIONS_WIDGET_NO_PARENT_KviLoggingOptionsWidget KviIrcOptionsWidget
+//noway #define KVI_OPTIONS_WIDGET_NO_PARENT_KviLoggingOptionsWidget OptionsWidget_irc
 
-class KviLoggingOptionsWidget : public KviOptionsWidget
+class OptionsWidget_logging : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviLoggingOptionsWidget(QWidget * parent);
-	~KviLoggingOptionsWidget();
+	OptionsWidget_logging(QWidget * parent);
+	~OptionsWidget_logging();
 };
 
 #endif //_OPTW_LOGGING_H_
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp
index afe5fa4b6..71df63df1 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/OptionsWidget_mediaTypes.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_mediatypes.cpp
+//   File : OptionsWidget_mediaTypes.cpp
 //   Creation date : Sat Jan 20 2001 16:14:53 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_mediatypes.h"
+#include "OptionsWidget_mediaTypes.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -46,17 +46,17 @@ static void copyMediaType(KviMediaType * dst,const KviMediaType * src)
 	dst->szIcon                  = src->szIcon;
 }
 
-KviMediaTypeTreeWidgetItem::KviMediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t)
+MediaTypeTreeWidgetItem::MediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t)
 : QTreeWidgetItem(w)
 {
 	copyData(t);
 }
 
-KviMediaTypeTreeWidgetItem::~KviMediaTypeTreeWidgetItem()
+MediaTypeTreeWidgetItem::~MediaTypeTreeWidgetItem()
 {
 }
 
-void KviMediaTypeTreeWidgetItem::copyData(KviMediaType * t)
+void MediaTypeTreeWidgetItem::copyData(KviMediaType * t)
 {
 	copyMediaType(&m_data,t);
 	setText(0,m_data.szFileMask.ptr());
@@ -64,7 +64,7 @@ void KviMediaTypeTreeWidgetItem::copyData(KviMediaType * t)
 	setText(2,m_data.szDescription.ptr());
 }
 
-KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
+OptionsWidget_mediaTypes::OptionsWidget_mediaTypes(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("mediatypes_options_widget");
@@ -149,24 +149,24 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
 	fillTreeWidget();
 }
 
-KviMediaTypesOptionsWidget::~KviMediaTypesOptionsWidget()
+OptionsWidget_mediaTypes::~OptionsWidget_mediaTypes()
 {
 }
 
-void KviMediaTypesOptionsWidget::fillTreeWidget()
+void OptionsWidget_mediaTypes::fillTreeWidget()
 {
 	m_pTreeWidget->clear();
 	g_pMediaManager->lock();
 	KviPointerList<KviMediaType> * l = g_pMediaManager->mediaTypeList();
 
 	for(KviMediaType * t = l->first();t;t = l->next())
-		new KviMediaTypeTreeWidgetItem(m_pTreeWidget,t);
+		new MediaTypeTreeWidgetItem(m_pTreeWidget,t);
 
 	g_pMediaManager->unlock();
 	enableOrDisable();
 }
 
-void KviMediaTypesOptionsWidget::saveLastItem()
+void OptionsWidget_mediaTypes::saveLastItem()
 {
 	if(m_pLastItem)
 	{
@@ -186,7 +186,7 @@ void KviMediaTypesOptionsWidget::saveLastItem()
 	}
 }
 
-void KviMediaTypesOptionsWidget::enableOrDisable()
+void OptionsWidget_mediaTypes::enableOrDisable()
 {
 	m_pDescription->setEnabled(m_pLastItem);
 	m_pIanaType->setEnabled(m_pLastItem);
@@ -199,7 +199,7 @@ void KviMediaTypesOptionsWidget::enableOrDisable()
 	m_pIcon->setEnabled(m_pLastItem);
 }
 
-void KviMediaTypesOptionsWidget::setLineEdits()
+void OptionsWidget_mediaTypes::setLineEdits()
 {
 	m_pDescription->setText(m_pLastItem ? m_pLastItem->mydata()->szDescription.ptr() : "");
 	m_pIanaType->setText(m_pLastItem ? m_pLastItem->mydata()->szIanaType.ptr() : "");
@@ -211,10 +211,10 @@ void KviMediaTypesOptionsWidget::setLineEdits()
 	m_pIcon->setText(m_pLastItem ? m_pLastItem->mydata()->szIcon.ptr() : "");
 }
 
-void KviMediaTypesOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
+void OptionsWidget_mediaTypes::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
 {
 	saveLastItem();
-	m_pLastItem = (KviMediaTypeTreeWidgetItem *)it;
+	m_pLastItem = (MediaTypeTreeWidgetItem *)it;
 	if(it)
 	{
 		if(!it->isSelected())it->setSelected(true);
@@ -223,43 +223,43 @@ void KviMediaTypesOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWid
 	enableOrDisable();
 }
 
-void KviMediaTypesOptionsWidget::newMediaType()
+void OptionsWidget_mediaTypes::newMediaType()
 {
 	KviMediaType empty;
 	empty.szDescription = __tr2qs_ctx("New Media Type","options");
-	KviMediaTypeTreeWidgetItem * it = new KviMediaTypeTreeWidgetItem(m_pTreeWidget,&empty);
+	MediaTypeTreeWidgetItem * it = new MediaTypeTreeWidgetItem(m_pTreeWidget,&empty);
 	m_pTreeWidget->setCurrentItem(it);
 	it->setSelected(true);
 }
 
-void KviMediaTypesOptionsWidget::delMediaType()
+void OptionsWidget_mediaTypes::delMediaType()
 {
 	if(m_pLastItem)
 	{
-		KviMediaTypeTreeWidgetItem * it = m_pLastItem;
+		MediaTypeTreeWidgetItem * it = m_pLastItem;
 		m_pLastItem = 0;
 		delete it;
 	}
 }
 
-void KviMediaTypesOptionsWidget::commit()
+void OptionsWidget_mediaTypes::commit()
 {
 	saveLastItem();
-	KviMediaTypeTreeWidgetItem * it;// = (KviMediaTypeTreeWidgetItem *)m_pTreeWidget->firstChild();
+	MediaTypeTreeWidgetItem * it;// = (MediaTypeTreeWidgetItem *)m_pTreeWidget->firstChild();
 	g_pMediaManager->lock();
 	g_pMediaManager->clear();
 	//while(it)
 	for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		it=(KviMediaTypeTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		it=(MediaTypeTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		KviMediaType * t = new KviMediaType;
 		copyMediaType(t,it->mydata());
 		g_pMediaManager->insertMediaType(t);
-	//	it = (KviMediaTypeTreeWidgetItem *)it->nextSibling();
+	//	it = (MediaTypeTreeWidgetItem *)it->nextSibling();
 	}
 	g_pMediaManager->unlock();
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_mediatypes.moc"
+#include "m_OptionsWidget_mediaTypes.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/OptionsWidget_mediaTypes.h
index 08a96fabd..46e2bee20 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/OptionsWidget_mediaTypes.h
@@ -2,7 +2,7 @@
 #define _OPTW_MEDIATYPES_H_
 //=============================================================================
 //
-//   File : optw_mediatypes.h
+//   File : OptionsWidget_mediaTypes.h
 //   Creation date : Sat Jan 20 2001 16:12:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -32,11 +32,11 @@
 #include <QPushButton>
 
 
-class KviMediaTypeTreeWidgetItem : public QTreeWidgetItem
+class MediaTypeTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviMediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t);
-	~KviMediaTypeTreeWidgetItem();
+	MediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t);
+	~MediaTypeTreeWidgetItem();
 private:
 	KviMediaType m_data;
 public:
@@ -46,17 +46,17 @@ public:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviMediaTypesOptionsWidget KVI_SMALLICON_FILE
 #define KVI_OPTIONS_WIDGET_NAME_KviMediaTypesOptionsWidget __tr2qs_no_lookup("Media Types")
-#define KVI_OPTIONS_WIDGET_PARENT_KviMediaTypesOptionsWidget KviGeneralOptOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviMediaTypesOptionsWidget OptionsWidget_general
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviMediaTypesOptionsWidget __tr2qs_no_lookup("file,audio,video,programs")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviMediaTypesOptionsWidget 60000
 //#define KVI_OPTIONS_WIDGET_HIDDEN_KviMediaTypesOptionsWidget true
 
-class KviMediaTypesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_mediaTypes : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviMediaTypesOptionsWidget(QWidget * parent);
-	~KviMediaTypesOptionsWidget();
+	OptionsWidget_mediaTypes(QWidget * parent);
+	~OptionsWidget_mediaTypes();
 private:
 	QTreeWidget  * m_pTreeWidget;
 	QLineEdit   * m_pDescription;
@@ -68,7 +68,7 @@ private:
 	QLineEdit   * m_pRemoteExecCommandline;
 	QLineEdit   * m_pIcon;
 	QPushButton * m_pDelete;
-	KviMediaTypeTreeWidgetItem * m_pLastItem;
+	MediaTypeTreeWidgetItem * m_pLastItem;
 private:
 	void fillTreeWidget();
 	void saveLastItem();
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/OptionsWidget_message.cpp
index 576bde517..6dd563142 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_messages.cpp
+//   File : OptionsWidget_message.cpp
 //   Creation date : Sat Aug 11 2001 18:12:00 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 
 #define _WANT_OPTION_FLAGS_
 
-#include "optw_messages.h"
+#include "OptionsWidget_message.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -51,18 +51,18 @@
 #endif
 
 
-KviMessageOptionsWidget::KviMessageOptionsWidget(QWidget * pParent)
+OptionsWidget_message::OptionsWidget_message(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
 
-KviMessageOptionsWidget::~KviMessageOptionsWidget()
+OptionsWidget_message::~OptionsWidget_message()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
+OptionsWidget_privmsg::OptionsWidget_privmsg(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("privmsg_options_widget");
@@ -119,16 +119,16 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
 	addRowSpacer(0,3,0,3);
 }
 
-void KviPrivmsgOptionsWidget::enableDisableSmartColorSelector(bool)
+void OptionsWidget_privmsg::enableDisableSmartColorSelector(bool)
 {
 	m_pSmartColorSelector->setEnabled(m_pUseSmartColorSelector->isChecked() && m_pUseSmartColorSelector->isChecked());
 }
 
-KviPrivmsgOptionsWidget::~KviPrivmsgOptionsWidget()
+OptionsWidget_privmsg::~OptionsWidget_privmsg()
 {
 }
 
-KviTimestampOptionsWidget::KviTimestampOptionsWidget(QWidget * pParent)
+OptionsWidget_timestamp::OptionsWidget_timestamp(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 	createLayout();
@@ -155,18 +155,18 @@ KviTimestampOptionsWidget::KviTimestampOptionsWidget(QWidget * pParent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviTimestampOptionsWidget::~KviTimestampOptionsWidget()
+OptionsWidget_timestamp::~OptionsWidget_timestamp()
 {
 }
 
-void KviTimestampOptionsWidget::enableDisableTimestampSelector(bool)
+void OptionsWidget_timestamp::enableDisableTimestampSelector(bool)
 {
 	m_pTimestampColorSelector->setEnabled(m_pUseTimestampSelector->isChecked() && m_pSpecialTimestampColorSelector->isChecked());
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(QWidget * parent)
+OptionsWidget_standardColors::OptionsWidget_standardColors(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("stdcolors");
@@ -194,11 +194,11 @@ KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(4,1);
 }
 
-KviStandardColorsOptionsWidget::~KviStandardColorsOptionsWidget()
+OptionsWidget_standardColors::~OptionsWidget_standardColors()
 {
 }
 
-KviMessageListWidgetItem::KviMessageListWidgetItem(KviMessageListWidget* l,int optId)
+MessageListWidgetItem::MessageListWidgetItem(MessageListWidget* l,int optId)
 : KviTalListWidgetItem(l)
 {
 	m_iOptId = optId;
@@ -215,16 +215,16 @@ KviMessageListWidgetItem::KviMessageListWidgetItem(KviMessageListWidget* l,int o
 	setIcon(*(g_pIconManager->getSmallIcon(m_pMsgType->pixId())));
 }
 
-KviMessageListWidgetItem::~KviMessageListWidgetItem()
+MessageListWidgetItem::~MessageListWidgetItem()
 {
 	delete m_pMsgType;
 }
 
-void KviMessageListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const
+void MessageListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const
 {
 
 	const KviTalListWidget *tb = (const KviTalListWidget *)parent();
-	KviMessageListWidgetItem *it = static_cast<KviMessageListWidgetItem*>(index.internalPointer());
+	MessageListWidgetItem *it = static_cast<MessageListWidgetItem*>(index.internalPointer());
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	if(KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency) && g_pApp->supportsCompositing())
 	{
@@ -287,7 +287,7 @@ void KviMessageListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionVie
 }
 
 
-KviMessageColorListWidgetItem::KviMessageColorListWidgetItem(KviTalListWidget * b,int idx)
+MessageColorListWidgetItem::MessageColorListWidgetItem(KviTalListWidget * b,int idx)
 : KviTalListWidgetText(b,QString())
 {
 
@@ -302,18 +302,18 @@ KviMessageColorListWidgetItem::KviMessageColorListWidgetItem(KviTalListWidget *
 	}
 }
 
-KviMessageColorListWidgetItem::~KviMessageColorListWidgetItem()
+MessageColorListWidgetItem::~MessageColorListWidgetItem()
 {
 }
 
-void KviMessageColorListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const
+void MessageColorListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const
 {
 
 	if(opt.state & QStyle::State_Selected)
 	{
 		QColor clr;
 		const KviTalListWidget *lb = (const KviTalListWidget *)parent();
-		KviMessageColorListWidgetItem *it = static_cast<KviMessageColorListWidgetItem*>(index.internalPointer());
+		MessageColorListWidgetItem *it = static_cast<MessageColorListWidgetItem*>(index.internalPointer());
 
 		if((it->clrIdx() >= 0) && (it->clrIdx() <= 15))
 		{
@@ -337,7 +337,7 @@ void KviMessageColorListWidgetItemDelegate::paint(QPainter * p, const QStyleOpti
 	}
 }
 
-KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
+OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("messages");
@@ -347,8 +347,8 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	int i;
 	m_pLastItem = 0;
 
-	m_pListView = new KviMessageListWidget(this);
-	m_pListViewItemDelegate = new KviMessageListWidgetItemDelegate(m_pListView);
+	m_pListView = new MessageListWidget(this);
+	m_pListViewItemDelegate = new MessageListWidgetItemDelegate(m_pListView);
 	m_pListView->setItemDelegate(m_pListViewItemDelegate);
 	m_pListView->setSelectionMode(QAbstractItemView::SingleSelection);
 	m_pListView->setFont(KVI_OPTION_FONT(KviOption_fontIrcView));
@@ -363,25 +363,25 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 
 	m_pBackListWidget = new KviTalListWidget(box);
 	m_pBackListWidget->setMaximumWidth(150);
-	m_pBackListWidgetDelegate = new KviMessageColorListWidgetItemDelegate(m_pBackListWidget);
+	m_pBackListWidgetDelegate = new MessageColorListWidgetItemDelegate(m_pBackListWidget);
 	m_pBackListWidget->setItemDelegate(m_pBackListWidgetDelegate);
 
-	m_pBackItems[16] = new KviMessageColorListWidgetItem(m_pBackListWidget,KviMircCntrl::Transparent);
+	m_pBackItems[16] = new MessageColorListWidgetItem(m_pBackListWidget,KviMircCntrl::Transparent);
 	for(i=0;i<16;i++)
 	{
-		m_pBackItems[i] = new KviMessageColorListWidgetItem(m_pBackListWidget,i);
+		m_pBackItems[i] = new MessageColorListWidgetItem(m_pBackListWidget,i);
 	}
 
 	new QLabel(__tr2qs_ctx("Foreground:","options"),box);
 
 	m_pForeListWidget = new KviTalListWidget(box);
 	m_pForeListWidget->setMaximumWidth(150);
-	m_pForeListWidgetDelegate = new KviMessageColorListWidgetItemDelegate(m_pForeListWidget);
+	m_pForeListWidgetDelegate = new MessageColorListWidgetItemDelegate(m_pForeListWidget);
 	m_pForeListWidget->setItemDelegate(m_pForeListWidgetDelegate);
 
 	for(i=0;i<16;i++)
 	{
-		m_pForeItems[i] = new KviMessageColorListWidgetItem(m_pForeListWidget,i);
+		m_pForeItems[i] = new MessageColorListWidgetItem(m_pForeListWidget,i);
 	}
 
 	new QLabel(__tr2qs_ctx("Alert level:","options"),box);
@@ -416,7 +416,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 
 
 	for(i=0;i<KVI_NUM_MSGTYPE_OPTIONS;i++)
-		new KviMessageListWidgetItem(m_pListView,i);
+		new MessageListWidgetItem(m_pListView,i);
 
 	layout()->setRowStretch(0,1);
 	layout()->setColumnStretch(0,1);
@@ -428,7 +428,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	itemChanged();
 }
 
-KviMessageColorsOptionsWidget::~KviMessageColorsOptionsWidget()
+OptionsWidget_messageColors::~OptionsWidget_messageColors()
 {
 	int i;
 	for(i=15;i>=0;i--)
@@ -449,7 +449,7 @@ KviMessageColorsOptionsWidget::~KviMessageColorsOptionsWidget()
 	delete m_pIconPopup;
 }
 
-void KviMessageColorsOptionsWidget::newIconSelected(int iconId)
+void OptionsWidget_messageColors::newIconSelected(int iconId)
 {
 	if(!m_pLastItem)return;
 	if(iconId >= KVI_NUM_SMALL_ICONS)return;
@@ -458,7 +458,7 @@ void KviMessageColorsOptionsWidget::newIconSelected(int iconId)
 	m_pListView->repaint(m_pListView->visualItemRect(m_pLastItem));
 }
 
-void KviMessageColorsOptionsWidget::saveLastItem()
+void OptionsWidget_messageColors::saveLastItem()
 {
 	if(!m_pLastItem)return;
 
@@ -466,14 +466,14 @@ void KviMessageColorsOptionsWidget::saveLastItem()
 	if(curIt >= 0) //quite useless
 	{
 		//qDebug("Setting fore %d",curIt);
-		KviMessageColorListWidgetItem * fore = (KviMessageColorListWidgetItem *)m_pForeListWidget->item(curIt);
+		MessageColorListWidgetItem * fore = (MessageColorListWidgetItem *)m_pForeListWidget->item(curIt);
 		//qDebug("And is %d",fore);
 		if(fore)m_pLastItem->msgType()->setFore(fore->m_iClrIdx);
 	}
 	curIt = m_pBackListWidget->currentRow();
 	if(curIt >= 0) //quite useless
 	{
-		KviMessageColorListWidgetItem * back = (KviMessageColorListWidgetItem *)m_pBackListWidget->item(curIt);
+		MessageColorListWidgetItem * back = (MessageColorListWidgetItem *)m_pBackListWidget->item(curIt);
 		if(back)m_pLastItem->msgType()->setBack(back->m_iClrIdx);
 	}
 	m_pLastItem->msgType()->enableLogging(m_pEnableLogging->isChecked());
@@ -484,7 +484,7 @@ void KviMessageColorsOptionsWidget::saveLastItem()
 	m_pListView->repaint(m_pListView->visualItemRect(m_pLastItem));
 }
 
-void KviMessageColorsOptionsWidget::itemChanged()
+void OptionsWidget_messageColors::itemChanged()
 {
 	KviTalListWidgetItem * it = (KviTalListWidgetItem*)m_pListView->currentItem();
 	//qDebug("Item changed","options");
@@ -500,8 +500,8 @@ void KviMessageColorsOptionsWidget::itemChanged()
 
 	if(it)
 	{
-		int back = ((KviMessageListWidgetItem *)it)->msgType()->back();
-		int fore = ((KviMessageListWidgetItem *)it)->msgType()->fore();
+		int back = ((MessageListWidgetItem *)it)->msgType()->back();
+		int fore = ((MessageListWidgetItem *)it)->msgType()->fore();
 		if(fore >= 0 && fore <= 15)
 		{
 			m_pForeListWidget->setCurrentItem(m_pForeItems[fore]);
@@ -512,26 +512,26 @@ void KviMessageColorsOptionsWidget::itemChanged()
 		} else {
 			m_pBackListWidget->setCurrentItem(m_pBackItems[16]);
 		}
-		m_pLevelListWidget->setCurrentRow(((KviMessageListWidgetItem *)it)->msgType()->level());
-		m_pEnableLogging->setChecked(((KviMessageListWidgetItem *)it)->msgType()->logEnabled());
-		m_pIconButton->setIcon(*(g_pIconManager->getSmallIcon(((KviMessageListWidgetItem *)it)->msgType()->pixId())));
+		m_pLevelListWidget->setCurrentRow(((MessageListWidgetItem *)it)->msgType()->level());
+		m_pEnableLogging->setChecked(((MessageListWidgetItem *)it)->msgType()->logEnabled());
+		m_pIconButton->setIcon(*(g_pIconManager->getSmallIcon(((MessageListWidgetItem *)it)->msgType()->pixId())));
 	}
 
 	// Ok...can save from now on
-	m_pLastItem = (KviMessageListWidgetItem *)it;
+	m_pLastItem = (MessageListWidgetItem *)it;
 }
 
-void KviMessageColorsOptionsWidget::colorChanged()
+void OptionsWidget_messageColors::colorChanged()
 {
 	if(m_pLastItem)saveLastItem();
 }
 
-void KviMessageColorsOptionsWidget::iconButtonClicked()
+void OptionsWidget_messageColors::iconButtonClicked()
 {
 	m_pIconPopup->popup(QCursor::pos());
 }
 
-void KviMessageColorsOptionsWidget::commit()
+void OptionsWidget_messageColors::commit()
 {
 	saveLastItem();
 
@@ -540,14 +540,14 @@ void KviMessageColorsOptionsWidget::commit()
 	int count = m_pListView->count();
 	for(int i=0; i<count;i++)
 	{
-		KviMessageListWidgetItem* it = (KviMessageListWidgetItem *)m_pListView->item(i);
+		MessageListWidgetItem* it = (MessageListWidgetItem *)m_pListView->item(i);
 		KVI_OPTION_MSGTYPE(it->optionId()) = *(it->msgType());
 	}
 
 	KviOptionsWidget::commit();
 }
 
-void KviMessageColorsOptionsWidget::save()
+void OptionsWidget_messageColors::save()
 {
 	QString szName;
 	QString szInit;
@@ -567,7 +567,7 @@ void KviMessageColorsOptionsWidget::save()
 		int count = m_pListView->count();
 		for(int i=0; i<count;i++)
 		{
-			KviMessageListWidgetItem* it = (KviMessageListWidgetItem *)m_pListView->item(i);
+			MessageListWidgetItem* it = (MessageListWidgetItem *)m_pListView->item(i);
 
 			tmp.sprintf("Fore%d",it->optionId());
 			cfg.writeEntry(tmp.ptr(),it->msgType()->fore());
@@ -586,7 +586,7 @@ void KviMessageColorsOptionsWidget::save()
 
 //#include <errno.h>
 
-void KviMessageColorsOptionsWidget::load()
+void OptionsWidget_messageColors::load()
 {
 
 	QString szName;
@@ -621,7 +621,7 @@ void KviMessageColorsOptionsWidget::load()
 		int count = m_pListView->count();
 		for(int i=0; i<count;i++)
 		{
-			KviMessageListWidgetItem* it = (KviMessageListWidgetItem *)m_pListView->item(i);
+			MessageListWidgetItem* it = (MessageListWidgetItem *)m_pListView->item(i);
 
 			tmp.sprintf("Fore%d",it->optionId());
 			int fore = cfg.readIntEntry(tmp,it->msgType()->fore());
@@ -652,5 +652,5 @@ void KviMessageColorsOptionsWidget::load()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_messages.moc"
+#include "m_OptionsWidget_message.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/OptionsWidget_message.h
index da6923f66..d62541901 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/OptionsWidget_message.h
@@ -2,7 +2,7 @@
 #define _OPTW_MESSAGES_H_
 //=============================================================================
 //
-//   File : optw_messages.h
+//   File : OptionsWidget_message.h
 //   Creation date : Sat Aug 11 2001 18:11:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -41,28 +41,28 @@
 #define KVI_OPTIONS_WIDGET_GROUP_KviMessageOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviMessageOptionsWidget true
 
-class KviMessageOptionsWidget : public KviOptionsWidget
+class OptionsWidget_message : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviMessageOptionsWidget(QWidget * pParent);
-	~KviMessageOptionsWidget();
+	OptionsWidget_message(QWidget * pParent);
+	~OptionsWidget_message();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviPrivmsgOptionsWidget KVI_SMALLICON_RAW
 #define KVI_OPTIONS_WIDGET_NAME_KviPrivmsgOptionsWidget __tr2qs_no_lookup("Message Style")
-#define KVI_OPTIONS_WIDGET_PARENT_KviPrivmsgOptionsWidget KviMessageOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviPrivmsgOptionsWidget OptionsWidget_message
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviPrivmsgOptionsWidget 40
 #define KVI_OPTIONS_WIDGET_GROUP_KviPrivmsgOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviPrivmsgOptionsWidget __tr2qs_no_lookup("theme,privmsg,output,format")
 
-class KviPrivmsgOptionsWidget : public KviOptionsWidget
+class OptionsWidget_privmsg : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviPrivmsgOptionsWidget(QWidget * parent);
-	~KviPrivmsgOptionsWidget();
+	OptionsWidget_privmsg(QWidget * parent);
+	~OptionsWidget_privmsg();
 public:
 	KviBoolSelector * m_pUseSmartColorSelector;
 	KviBoolSelector * m_pSpecialSmartColorSelector;
@@ -73,17 +73,17 @@ protected slots:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTimestampOptionsWidget KVI_SMALLICON_TIME
 #define KVI_OPTIONS_WIDGET_NAME_KviTimestampOptionsWidget __tr2qs_no_lookup("Timestamp")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTimestampOptionsWidget KviMessageOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTimestampOptionsWidget OptionsWidget_message
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviTimestampOptionsWidget 20
 #define KVI_OPTIONS_WIDGET_GROUP_KviTimestampOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTimestampOptionsWidget __tr2qs_no_lookup("time,timestamp")
 
-class KviTimestampOptionsWidget : public KviOptionsWidget
+class OptionsWidget_timestamp : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTimestampOptionsWidget(QWidget * parent);
-	~KviTimestampOptionsWidget();
+	OptionsWidget_timestamp(QWidget * parent);
+	~OptionsWidget_timestamp();
 public:
 	KviBoolSelector * m_pUseTimestampSelector;
 	KviBoolSelector * m_pSpecialTimestampColorSelector;
@@ -96,32 +96,32 @@ protected slots:
 #define KVI_OPTIONS_WIDGET_NAME_KviMessageColorsOptionsWidget __tr2qs_no_lookup("Message Colors")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviMessageColorsOptionsWidget __tr2qs_no_lookup("theme,colors,messages,output")
 #define KVI_OPTIONS_WIDGET_GROUP_KviMessageColorsOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviMessageColorsOptionsWidget KviMessageOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviMessageColorsOptionsWidget OptionsWidget_message
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviMessageColorsOptionsWidget 30
 
-class KviMessageListWidget : public KviTalListWidget
+class MessageListWidget : public KviTalListWidget
 {
 	Q_OBJECT
 public:
-	KviMessageListWidget(QWidget * par): KviTalListWidget(par) {};
-	~KviMessageListWidget() {};
+	MessageListWidget(QWidget * par): KviTalListWidget(par) {};
+	~MessageListWidget() {};
 };
 
-class  KviMessageListWidgetItemDelegate : public QItemDelegate
+class  MessageListWidgetItemDelegate : public QItemDelegate
 {
 	Q_OBJECT
 public:
-	KviMessageListWidgetItemDelegate(QAbstractItemView * pWidget=0)
+	MessageListWidgetItemDelegate(QAbstractItemView * pWidget=0)
 		: QItemDelegate(pWidget) {};
-	~KviMessageListWidgetItemDelegate(){};
+	~MessageListWidgetItemDelegate(){};
 	void paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const;
 };
 
-class KviMessageListWidgetItem : public KviTalListWidgetItem
+class MessageListWidgetItem : public KviTalListWidgetItem
 {
 public:
-	KviMessageListWidgetItem(KviMessageListWidget* l,int optId);
-	~KviMessageListWidgetItem();
+	MessageListWidgetItem(MessageListWidget* l,int optId);
+	~MessageListWidgetItem();
 private:
 	int          m_iOptId;
 	KviMessageTypeSettings * m_pMsgType;
@@ -131,45 +131,45 @@ public:
 };
 
 
-class KviMessageColorListWidgetItem : public KviTalListWidgetText
+class MessageColorListWidgetItem : public KviTalListWidgetText
 {
 public:
-	KviMessageColorListWidgetItem(KviTalListWidget * b, int idx);
-	~KviMessageColorListWidgetItem();
+	MessageColorListWidgetItem(KviTalListWidget * b, int idx);
+	~MessageColorListWidgetItem();
 public:
 	int m_iClrIdx;
 public:
 	inline int clrIdx() { return m_iClrIdx; };
 };
 
-class  KviMessageColorListWidgetItemDelegate : public QItemDelegate
+class  MessageColorListWidgetItemDelegate : public QItemDelegate
 {
 	Q_OBJECT
 public:
-	KviMessageColorListWidgetItemDelegate(QAbstractItemView * pWidget=0)
+	MessageColorListWidgetItemDelegate(QAbstractItemView * pWidget=0)
 		: QItemDelegate(pWidget) {};
-	~KviMessageColorListWidgetItemDelegate(){};
+	~MessageColorListWidgetItemDelegate(){};
 	void paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const;
 };
 
-class KviMessageColorsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_messageColors : public KviOptionsWidget
 {
 	Q_OBJECT
 	friend class KviTalListWidget;
 public:
-	KviMessageColorsOptionsWidget(QWidget * parent);
-	~KviMessageColorsOptionsWidget();
+	OptionsWidget_messageColors(QWidget * parent);
+	~OptionsWidget_messageColors();
 public:
-	KviMessageListWidget         * m_pListView;
-	KviMessageListWidgetItemDelegate * m_pListViewItemDelegate;
+	MessageListWidget         * m_pListView;
+	MessageListWidgetItemDelegate * m_pListViewItemDelegate;
 	KviTalListWidget           * m_pForeListWidget;
-	KviMessageColorListWidgetItemDelegate * m_pForeListWidgetDelegate;
+	MessageColorListWidgetItemDelegate * m_pForeListWidgetDelegate;
 	KviTalListWidget           * m_pBackListWidget;
-	KviMessageColorListWidgetItemDelegate * m_pBackListWidgetDelegate;
+	MessageColorListWidgetItemDelegate * m_pBackListWidgetDelegate;
 	KviTalListWidget           * m_pLevelListWidget;
-	KviMessageColorListWidgetItem * m_pForeItems[16];
-	KviMessageColorListWidgetItem * m_pBackItems[17];
-	KviMessageListWidgetItem     * m_pLastItem;
+	MessageColorListWidgetItem * m_pForeItems[16];
+	MessageColorListWidgetItem * m_pBackItems[17];
+	MessageListWidgetItem     * m_pLastItem;
 	QCheckBox                  * m_pEnableLogging;
 	QToolButton                * m_pIconButton;
 	KviTalPopupMenu            * m_pIconPopup;
@@ -190,14 +190,14 @@ protected slots:
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviStandardColorsOptionsWidget __tr2qs_no_lookup("theme,colors,messages,output")
 #define KVI_OPTIONS_WIDGET_GROUP_KviStandardColorsOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviStandardColorsOptionsWidget 20
-#define KVI_OPTIONS_WIDGET_PARENT_KviStandardColorsOptionsWidget KviMessageOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviStandardColorsOptionsWidget OptionsWidget_message
 
-class KviStandardColorsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_standardColors : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviStandardColorsOptionsWidget(QWidget * par);
-	~KviStandardColorsOptionsWidget();
+	OptionsWidget_standardColors(QWidget * par);
+	~OptionsWidget_standardColors();
 
 };
 
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp
index 5fd45bc36..d6da68662 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/OptionsWidget_nickserv.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_nickserv.cpp
+//   File : OptionsWidget_nickserv.cpp
 //   Creation date : Fri Aug 10 2001 03:38:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_nickserv.h"
+#include "OptionsWidget_nickserv.h"
 
 #include "KviQString.h"
 #include "KviOptions.h"
@@ -42,7 +42,7 @@
 extern KVIRC_API KviNickServRuleSet * g_pNickServRuleSet;
 
 
-KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskField)
+NickServRuleEditor::NickServRuleEditor(QWidget * par,bool bUseServerMaskField)
 : QDialog(par)
 {
 	setWindowTitle(__tr2qs_ctx("NickServ Authentication Rule","options"));
@@ -142,11 +142,11 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi
 	setMinimumWidth(250);
 }
 
-KviNickServRuleEditor::~KviNickServRuleEditor()
+NickServRuleEditor::~NickServRuleEditor()
 {
 }
 
-bool KviNickServRuleEditor::validate()
+bool NickServRuleEditor::validate()
 {
 	QString s = m_pRegisteredNickEdit->text();
 
@@ -192,13 +192,13 @@ bool KviNickServRuleEditor::validate()
 	return true;
 }
 
-void KviNickServRuleEditor::okPressed()
+void NickServRuleEditor::okPressed()
 {
 	if(!validate())return;
 	accept();
 }
 
-bool KviNickServRuleEditor::editRule(KviNickServRule * r)
+bool NickServRuleEditor::editRule(KviNickServRule * r)
 {
 	m_pRegisteredNickEdit->setText(r->registeredNick().isEmpty() ? QString("MyNick") : r->registeredNick());
 	m_pNickServMaskEdit->setText(r->nickServMask().isEmpty() ? QString("NickServ!*@*") : r->nickServMask());
@@ -218,7 +218,7 @@ bool KviNickServRuleEditor::editRule(KviNickServRule * r)
 }
 
 
-KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
+OptionsWidget_nickServ::OptionsWidget_nickServ(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -295,16 +295,16 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 	gl->setRowStretch(1,1);
 }
 
-KviNickServOptionsWidget::~KviNickServOptionsWidget()
+OptionsWidget_nickServ::~OptionsWidget_nickServ()
 {
 }
 
-void KviNickServOptionsWidget::editNickServRule()
+void OptionsWidget_nickServ::editNickServRule()
 {
 	QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
 	if(!it)return;
 	KviNickServRule r(it->text(0),it->text(2),it->text(3),it->text(4),it->text(1));
-	KviNickServRuleEditor ed(this,true);
+	NickServRuleEditor ed(this,true);
 	if(ed.editRule(&r))
 	{
 		it->setText(0,r.registeredNick());
@@ -315,10 +315,10 @@ void KviNickServOptionsWidget::editNickServRule()
 	}
 }
 
-void KviNickServOptionsWidget::addNickServRule()
+void OptionsWidget_nickServ::addNickServRule()
 {
 	KviNickServRule r;
-	KviNickServRuleEditor ed(this,true);
+	NickServRuleEditor ed(this,true);
 	if(ed.editRule(&r))
 	{
 		QTreeWidgetItem* it = new QTreeWidgetItem(m_pNickServTreeWidget);
@@ -330,7 +330,7 @@ void KviNickServOptionsWidget::addNickServRule()
 	}
 }
 
-void KviNickServOptionsWidget::delNickServRule()
+void OptionsWidget_nickServ::delNickServRule()
 {
 	QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
 	if(!it)return;
@@ -338,7 +338,7 @@ void KviNickServOptionsWidget::delNickServRule()
 	enableDisableNickServControls();
 }
 
-void KviNickServOptionsWidget::enableDisableNickServControls()
+void OptionsWidget_nickServ::enableDisableNickServControls()
 {
 	bool bEnabled = m_pNickServCheck->isChecked();
 	m_pNickServTreeWidget->setEnabled(bEnabled);
@@ -348,7 +348,7 @@ void KviNickServOptionsWidget::enableDisableNickServControls()
 	m_pEditRuleButton->setEnabled(bEnabled);
 }
 
-void KviNickServOptionsWidget::commit()
+void OptionsWidget_nickServ::commit()
 {
 	g_pNickServRuleSet->clear();
 	if(m_pNickServTreeWidget->topLevelItemCount())
@@ -367,5 +367,5 @@ void KviNickServOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_nickserv.moc"
+#include "m_OptionsWidget_nickserv.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/OptionsWidget_nickserv.h
index 2ec018e5e..74060f091 100644
--- a/src/modules/options/optw_nickserv.h
+++ b/src/modules/options/OptionsWidget_nickserv.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_nickserv.h
+//   File : OptionsWidget_nickserv.h
 //   Creation date : Fri Aug 10 2001 03:37:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -39,17 +39,17 @@ class QTreeWidget;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviNickServOptionsWidget KVI_SMALLICON_NICKSERV
 #define KVI_OPTIONS_WIDGET_NAME_KviNickServOptionsWidget __tr2qs_no_lookup("NickServ")
-#define KVI_OPTIONS_WIDGET_PARENT_KviNickServOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviNickServOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviNickServOptionsWidget __tr2qs_no_lookup("authentication,identify")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviNickServOptionsWidget 10000
 //#define KVI_OPTIONS_WIDGET_HIDDEN_KviNickServOptionsWidget true
 
-class KviNickServRuleEditor : public QDialog
+class NickServRuleEditor : public QDialog
 {
 	Q_OBJECT
 public:
-	KviNickServRuleEditor(QWidget * par,bool bUseServerMaskField = false);
-	~KviNickServRuleEditor();
+	NickServRuleEditor(QWidget * par,bool bUseServerMaskField = false);
+	~NickServRuleEditor();
 protected:
 	QLineEdit   * m_pRegisteredNickEdit;
 	QLineEdit   * m_pNickServMaskEdit;
@@ -65,12 +65,12 @@ protected slots:
 	void okPressed();
 };
 
-class KviNickServOptionsWidget : public KviOptionsWidget
+class OptionsWidget_nickServ : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviNickServOptionsWidget(QWidget * parent);
-	~KviNickServOptionsWidget();
+	OptionsWidget_nickServ(QWidget * parent);
+	~OptionsWidget_nickServ();
 protected:
 	QTreeWidget * m_pNickServTreeWidget;
 	QCheckBox        * m_pNickServCheck;
diff --git a/src/modules/options/optw_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp
index ee33b40fd..d4901aae7 100644
--- a/src/modules/options/optw_notifier.cpp
+++ b/src/modules/options/OptionsWidget_notifier.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_notifier.cpp
+//   File : OptionsWidget_notifier.cpp
 //   Creation date : Thu Jul 09 2009 10:54:39 CEST by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_notifier.h"
+#include "OptionsWidget_notifier.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
 
 #include <QLayout>
 
-KviNotifierLookOptionsWidget::KviNotifierLookOptionsWidget(QWidget * parent)
+OptionsWidget_notifierLook::OptionsWidget_notifierLook(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("notifierlook_options_widget");
@@ -94,11 +94,11 @@ KviNotifierLookOptionsWidget::KviNotifierLookOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(5,1);
 }
 
-KviNotifierLookOptionsWidget::~KviNotifierLookOptionsWidget()
+OptionsWidget_notifierLook::~OptionsWidget_notifierLook()
 {
 }
 
-void KviNotifierLookOptionsWidget::commit()
+void OptionsWidget_notifierLook::commit()
 {
 	int iFlags=0;
 	switch(m_pHorizontalAlign->currentIndex())
@@ -132,7 +132,7 @@ void KviNotifierLookOptionsWidget::commit()
 
 
 
-KviNotifierOptionsWidget::KviNotifierOptionsWidget(QWidget * parent)
+OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("notifier_options_widget");
@@ -254,9 +254,9 @@ KviNotifierOptionsWidget::KviNotifierOptionsWidget(QWidget * parent)
 	addRowSpacer(0,iRow,0,iRow);
 }
 
-KviNotifierOptionsWidget::~KviNotifierOptionsWidget()
+OptionsWidget_notifier::~OptionsWidget_notifier()
 {
 }
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_input.moc"
+#include "m_OptionsWidget_input.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_notifier.h b/src/modules/options/OptionsWidget_notifier.h
index 789089129..01ba263e9 100644
--- a/src/modules/options/optw_notifier.h
+++ b/src/modules/options/OptionsWidget_notifier.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_notifier.h
+//   File : OptionsWidget_notifier.h
 //   Creation date : Thu Jul 09 2009 10:54:39 CEST by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -34,15 +34,15 @@
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifierLookOptionsWidget __tr2qs_no_lookup("theme,colors,text")
 #define KVI_OPTIONS_WIDGET_GROUP_KviNotifierLookOptionsWidget "theme"
 
-class KviNotifierLookOptionsWidget : public KviOptionsWidget
+class OptionsWidget_notifierLook : public KviOptionsWidget
 {
 	Q_OBJECT
 private:
 	QComboBox* m_pHorizontalAlign;
 	QComboBox* m_pVerticalAlign;
 public:
-	KviNotifierLookOptionsWidget(QWidget * parent);
-	~KviNotifierLookOptionsWidget();
+	OptionsWidget_notifierLook(QWidget * parent);
+	~OptionsWidget_notifierLook();
 
 	virtual void commit();
 };
@@ -50,14 +50,14 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviNotifierOptionsWidget KVI_SMALLICON_ALERT
 #define KVI_OPTIONS_WIDGET_NAME_KviNotifierOptionsWidget __tr2qs_no_lookup("Notifier")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifierOptionsWidget __tr2qs_no_lookup("popup")
-#define KVI_OPTIONS_WIDGET_PARENT_KviNotifierOptionsWidget KviInterfaceFeaturesOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviNotifierOptionsWidget OptionsWidget_interfaceFeatures
 
-class KviNotifierOptionsWidget : public KviOptionsWidget
+class OptionsWidget_notifier : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviNotifierOptionsWidget(QWidget * parent);
-	~KviNotifierOptionsWidget();
+	OptionsWidget_notifier(QWidget * parent);
+	~OptionsWidget_notifier();
 };
 
 #endif //!_OPTW_NOTIFIER_H_
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp
index 832836930..ce8ad1338 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/OptionsWidget_notify.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_notify.cpp
+//   File : OptionsWidget_notify.cpp
 //   Creation date : Sun Oct 28 15:11:29 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_notify.h"
+#include "OptionsWidget_notify.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -30,7 +30,7 @@
 
 #include <QLayout>
 
-KviNotifyOptionsWidget::KviNotifyOptionsWidget(QWidget * parent)
+OptionsWidget_notify::OptionsWidget_notify(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("notify_options_widget");
@@ -98,10 +98,10 @@ KviNotifyOptionsWidget::KviNotifyOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,0,4);
 }
 
-KviNotifyOptionsWidget::~KviNotifyOptionsWidget()
+OptionsWidget_notify::~OptionsWidget_notify()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_notify.moc"
+#include "m_OptionsWidget_notify.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_notify.h b/src/modules/options/OptionsWidget_notify.h
index f0bd7f1bf..ecdf50240 100644
--- a/src/modules/options/optw_notify.h
+++ b/src/modules/options/OptionsWidget_notify.h
@@ -2,7 +2,7 @@
 #define _OPTW_NOTIFY_H_
 //=============================================================================
 //
-//   File : optw_notify.h
+//   File : OptionsWidget_notify.h
 //   Creation date : Sun Oct 28 15:11:30 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,16 +28,16 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviNotifyOptionsWidget KVI_SMALLICON_REGUSERS
 #define KVI_OPTIONS_WIDGET_NAME_KviNotifyOptionsWidget __tr2qs_no_lookup("Contacts")
-#define KVI_OPTIONS_WIDGET_PARENT_KviNotifyOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviNotifyOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviNotifyOptionsWidget __tr2qs_no_lookup("notify,buddy,buddies,friends")
 #define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_KviNotifyOptionsWidget 2
 
-class KviNotifyOptionsWidget : public KviOptionsWidget
+class OptionsWidget_notify : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviNotifyOptionsWidget(QWidget * parent);
-	~KviNotifyOptionsWidget();
+	OptionsWidget_notify(QWidget * parent);
+	~OptionsWidget_notify();
 };
 
 #endif //_OPTW_NOTIFY_H_
diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/OptionsWidget_protection.cpp
index b0bf2132c..a9cb10527 100644
--- a/src/modules/options/optw_protection.cpp
+++ b/src/modules/options/OptionsWidget_protection.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_protection.cpp
+//   File : OptionsWidget_protection.cpp
 //   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_protection.h"
+#include "OptionsWidget_protection.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -30,7 +30,7 @@
 
 #include <QLayout>
 
-KviProtectionOptionsWidget::KviProtectionOptionsWidget(QWidget * parent)
+OptionsWidget_protection::OptionsWidget_protection(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("protection_options_widget");
@@ -38,10 +38,10 @@ KviProtectionOptionsWidget::KviProtectionOptionsWidget(QWidget * parent)
 	createLayout();
 }
 
-KviProtectionOptionsWidget::~KviProtectionOptionsWidget()
+OptionsWidget_protection::~OptionsWidget_protection()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_protection.moc"
+#include "m_OptionsWidget_protection.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_protection.h b/src/modules/options/OptionsWidget_protection.h
index e800ee831..afd1df146 100644
--- a/src/modules/options/optw_protection.h
+++ b/src/modules/options/OptionsWidget_protection.h
@@ -2,7 +2,7 @@
 #define _OPTW_PROTECTION_H_
 //=============================================================================
 //
-//   File : optw_protection.h
+//   File : OptionsWidget_protection.h
 //   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,18 +30,18 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviProtectionOptionsWidget KVI_SMALLICON_SPY
 #define KVI_OPTIONS_WIDGET_NAME_KviProtectionOptionsWidget __tr2qs_no_lookup("Protection")
-#define KVI_OPTIONS_WIDGET_PARENT_KviProtectionOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviProtectionOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviProtectionOptionsWidget 60000
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviProtectionOptionsWidget __tr2qs_no_lookup("ctcp,flood")
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviProtectionOptionsWidget true
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviProtectionOptionsWidget true
 
-class KviProtectionOptionsWidget : public KviOptionsWidget
+class OptionsWidget_protection : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviProtectionOptionsWidget(QWidget * parent);
-	~KviProtectionOptionsWidget();
+	OptionsWidget_protection(QWidget * parent);
+	~OptionsWidget_protection();
 };
 
 #endif //!_OPTW_PROTECTION_H_
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp
index 113a3591d..d05740441 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/OptionsWidget_proxy.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_proxy.cpp
+//   File : OptionsWidget_proxy.cpp
 //   Creation date : Mon Jun 24 2000 22:02:11 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_proxy.h"
+#include "OptionsWidget_proxy.h"
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
@@ -44,7 +44,7 @@
 #include <QToolButton>
 
 
-KviProxyOptionsTreeWidgetItem::KviProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx)
+ProxyOptionsTreeWidgetItem::ProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx)
 : QTreeWidgetItem(parent)
 {
 	qDebug("Creating item");
@@ -53,13 +53,13 @@ KviProxyOptionsTreeWidgetItem::KviProxyOptionsTreeWidgetItem(QTreeWidget *parent
 	m_pProxyData = new KviProxy(*prx);
 }
 
-KviProxyOptionsTreeWidgetItem::~KviProxyOptionsTreeWidgetItem()
+ProxyOptionsTreeWidgetItem::~ProxyOptionsTreeWidgetItem()
 {
 	qDebug("Deleting item");
 	delete m_pProxyData;
 }
 
-KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
+OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent)
 : KviOptionsWidget(parent,"proxy_options_widget")
 {
 	createLayout();
@@ -143,24 +143,24 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 	m_pContextPopup = new KviTalPopupMenu(this);
 }
 
-KviProxyOptionsWidget::~KviProxyOptionsWidget()
+OptionsWidget_proxy::~OptionsWidget_proxy()
 {
 }
 
-void KviProxyOptionsWidget::ipV6CheckToggled(bool bEnabled)
+void OptionsWidget_proxy::ipV6CheckToggled(bool bEnabled)
 {
 	m_pIpEditor->setAddressType(bEnabled ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
 }
 
-void KviProxyOptionsWidget::fillProxyList()
+void OptionsWidget_proxy::fillProxyList()
 {
-	KviProxyOptionsTreeWidgetItem * prx;
+	ProxyOptionsTreeWidgetItem * prx;
 
 	KviPointerList<KviProxy> * l = g_pProxyDataBase->proxyList();
 
 	for(KviProxy * p = l->first();p;p = l->next())
 	{
-		prx = new KviProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),p);
+		prx = new ProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),p);
 		if(p == g_pProxyDataBase->currentProxy())
 		{
 			prx->setSelected(true);
@@ -171,10 +171,10 @@ void KviProxyOptionsWidget::fillProxyList()
 	if(!(g_pProxyDataBase->currentProxy()))currentItemChanged(0,0);
 }
 
-void KviProxyOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
+void OptionsWidget_proxy::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
 {
 	if(m_pLastEditedItem)saveLastItem();
-	m_pLastEditedItem = (KviProxyOptionsTreeWidgetItem *)it;
+	m_pLastEditedItem = (ProxyOptionsTreeWidgetItem *)it;
 
 	m_pProxyLabel->setEnabled(m_pLastEditedItem);
 	m_pProxyEdit->setEnabled(m_pLastEditedItem);
@@ -239,7 +239,7 @@ void KviProxyOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetIt
 	}
 }
 
-void KviProxyOptionsWidget::saveLastItem()
+void OptionsWidget_proxy::saveLastItem()
 {
 	if(m_pLastEditedItem)
 	{
@@ -290,16 +290,16 @@ void KviProxyOptionsWidget::saveLastItem()
 	}
 }
 
-void KviProxyOptionsWidget::commit()
+void OptionsWidget_proxy::commit()
 {
 	saveLastItem();
 	g_pProxyDataBase->clear();
-	KviProxyOptionsTreeWidgetItem * it;// = (KviProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItemCount();
+	ProxyOptionsTreeWidgetItem * it;// = (ProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItemCount();
 
 	//while(it)
 	for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		it=(KviProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		it=(ProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		QString tmp = it->text(0);
 		if(!tmp.isEmpty())
 		{
@@ -308,7 +308,7 @@ void KviProxyOptionsWidget::commit()
 
 			if(it == m_pLastEditedItem)g_pProxyDataBase->setCurrentProxy(prx);
 		}
-		//it = (KviProxyOptionsTreeWidgetItem *)it->nextSibling();
+		//it = (ProxyOptionsTreeWidgetItem *)it->nextSibling();
 	}
 
 	if(g_pProxyDataBase->currentProxy() == 0)
@@ -319,7 +319,7 @@ void KviProxyOptionsWidget::commit()
 	KviOptionsWidget::commit();
 }
 
-void KviProxyOptionsWidget::customContextMenuRequested(const QPoint &pos)
+void OptionsWidget_proxy::customContextMenuRequested(const QPoint &pos)
 {
 	QTreeWidgetItem *it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
 	m_pContextPopup->clear();
@@ -328,16 +328,16 @@ void KviProxyOptionsWidget::customContextMenuRequested(const QPoint &pos)
 	m_pContextPopup->popup(QCursor::pos());
 }
 
-void KviProxyOptionsWidget::newProxy()
+void OptionsWidget_proxy::newProxy()
 {
 	KviProxy prx;
-	KviProxyOptionsTreeWidgetItem * it = new KviProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),&prx);
+	ProxyOptionsTreeWidgetItem * it = new ProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),&prx);
 	it->setSelected(true);
 	m_pTreeWidget->setCurrentItem(it);
 	m_pTreeWidget->scrollToItem(it);
 }
 
-void KviProxyOptionsWidget::removeCurrent()
+void OptionsWidget_proxy::removeCurrent()
 {
 	if(m_pLastEditedItem)
 	{
@@ -360,5 +360,5 @@ void KviProxyOptionsWidget::removeCurrent()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_proxy.moc"
+#include "m_OptionsWidget_proxy.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/OptionsWidget_proxy.h
index 943b01cac..4df390eef 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/OptionsWidget_proxy.h
@@ -2,7 +2,7 @@
 #define _OPTW_PROXY_H_
 //=============================================================================
 //
-//   File : optw_proxy.h
+//   File : OptionsWidget_proxy.h
 //   Creation date : Mon Jun 24 2000 21:58:25 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -39,11 +39,11 @@ class KviProxyDataBase;
 
 extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 
-class KviProxyOptionsTreeWidgetItem : public QTreeWidgetItem
+class ProxyOptionsTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx);
-	~KviProxyOptionsTreeWidgetItem();
+	ProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx);
+	~ProxyOptionsTreeWidgetItem();
 public:
 	KviProxy * m_pProxyData;
 };
@@ -51,16 +51,16 @@ public:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviProxyOptionsWidget KVI_SMALLICON_PROXY
 #define KVI_OPTIONS_WIDGET_NAME_KviProxyOptionsWidget __tr2qs_no_lookup("Proxy Hosts")
-#define KVI_OPTIONS_WIDGET_PARENT_KviProxyOptionsWidget KviConnectionOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviProxyOptionsWidget OptionsWidget_connection
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviProxyOptionsWidget __tr2qs_no_lookup("connection,servers")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviProxyOptionsWidget 70000
 
-class KviProxyOptionsWidget : public KviOptionsWidget
+class OptionsWidget_proxy : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviProxyOptionsWidget(QWidget * parent);
-	~KviProxyOptionsWidget();
+	OptionsWidget_proxy(QWidget * parent);
+	~OptionsWidget_proxy();
 protected:
 	QTreeWidget    * m_pTreeWidget;
 	QLabel       * m_pProxyLabel;
@@ -77,7 +77,7 @@ protected:
 	QComboBox    * m_pProtocolBox;
 	KviTalPopupMenu   * m_pContextPopup;
 	QCheckBox    * m_pIPv6Check;
-	KviProxyOptionsTreeWidgetItem * m_pLastEditedItem;
+	ProxyOptionsTreeWidgetItem * m_pLastEditedItem;
 private:
 
 	void fillProxyList();
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/OptionsWidget_query.cpp
index b020570dc..8f2dfc865 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/OptionsWidget_query.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_query.cpp
+//   File : OptionsWidget_query.cpp
 //   Creation date : Mon Oct 29 15:37:16 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "optw_query.h"
+#include "OptionsWidget_query.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -32,7 +32,7 @@
 #include <QLayout>
 
 
-KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent)
+OptionsWidget_query::OptionsWidget_query(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("query_options_widget");
@@ -106,11 +106,11 @@ KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent)
 	addRowSpacer(0,8,1,8);
 }
 
-KviQueryOptionsWidget::~KviQueryOptionsWidget()
+OptionsWidget_query::~OptionsWidget_query()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_query.moc"
+#include "m_OptionsWidget_query.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_query.h b/src/modules/options/OptionsWidget_query.h
index 9d1e9c98a..8a385b7a9 100644
--- a/src/modules/options/optw_query.h
+++ b/src/modules/options/OptionsWidget_query.h
@@ -2,7 +2,7 @@
 #define _OPTW_QUERY_H_
 //=============================================================================
 //
-//   File : optw_query.h
+//   File : OptionsWidget_query.h
 //   Creation date : Tue Mar 05 22:31:18 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,17 +28,17 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviQueryOptionsWidget KVI_SMALLICON_QUERY
 #define KVI_OPTIONS_WIDGET_NAME_KviQueryOptionsWidget __tr2qs_no_lookup("Query")
-#define KVI_OPTIONS_WIDGET_PARENT_KviQueryOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviQueryOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviQueryOptionsWidget __tr2qs_no_lookup("chat")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviQueryOptionsWidget 80000
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviQueryOptionsWidget true
 
-class KviQueryOptionsWidget : public KviOptionsWidget
+class OptionsWidget_query : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviQueryOptionsWidget(QWidget * parent);
-	~KviQueryOptionsWidget();
+	OptionsWidget_query(QWidget * parent);
+	~OptionsWidget_query();
 };
 
 #endif //_OPTW_QUERY_H_
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 68acd25e2..87be984fb 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_servers.cpp
+//   File : OptionsWidget_servers.cpp
 //   Creation date : Wed Jun 12 2000 03:29:51 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,11 +22,11 @@
 //
 //=============================================================================
 
-#include "optw_servers.h"
-#include "optw_proxy.h"
-#include "optw_nickserv.h" // for the NickServ rule editor
+#include "OptionsWidget_servers.h"
+#include "OptionsWidget_proxy.h"
+#include "OptionsWidget_nickserv.h" // for the NickServ rule editor
 
-#include "container.h"
+#include "OptionsWidgetContainer.h"
 
 #include "KviQueryWindow.h"
 #include "KviChannelWindow.h"
@@ -71,7 +71,7 @@
 	#include <QWindowsStyle>
 #endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW
 
-KviIrcNetworkDetailsWidget::KviIrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n)
+IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n)
 	: QDialog(par)
 {
 	setModal(true);
@@ -382,18 +382,18 @@ KviIrcNetworkDetailsWidget::KviIrcNetworkDetailsWidget(QWidget * par,KviIrcNetwo
 }
 
 
-KviIrcNetworkDetailsWidget::~KviIrcNetworkDetailsWidget()
+IrcNetworkDetailsWidget::~IrcNetworkDetailsWidget()
 {
 	if(m_pOnConnectEditor) KviScriptEditor::destroyInstance(m_pOnConnectEditor);
 	if(m_pOnLoginEditor) KviScriptEditor::destroyInstance(m_pOnLoginEditor);
 }
 
-void KviIrcNetworkDetailsWidget::editNickServRule()
+void IrcNetworkDetailsWidget::editNickServRule()
 {
 	QTreeWidgetItem * it = (QTreeWidgetItem *) m_pNickServTreeWidget->currentItem();
 	if(!it)return;
 	KviNickServRule r(it->text(0),it->text(1),it->text(2),it->text(3));
-	KviNickServRuleEditor ed(this,false);
+	NickServRuleEditor ed(this,false);
 	if(ed.editRule(&r))
 	{
 		it->setText(0,r.registeredNick());
@@ -403,10 +403,10 @@ void KviIrcNetworkDetailsWidget::editNickServRule()
 	}
 }
 
-void KviIrcNetworkDetailsWidget::addNickServRule()
+void IrcNetworkDetailsWidget::addNickServRule()
 {
 	KviNickServRule r;
-	KviNickServRuleEditor ed(this,false);
+	NickServRuleEditor ed(this,false);
 	if(ed.editRule(&r))
 	{
 		QTreeWidgetItem *it = new QTreeWidgetItem(m_pNickServTreeWidget);
@@ -417,7 +417,7 @@ void KviIrcNetworkDetailsWidget::addNickServRule()
 	}
 }
 
-void KviIrcNetworkDetailsWidget::delNickServRule()
+void IrcNetworkDetailsWidget::delNickServRule()
 {
 	QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
 	if(!it)return;
@@ -425,7 +425,7 @@ void KviIrcNetworkDetailsWidget::delNickServRule()
 	enableDisableNickServControls();
 }
 
-void KviIrcNetworkDetailsWidget::enableDisableNickServControls()
+void IrcNetworkDetailsWidget::enableDisableNickServControls()
 {
 	bool bEnabled = m_pNickServCheck->isChecked();
 	m_pNickServTreeWidget->setEnabled(bEnabled);
@@ -435,7 +435,7 @@ void KviIrcNetworkDetailsWidget::enableDisableNickServControls()
 	m_pEditRuleButton->setEnabled(bEnabled);
 }
 
-void KviIrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
+void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 {
 	n->setUserName(m_pUserEditor->text());
 	n->setPassword(m_pPassEditor->text());
@@ -498,7 +498,7 @@ void KviIrcNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 }
 
 
-KviIrcServerDetailsWidget::KviIrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
+IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 : QDialog(par)
 {
 	setModal(true);
@@ -994,13 +994,13 @@ KviIrcServerDetailsWidget::KviIrcServerDetailsWidget(QWidget * par,KviIrcServer
 	setHeaderLabelText();
 }
 
-KviIrcServerDetailsWidget::~KviIrcServerDetailsWidget()
+IrcServerDetailsWidget::~IrcServerDetailsWidget()
 {
 	if(m_pOnConnectEditor) KviScriptEditor::destroyInstance(m_pOnConnectEditor);
 	if(m_pOnLoginEditor) KviScriptEditor::destroyInstance(m_pOnLoginEditor);
 }
 
-void KviIrcServerDetailsWidget::useIPV6CheckToggled(bool)
+void IrcServerDetailsWidget::useIPV6CheckToggled(bool)
 {
 #ifdef COMPILE_IPV6_SUPPORT
 	m_pIpEditor->setAddressType(m_pUseIPV6Check->isChecked() ? KviIpEditor::IPv6 : KviIpEditor::IPv4);
@@ -1010,12 +1010,12 @@ void KviIrcServerDetailsWidget::useIPV6CheckToggled(bool)
 	setHeaderLabelText();
 }
 
-void KviIrcServerDetailsWidget::portEditorTextChanged(const QString &)
+void IrcServerDetailsWidget::portEditorTextChanged(const QString &)
 {
 	setHeaderLabelText();
 }
 
-void KviIrcServerDetailsWidget::setHeaderLabelText()
+void IrcServerDetailsWidget::setHeaderLabelText()
 {
 	QString szTmp = "<font size=\"+1\"><b>irc";
 	if(m_pUseIPV6Check->isChecked())szTmp += "6";
@@ -1035,7 +1035,7 @@ void KviIrcServerDetailsWidget::setHeaderLabelText()
 	m_pHeaderLabel->setText(szTmp);
 }
 
-void KviIrcServerDetailsWidget::fillData(KviIrcServer * s)
+void IrcServerDetailsWidget::fillData(KviIrcServer * s)
 {
 	s->setUserName(m_pUserEditor->text());
 	s->setPassword(m_pPassEditor->text());
@@ -1165,7 +1165,7 @@ void KviIrcServerDetailsWidget::fillData(KviIrcServer * s)
 		s->setProxy(m_pProxyEditor->currentIndex()-2);
 }
 
-void KviIrcServerDetailsWidget::useDefaultInitUModeToggled(bool b)
+void IrcServerDetailsWidget::useDefaultInitUModeToggled(bool b)
 {
 	m_pIMode->setEnabled(!b);
 	m_pWMode->setEnabled(!b);
@@ -1175,7 +1175,7 @@ void KviIrcServerDetailsWidget::useDefaultInitUModeToggled(bool b)
 // KviApplication.cpp
 extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase;
 
-KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n)
+IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n)
     : QTreeWidgetItem(parent)
 {
 	setIcon(0,QIcon(pm));
@@ -1185,7 +1185,7 @@ KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidget
 	setText(1,n->description());
 }
 
-KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s)
+IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s)
     : QTreeWidgetItem(parent)
 {
 	setIcon(0,QIcon(pm));
@@ -1195,13 +1195,13 @@ KviIrcServerOptionsTreeWidgetItem::KviIrcServerOptionsTreeWidgetItem(QTreeWidget
 	m_pNetworkData = 0;
 }
 
-KviIrcServerOptionsTreeWidgetItem::~KviIrcServerOptionsTreeWidgetItem()
+IrcServerOptionsTreeWidgetItem::~IrcServerOptionsTreeWidgetItem()
 {
 	if(m_pServerData)delete m_pServerData;
 	if(m_pNetworkData)delete m_pNetworkData;
 }
 
-void KviIrcServerOptionsTreeWidgetItem::updateVisibleStrings()
+void IrcServerOptionsTreeWidgetItem::updateVisibleStrings()
 {
 	if(m_pNetworkData)
 	{
@@ -1217,7 +1217,7 @@ void KviIrcServerOptionsTreeWidgetItem::updateVisibleStrings()
 }
 
 
-KviIrcServerOptionsWidget::KviIrcServerOptionsWidget(QWidget * parent)
+OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("server_options_widget");
@@ -1343,7 +1343,7 @@ KviIrcServerOptionsWidget::KviIrcServerOptionsWidget(QWidget * parent)
 
 
 	// The "Show this dialog at startup" option is shown only when the server options widget is shown as standalone dialog
-	if(parent->inherits("KviOptionsWidgetContainer"))
+	if(parent->inherits("OptionsWidgetContainer"))
 	{
 		m_pConnectCurrent = new QPushButton(__tr2qs_ctx("Connect &Now","options"),this);
 		addWidgetToLayout(m_pConnectCurrent,0,2,1,2);
@@ -1379,7 +1379,7 @@ KviIrcServerOptionsWidget::KviIrcServerOptionsWidget(QWidget * parent)
 
 		KviTalToolTip::add(m_pConnectCurrent,__tr2qs_ctx("<center>Hit this button to connect to the currently selected server.</center>","options"));
 
-		KviOptionsWidgetContainer * pContainer = dynamic_cast<KviOptionsWidgetContainer *>(parent);
+		OptionsWidgetContainer * pContainer = dynamic_cast<OptionsWidgetContainer *>(parent);
 		if(pContainer)
 		{
 			KviBoolSelector * b = addBoolSelector(pContainer,__tr2qs_ctx("Show this dialog at startup","options"),KviOption_boolShowServersConnectDialogOnStart);
@@ -1402,7 +1402,7 @@ KviIrcServerOptionsWidget::KviIrcServerOptionsWidget(QWidget * parent)
 	setMinimumWidth(600);
 }
 
-KviIrcServerOptionsWidget::~KviIrcServerOptionsWidget()
+OptionsWidget_servers::~OptionsWidget_servers()
 {
 	if(m_pImportFilter)
 	{
@@ -1419,7 +1419,7 @@ KviIrcServerOptionsWidget::~KviIrcServerOptionsWidget()
 		delete m_pNetworkDetailsDialog;
 }
 
-void KviIrcServerOptionsWidget::recentServersPopupAboutToShow()
+void OptionsWidget_servers::recentServersPopupAboutToShow()
 {
 	g_pApp->fillRecentServersPopup(m_pRecentPopup);
 
@@ -1427,7 +1427,7 @@ void KviIrcServerOptionsWidget::recentServersPopupAboutToShow()
 	m_pRecentPopup->insertItem(__tr2qs("Clear Recent Servers List"));
 }
 
-void KviIrcServerOptionsWidget::recentServersPopupClicked(int id)
+void OptionsWidget_servers::recentServersPopupClicked(int id)
 {
 	KviConsoleWindow * c = g_pActiveWindow->console();
 	if(!c)
@@ -1446,7 +1446,7 @@ void KviIrcServerOptionsWidget::recentServersPopupClicked(int id)
 	selectBestServerByUrl(szItemText);
 }
 
-void KviIrcServerOptionsWidget::selectBestServerByUrl(const QString &szUrl)
+void OptionsWidget_servers::selectBestServerByUrl(const QString &szUrl)
 {
 	if(szUrl.isEmpty())
 		return;
@@ -1458,12 +1458,12 @@ void KviIrcServerOptionsWidget::selectBestServerByUrl(const QString &szUrl)
 	int uCount = m_pTreeWidget->topLevelItemCount();
 	int uIdx = 0;
 
-	KviIrcServerOptionsTreeWidgetItem * pBestCandidate = NULL;
+	IrcServerOptionsTreeWidgetItem * pBestCandidate = NULL;
 	kvi_u32_t uBestCandidateScore = 0;
 
 	while(uIdx < uCount)
 	{
-		KviIrcServerOptionsTreeWidgetItem * pNet = static_cast<KviIrcServerOptionsTreeWidgetItem *>(m_pTreeWidget->topLevelItem(uIdx));
+		IrcServerOptionsTreeWidgetItem * pNet = static_cast<IrcServerOptionsTreeWidgetItem *>(m_pTreeWidget->topLevelItem(uIdx));
 
 		uIdx++;
 
@@ -1474,7 +1474,7 @@ void KviIrcServerOptionsWidget::selectBestServerByUrl(const QString &szUrl)
 		int uChildIdx = 0;
 		while(uChildIdx < uServerCount)
 		{
-			KviIrcServerOptionsTreeWidgetItem * pServer = static_cast<KviIrcServerOptionsTreeWidgetItem *>(pNet->child(uChildIdx));
+			IrcServerOptionsTreeWidgetItem * pServer = static_cast<IrcServerOptionsTreeWidgetItem *>(pNet->child(uChildIdx));
 			uChildIdx++;
 
 			if(!pServer)
@@ -1515,7 +1515,7 @@ void KviIrcServerOptionsWidget::selectBestServerByUrl(const QString &szUrl)
 
 }
 
-void KviIrcServerOptionsWidget::connectCurrentClicked()
+void OptionsWidget_servers::connectCurrentClicked()
 {
 	saveLastItem();
 	commit();
@@ -1524,11 +1524,11 @@ void KviIrcServerOptionsWidget::connectCurrentClicked()
 	KviKvsScript::run("server -u",g_pApp->activeConsole());
 }
 
-void KviIrcServerOptionsWidget::fillServerList()
+void OptionsWidget_servers::fillServerList()
 {
-	KviIrcServerOptionsTreeWidgetItem * net;
-	KviIrcServerOptionsTreeWidgetItem * srv;
-	KviIrcServerOptionsTreeWidgetItem * cur = 0;
+	IrcServerOptionsTreeWidgetItem * net;
+	IrcServerOptionsTreeWidgetItem * srv;
+	IrcServerOptionsTreeWidgetItem * cur = 0;
 
 	KviPointerHashTableIterator<QString,KviIrcNetwork> it(*(g_pServerDataBase->recordDict()));
 
@@ -1537,13 +1537,13 @@ void KviIrcServerOptionsWidget::fillServerList()
 
 	while(KviIrcNetwork * r = it.current())
 	{
-		net = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r);
+		net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r);
 		KviPointerList<KviIrcServer> * sl = r->serverList();
 		bool bCurrent = r->name() == g_pServerDataBase->currentNetworkName().toUtf8().data();
 		net->setExpanded(bCurrent);
 		for(KviIrcServer * s = sl->first();s;s = sl->next())
 		{
-			srv = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),s);
+			srv = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),s);
 
 			if((s == r->currentServer()) && bCurrent)
 			{
@@ -1563,15 +1563,15 @@ void KviIrcServerOptionsWidget::fillServerList()
 	}
 }
 
-void KviIrcServerOptionsWidget::itemDoubleClicked(QTreeWidgetItem*, int )
+void OptionsWidget_servers::itemDoubleClicked(QTreeWidgetItem*, int )
 {
 	detailsClicked();
 }
 
-void KviIrcServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
+void OptionsWidget_servers::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *)
 {
 	saveLastItem();
-	m_pLastEditedItem = (KviIrcServerOptionsTreeWidgetItem *)it;
+	m_pLastEditedItem = (IrcServerOptionsTreeWidgetItem *)it;
 
 	if(m_pLastEditedItem)
 	{
@@ -1605,7 +1605,7 @@ void KviIrcServerOptionsWidget::currentItemChanged(QTreeWidgetItem *it,QTreeWidg
 	}
 }
 
-void KviIrcServerOptionsWidget::serverNetworkEditTextEdited(const QString &)
+void OptionsWidget_servers::serverNetworkEditTextEdited(const QString &)
 {
 	if(!m_pLastEditedItem)
 		return;
@@ -1618,7 +1618,7 @@ void KviIrcServerOptionsWidget::serverNetworkEditTextEdited(const QString &)
 }
 
 
-void KviIrcServerOptionsWidget::saveLastItem()
+void OptionsWidget_servers::saveLastItem()
 {
 	if(!m_pLastEditedItem)
 		return;
@@ -1640,15 +1640,15 @@ void KviIrcServerOptionsWidget::saveLastItem()
 	}
 }
 
-void KviIrcServerOptionsWidget::commit()
+void OptionsWidget_servers::commit()
 {
 	saveLastItem();
 	g_pServerDataBase->clear();
 
-	KviIrcServerOptionsTreeWidgetItem * network;
+	IrcServerOptionsTreeWidgetItem * network;
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		network=(KviIrcServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
+		network=(IrcServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
 		QString tmp = network->m_pNetworkData->name();
 		KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(tmp);
 		if(pNetwork)
@@ -1661,11 +1661,11 @@ void KviIrcServerOptionsWidget::commit()
 		}
 		if(network == m_pLastEditedItem)g_pServerDataBase->setCurrentNetwork(pNetwork->name());
 
-		KviIrcServerOptionsTreeWidgetItem * ch;
+		IrcServerOptionsTreeWidgetItem * ch;
 		for (int j=0;j<network->childCount();j++)
 		{
 			KviIrcServer *srv;
-			ch=(KviIrcServerOptionsTreeWidgetItem *)network->child(j);
+			ch=(IrcServerOptionsTreeWidgetItem *)network->child(j);
 			if(ch->m_pServerData)
 			{
 				if(!ch->m_pServerData->m_szHostname.isEmpty())
@@ -1694,11 +1694,11 @@ void KviIrcServerOptionsWidget::commit()
 	g_pApp->saveIrcServerDataBase();
 }
 
-void KviIrcServerOptionsWidget::customContextMenuRequested(const QPoint &pnt)
+void OptionsWidget_servers::customContextMenuRequested(const QPoint &pnt)
 {
 	int id;
 	QTreeWidgetItem *it=(QTreeWidgetItem *) m_pTreeWidget->itemAt(pnt);
-	bool bServer = (it && ((KviIrcServerOptionsTreeWidgetItem *)it)->m_pServerData);
+	bool bServer = (it && ((IrcServerOptionsTreeWidgetItem *)it)->m_pServerData);
 	m_pContextPopup->clear();
 	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork()));
 	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,SLOT(removeCurrent()));
@@ -1720,7 +1720,7 @@ void KviIrcServerOptionsWidget::customContextMenuRequested(const QPoint &pnt)
 	m_pContextPopup->popup(QCursor::pos());
 }
 
-void KviIrcServerOptionsWidget::importPopupAboutToShow()
+void OptionsWidget_servers::importPopupAboutToShow()
 {
 	g_pModuleManager->loadModulesByCaps("serverimport");
 	m_pImportPopup->clear();
@@ -1741,7 +1741,7 @@ void KviIrcServerOptionsWidget::importPopupAboutToShow()
 	}
 }
 
-void KviIrcServerOptionsWidget::importPopupActivated(int id)
+void OptionsWidget_servers::importPopupActivated(int id)
 {
 	// ensure that we have all the modules : they could have been unloaded while the popup was displayed
 	g_pModuleManager->loadModulesByCaps("serverimport");
@@ -1780,25 +1780,25 @@ void KviIrcServerOptionsWidget::importPopupActivated(int id)
 	m_pImportFilter->start();
 }
 
-void KviIrcServerOptionsWidget::importerDead()
+void OptionsWidget_servers::importerDead()
 {
 	m_pImportFilter = 0;
 }
 
-void KviIrcServerOptionsWidget::importServer(const KviIrcServer &s,const QString &network)
+void OptionsWidget_servers::importServer(const KviIrcServer &s,const QString &network)
 {
-	KviIrcServerOptionsTreeWidgetItem * net = findNetItem(network);
+	IrcServerOptionsTreeWidgetItem * net = findNetItem(network);
 	if(!net)
 	{
 		KviIrcNetwork d(network);
-		net = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d);
+		net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d);
 		net->setExpanded(true);
 	}
 
-	KviIrcServerOptionsTreeWidgetItem * srv ;
+	IrcServerOptionsTreeWidgetItem * srv ;
 	for(int i=0;i<net->childCount();i++)
 	{
-		srv=(KviIrcServerOptionsTreeWidgetItem *) net->child(i);
+		srv=(IrcServerOptionsTreeWidgetItem *) net->child(i);
 		if((srv)->m_pServerData->useSSL() == s.useSSL())
 		{
 			if(srv->m_pServerData->isIPv6() == s.isIPv6())
@@ -1819,29 +1819,29 @@ void KviIrcServerOptionsWidget::importServer(const KviIrcServer &s,const QString
 	}
 
 	// not found : add it!
-	KviIrcServerOptionsTreeWidgetItem * newServer = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&s);
+	IrcServerOptionsTreeWidgetItem * newServer = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&s);
 	m_pTreeWidget->setCurrentItem(newServer);
 	m_pTreeWidget->scrollToItem(newServer);
 }
 
-void KviIrcServerOptionsWidget::newNetwork()
+void OptionsWidget_servers::newNetwork()
 {
 	KviIrcNetwork d(__tr2qs_ctx("New Network","options"));
-	KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d);
+	IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d);
 	it->setExpanded(true);
 	it->setSelected(true);
 	m_pTreeWidget->setCurrentItem(it);
 	m_pTreeWidget->scrollToItem(it);
 }
 
-void KviIrcServerOptionsWidget::newServer()
+void OptionsWidget_servers::newServer()
 {
 	if(m_pLastEditedItem)
 	{
-		KviIrcServerOptionsTreeWidgetItem * net;
+		IrcServerOptionsTreeWidgetItem * net;
 		if(m_pLastEditedItem->m_pServerData)
 		{
-			net = (KviIrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent();
+			net = (IrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent();
 			if(!net)return;
 		}
 		else net = m_pLastEditedItem;
@@ -1851,7 +1851,7 @@ void KviIrcServerOptionsWidget::newServer()
 		tmp.setCacheIp(false);
 		tmp.generateUniqueId();
 
-		KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&tmp);
+		IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),&tmp);
 
 		net->setExpanded(true);
 
@@ -1861,7 +1861,7 @@ void KviIrcServerOptionsWidget::newServer()
 	}
 }
 
-void KviIrcServerOptionsWidget::copyServer()
+void OptionsWidget_servers::copyServer()
 {
 	if(m_pLastEditedItem)
 	{
@@ -1874,21 +1874,21 @@ void KviIrcServerOptionsWidget::copyServer()
 	}
 }
 
-void KviIrcServerOptionsWidget::pasteServer()
+void OptionsWidget_servers::pasteServer()
 {
 	if(m_pClipboard)
 	{
 		if(m_pLastEditedItem)
 		{
-			KviIrcServerOptionsTreeWidgetItem * net;
+			IrcServerOptionsTreeWidgetItem * net;
 			if(m_pLastEditedItem->m_pServerData)
 			{
-				net = (KviIrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent();
+				net = (IrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent();
 				if(!net)return;
 			}
 			else net = m_pLastEditedItem;
 
-			KviIrcServerOptionsTreeWidgetItem * it = new KviIrcServerOptionsTreeWidgetItem(net,
+			IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(net,
 							*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),m_pClipboard);
 
 			net->setExpanded(true);
@@ -1900,7 +1900,7 @@ void KviIrcServerOptionsWidget::pasteServer()
 	}
 }
 
-void KviIrcServerOptionsWidget::removeCurrent()
+void OptionsWidget_servers::removeCurrent()
 {
 	if(m_pLastEditedItem)
 	{
@@ -1927,33 +1927,33 @@ void KviIrcServerOptionsWidget::removeCurrent()
 	}
 }
 
-KviIrcServerOptionsTreeWidgetItem * KviIrcServerOptionsWidget::findNetItem(const QString &netname)
+IrcServerOptionsTreeWidgetItem * OptionsWidget_servers::findNetItem(const QString &netname)
 {
 
-	KviIrcServerOptionsTreeWidgetItem * it;
+	IrcServerOptionsTreeWidgetItem * it;
 	for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		it=(KviIrcServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		it=(IrcServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		if(KviQString::equalCI(it->text(0),netname))return it;
 	}
 	return 0;
 }
 
-void KviIrcServerOptionsWidget::clearList()
+void OptionsWidget_servers::clearList()
 {
 	m_pTreeWidget->clear();
 	m_pLastEditedItem = 0;
 	currentItemChanged(0,0);
 }
 
-void KviIrcServerOptionsWidget::detailsClicked()
+void OptionsWidget_servers::detailsClicked()
 {
 	if(!m_pLastEditedItem)return;
 	if(m_pLastEditedItem->m_pServerData)
 	{
 		saveLastItem();
 
-		m_pServerDetailsDialog = new KviIrcServerDetailsWidget(this,m_pLastEditedItem->m_pServerData);
+		m_pServerDetailsDialog = new IrcServerDetailsWidget(this,m_pLastEditedItem->m_pServerData);
 
 		int retCode = m_pServerDetailsDialog->exec();
 		if(retCode == QDialog::Accepted)
@@ -1976,7 +1976,7 @@ void KviIrcServerOptionsWidget::detailsClicked()
 	{
 		saveLastItem();
 
-		m_pNetworkDetailsDialog = new KviIrcNetworkDetailsWidget(this,m_pLastEditedItem->m_pNetworkData);
+		m_pNetworkDetailsDialog = new IrcNetworkDetailsWidget(this,m_pLastEditedItem->m_pNetworkData);
 
 		int retCode = m_pNetworkDetailsDialog->exec();
 		if(retCode == QDialog::Accepted)
@@ -1997,5 +1997,5 @@ void KviIrcServerOptionsWidget::detailsClicked()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_servers.moc"
+#include "m_OptionsWidget_servers.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/OptionsWidget_servers.h
index cbcbf3e87..a8e9f7678 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/OptionsWidget_servers.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_servers.h
+//   File : OptionsWidget_servers.h
 //   Creation date : Wed Jun 12 2000 03:29:01 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -43,19 +43,19 @@ class KviIrcServer;
 class KviTalPopupMenu;
 class KviScriptEditor;
 class KviNickServRule;
-class KviNickServRuleEditor;
+class NickServRuleEditor;
 class KviIrcServer;
 class KviIrcNetwork;
 class KviIrcNetworkData;
 class KviMexServerImport;
 
 
-class KviIrcServerOptionsTreeWidgetItem : public QTreeWidgetItem
+class IrcServerOptionsTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviIrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n);
-	KviIrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s);
-	~KviIrcServerOptionsTreeWidgetItem();
+	IrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n);
+	IrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s);
+	~IrcServerOptionsTreeWidgetItem();
 public:
 	KviIrcServer * m_pServerData;
 	KviIrcNetwork * m_pNetworkData;
@@ -74,12 +74,12 @@ public:
 };
 
 
-class KviIrcNetworkDetailsWidget : public QDialog
+class IrcNetworkDetailsWidget : public QDialog
 {
 	Q_OBJECT
 public:
-	KviIrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * d);
-	~KviIrcNetworkDetailsWidget();
+	IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * d);
+	~IrcNetworkDetailsWidget();
 protected:
 	KviScriptEditor       * m_pOnConnectEditor;
 	KviScriptEditor       * m_pOnLoginEditor;
@@ -112,12 +112,12 @@ protected slots:
 	void editNickServRule();
 };
 
-class KviIrcServerDetailsWidget : public QDialog
+class IrcServerDetailsWidget : public QDialog
 {
 	Q_OBJECT
 public:
-	KviIrcServerDetailsWidget(QWidget * par,KviIrcServer * s);
-	~KviIrcServerDetailsWidget();
+	IrcServerDetailsWidget(QWidget * par,KviIrcServer * s);
+	~IrcServerDetailsWidget();
 protected:
 	QString                 m_szHostname;
 	QLabel                * m_pHeaderLabel;
@@ -164,15 +164,15 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviIrcServerOptionsWidget KVI_SMALLICON_SERVER
 #define KVI_OPTIONS_WIDGET_NAME_KviIrcServerOptionsWidget __tr2qs_no_lookup("Servers")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviIrcServerOptionsWidget __tr2qs_no_lookup("connection")
-//#define KVI_OPTIONS_WIDGET_NOPARENT_KviIrcServerOptionsWidget KviConnectionOptionsWidget
+//#define KVI_OPTIONS_WIDGET_NOPARENT_KviIrcServerOptionsWidget OptionsWidget_connection
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviIrcServerOptionsWidget 99000
 
-class KviIrcServerOptionsWidget : public KviOptionsWidget
+class OptionsWidget_servers : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviIrcServerOptionsWidget(QWidget * parent);
-	~KviIrcServerOptionsWidget();
+	OptionsWidget_servers(QWidget * parent);
+	~OptionsWidget_servers();
 protected:
 	QTreeWidget                  * m_pTreeWidget;
 	QLabel                       * m_pSrvNetLabel;
@@ -187,9 +187,9 @@ protected:
 	//QCheckBox                  * m_pIPv6Check;
 	QPushButton                  * m_pConnectCurrent;
 	QPushButton                  * m_pConnectNew;
-	KviIrcServerOptionsTreeWidgetItem * m_pLastEditedItem;
-	KviIrcServerDetailsWidget       * m_pServerDetailsDialog;
-	KviIrcNetworkDetailsWidget      * m_pNetworkDetailsDialog;
+	IrcServerOptionsTreeWidgetItem * m_pLastEditedItem;
+	IrcServerDetailsWidget       * m_pServerDetailsDialog;
+	IrcNetworkDetailsWidget      * m_pNetworkDetailsDialog;
 	KviMexServerImport           * m_pImportFilter;
 
 	QToolButton                  * m_pNewServerButton;
@@ -201,7 +201,7 @@ protected:
 private:
 	void fillServerList();
 	void saveLastItem();
-	KviIrcServerOptionsTreeWidgetItem * findNetItem(const QString &netname);
+	IrcServerOptionsTreeWidgetItem * findNetItem(const QString &netname);
 	void selectBestServerByUrl(const QString &szUrl);
 protected slots:
 	void importerDead();
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index c4c19c45b..c617a8ca4 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_sound.cpp
+//   File : OptionsWidget_sound.cpp
 //   Creation date : Fri Sep  6 02:18:23 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVsound sound client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_sound.h"
+#include "OptionsWidget_sound.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
@@ -42,17 +42,17 @@
 
 
 
-KviSoundOptionsWidget::KviSoundOptionsWidget(QWidget * pParent)
+OptionsWidget_sound::OptionsWidget_sound(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
 }
 
-KviSoundOptionsWidget::~KviSoundOptionsWidget()
+OptionsWidget_sound::~OptionsWidget_sound()
 {
 }
 
 
-KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
+OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	m_bFirstShow = true;
@@ -143,11 +143,11 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 }
 
 
-KviSoundGeneralOptionsWidget::~KviSoundGeneralOptionsWidget()
+OptionsWidget_soundGeneral::~OptionsWidget_soundGeneral()
 {
 }
 
-void KviSoundGeneralOptionsWidget::showEvent(QShowEvent *)
+void OptionsWidget_soundGeneral::showEvent(QShowEvent *)
 {
 	if(!m_bFirstShow)
 		return;
@@ -164,7 +164,7 @@ void KviSoundGeneralOptionsWidget::showEvent(QShowEvent *)
 	m_bFirstShow = false;
 }
 
-void KviSoundGeneralOptionsWidget::soundTest()
+void OptionsWidget_soundGeneral::soundTest()
 {
 	QString szSavedSoundSystem = KVI_OPTION_STRING(KviOption_stringSoundSystem);
 	KVI_OPTION_STRING(KviOption_stringSoundSystem) = m_pSoundSystemBox->currentText();
@@ -187,11 +187,11 @@ void KviSoundGeneralOptionsWidget::soundTest()
 	KVI_OPTION_STRING(KviOption_stringSoundSystem) = szSavedSoundSystem;
 }
 
-void KviSoundGeneralOptionsWidget::mediaTest()
+void OptionsWidget_soundGeneral::mediaTest()
 {
 }
 
-void KviSoundGeneralOptionsWidget::soundAutoDetect()
+void OptionsWidget_soundGeneral::soundAutoDetect()
 {
 	KviModule * m = g_pModuleManager->getModule("snd");
 	if(!m)
@@ -205,7 +205,7 @@ void KviSoundGeneralOptionsWidget::soundAutoDetect()
 	g_pApp->restoreOverrideCursor();
 }
 
-void KviSoundGeneralOptionsWidget::mediaAutoDetect()
+void OptionsWidget_soundGeneral::mediaAutoDetect()
 {
 	KviModule * m = g_pModuleManager->getModule("mediaplayer");
 	if(!m)
@@ -219,7 +219,7 @@ void KviSoundGeneralOptionsWidget::mediaAutoDetect()
 	g_pApp->restoreOverrideCursor();
 }
 
-void KviSoundGeneralOptionsWidget::soundFillBox()
+void OptionsWidget_soundGeneral::soundFillBox()
 {
 	QStringList l;
 	QStringList::Iterator it;
@@ -259,7 +259,7 @@ disable:
 	m_pSoundAutoDetectButton->setEnabled(false);
 }
 
-void KviSoundGeneralOptionsWidget::mediaFillBox()
+void OptionsWidget_soundGeneral::mediaFillBox()
 {
 	QStringList l;
 	QStringList::Iterator it;
@@ -294,7 +294,7 @@ disable:
 	m_pMediaAutoDetectButton->setEnabled(false);
 }
 
-void KviSoundGeneralOptionsWidget::commit()
+void OptionsWidget_soundGeneral::commit()
 {
 	// avoid to commit if we've never been shown (and initialized)
 	if(m_bFirstShow)
@@ -326,7 +326,7 @@ void KviSoundGeneralOptionsWidget::commit()
 #endif
 }
 
-KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent)
+OptionsWidget_sounds::OptionsWidget_sounds(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("sound_options_widget");
@@ -347,10 +347,10 @@ KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent)
 
 }
 
-KviSoundsOptionsWidget::~KviSoundsOptionsWidget()
+OptionsWidget_sounds::~OptionsWidget_sounds()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_sound.moc"
+#include "m_OptionsWidget_sound.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_sound.h b/src/modules/options/OptionsWidget_sound.h
index c7373bb2d..68e82cc5a 100644
--- a/src/modules/options/optw_sound.h
+++ b/src/modules/options/OptionsWidget_sound.h
@@ -2,7 +2,7 @@
 #define _OPTW_SOUND_H_
 //=============================================================================
 //
-//   File : optw_sound.h
+//   File : OptionsWidget_sound.h
 //   Creation date : Fri Sep  6 02:18:21 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,30 +31,30 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviSoundOptionsWidget KVI_SMALLICON_SOUND
 #define KVI_OPTIONS_WIDGET_NAME_KviSoundOptionsWidget __tr2qs_no_lookup("Sound")
-#define KVI_OPTIONS_WIDGET_PARENT_KviSoundOptionsWidget KviGeneralOptOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviSoundOptionsWidget OptionsWidget_general
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviSoundOptionsWidget true
 
 
-class KviSoundOptionsWidget : public KviOptionsWidget
+class OptionsWidget_sound : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviSoundOptionsWidget(QWidget * parent);
-	~KviSoundOptionsWidget();
+	OptionsWidget_sound(QWidget * parent);
+	~OptionsWidget_sound();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviSoundGeneralOptionsWidget KVI_SMALLICON_SOUND
 #define KVI_OPTIONS_WIDGET_NAME_KviSoundGeneralOptionsWidget __tr2qs_no_lookup("Sound System")
-#define KVI_OPTIONS_WIDGET_PARENT_KviSoundGeneralOptionsWidget KviSoundOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviSoundGeneralOptionsWidget OptionsWidget_sound
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundGeneralOptionsWidget __tr2qs_no_lookup("sound,xmms,audio,play,amarok")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviSoundGeneralOptionsWidget 70000
 
-class KviSoundGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_soundGeneral : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviSoundGeneralOptionsWidget(QWidget * parent);
-	~KviSoundGeneralOptionsWidget();
+	OptionsWidget_soundGeneral(QWidget * parent);
+	~OptionsWidget_soundGeneral();
 protected:
 	QComboBox * m_pSoundSystemBox;
 	QPushButton * m_pSoundTestButton;
@@ -82,16 +82,16 @@ protected slots:
 
 #define KVI_OPTIONS_WIDGET_ICON_KviSoundsOptionsWidget KVI_SMALLICON_SOUND
 #define KVI_OPTIONS_WIDGET_NAME_KviSoundsOptionsWidget __tr2qs_no_lookup("Sounds")
-#define KVI_OPTIONS_WIDGET_PARENT_KviSoundsOptionsWidget KviSoundOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviSoundsOptionsWidget OptionsWidget_sound
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviSoundsOptionsWidget __tr2qs_no_lookup("sound,events")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviSoundsOptionsWidget 80000
 
-class KviSoundsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_sounds : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviSoundsOptionsWidget(QWidget * parent);
-	~KviSoundsOptionsWidget();
+	OptionsWidget_sounds(QWidget * parent);
+	~OptionsWidget_sounds();
 };
 
 #endif //_OPTW_SOUND_H_
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp
index 4743b1fd4..d471466f0 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/OptionsWidget_textEncoding.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_textencoding.cpp
+//   File : OptionsWidget_textEncoding.cpp
 //   Creation date : Sat Aug 11 2001 03:29:52 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_textencoding.h"
+#include "OptionsWidget_textEncoding.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -35,7 +35,7 @@
 
 QString g_szPrevSettedLocale;
 
-KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
+OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("textencoding_options_widget");
@@ -124,11 +124,11 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
 	addRowSpacer(0,4,1,4);
 }
 
-KviTextEncodingOptionsWidget::~KviTextEncodingOptionsWidget()
+OptionsWidget_textEncoding::~OptionsWidget_textEncoding()
 {
 }
 
-void KviTextEncodingOptionsWidget::commit()
+void OptionsWidget_textEncoding::commit()
 {
 	int idx = m_pTextEncodingCombo->currentIndex();
 	if(idx <= 0)
@@ -165,5 +165,5 @@ void KviTextEncodingOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_textencoding.moc"
+#include "m_OptionsWidget_textEncoding.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_textencoding.h b/src/modules/options/OptionsWidget_textEncoding.h
index 9220bba09..d9d60eb9d 100644
--- a/src/modules/options/optw_textencoding.h
+++ b/src/modules/options/OptionsWidget_textEncoding.h
@@ -2,7 +2,7 @@
 #define _OPTW_TEXTENCODING_H_
 //=============================================================================
 //
-//   File : optw_textencoding.h
+//   File : OptionsWidget_textEncoding.h
 //   Creation date : Sat Mar 02 2002 12:09:19 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,15 +31,15 @@
 #define KVI_OPTIONS_WIDGET_ICON_KviTextEncodingOptionsWidget KVI_SMALLICON_TEXTENCODING
 #define KVI_OPTIONS_WIDGET_NAME_KviTextEncodingOptionsWidget __tr2qs_no_lookup("Language")
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviTextEncodingOptionsWidget 50000
-#define KVI_OPTIONS_WIDGET_PARENT_KviTextEncodingOptionsWidget KviGeneralOptOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTextEncodingOptionsWidget OptionsWidget_general
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTextEncodingOptionsWidget __tr2qs_no_lookup("language,encoding,charset,codepage")
 
-class KviTextEncodingOptionsWidget : public KviOptionsWidget
+class OptionsWidget_textEncoding : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTextEncodingOptionsWidget(QWidget * parent);
-	~KviTextEncodingOptionsWidget();
+	OptionsWidget_textEncoding(QWidget * parent);
+	~OptionsWidget_textEncoding();
 protected:
 	QString     m_szLanguage;
 	QComboBox * m_pTextEncodingCombo;
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index f2da5fd10..0c1e68a81 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_texticons.cpp
+//   File : OptionsWidget_textIcons.cpp
 //   Creation date : Fri May 24 2002 00:16:13 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_texticons.h"
+#include "OptionsWidget_textIcons.h"
 
 #include "KviIconManager.h"
 #include "KviTextIconManager.h"
@@ -35,7 +35,7 @@
 #include <QCursor>
 #include <QHeaderView>
 
-KviTextIconTableItem::KviTextIconTableItem(QTableWidget *,KviTextIcon * icon)
+TextIconTableItem::TextIconTableItem(QTableWidget *,KviTextIcon * icon)
 : QTableWidgetItem(QString(),Qt::ItemIsEditable)
 {
 	if(icon)
@@ -46,13 +46,13 @@ KviTextIconTableItem::KviTextIconTableItem(QTableWidget *,KviTextIcon * icon)
 	if(pix) setIcon(QIcon(*pix));
 }
 
-KviTextIconTableItem::~KviTextIconTableItem()
+TextIconTableItem::~TextIconTableItem()
 {
 	delete m_pIcon;
 
 }
 
-void KviTextIconTableItem::setId(int id)
+void TextIconTableItem::setId(int id)
 {
 	m_pIcon->setId(id);
 	QPixmap* pix=m_pIcon->pixmap();
@@ -60,7 +60,7 @@ void KviTextIconTableItem::setId(int id)
 }
 
 
-KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent)
+OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	m_pBox=0;
@@ -106,7 +106,7 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent)
 	fillTable();
 }
 
-KviTextIconsOptionsWidget::~KviTextIconsOptionsWidget()
+OptionsWidget_textIcons::~OptionsWidget_textIcons()
 {
 	if(m_pIconButton)
 		delete m_pIconButton;
@@ -116,7 +116,7 @@ KviTextIconsOptionsWidget::~KviTextIconsOptionsWidget()
 		delete m_pBox;
 }
 
-void KviTextIconsOptionsWidget::fillTable()
+void OptionsWidget_textIcons::fillTable()
 {
 	KviPointerHashTableIterator<QString,KviTextIcon> it(*(g_pTextIconManager->textIconDict()));
 
@@ -129,7 +129,7 @@ void KviTextIconsOptionsWidget::fillTable()
 	
 	int idx = 0;
 	QTableWidgetItem *item0;
-	KviTextIconTableItem *item1;
+	TextIconTableItem *item1;
 	while(KviTextIcon * i = it.current())
 	{
 		if(!m_pTable->item(idx,0))
@@ -138,7 +138,7 @@ void KviTextIconsOptionsWidget::fillTable()
 			m_pTable->setItem(idx,0,item0);
 		}
 
-		item1 = new KviTextIconTableItem(m_pTable,new KviTextIcon(i));
+		item1 = new TextIconTableItem(m_pTable,new KviTextIcon(i));
 		//remove from the item the ability to be edited as text
 		item1->setFlags(item1->flags() ^ Qt::ItemIsEditable);
 		m_pTable->setItem(idx,1,item1);
@@ -151,7 +151,7 @@ void KviTextIconsOptionsWidget::fillTable()
 	m_pDel->setEnabled(false);
 }
 
-void KviTextIconsOptionsWidget::doPopup()
+void OptionsWidget_textIcons::doPopup()
 {
 	if(!m_pPopup)
 	{
@@ -163,14 +163,14 @@ void KviTextIconsOptionsWidget::doPopup()
 	m_pPopup->popup(QCursor::pos());
 }
 
-void KviTextIconsOptionsWidget::iconSelected(int id)
+void OptionsWidget_textIcons::iconSelected(int id)
 {
 	m_pItem->icon()->setId(id);
 	m_pItem->setIcon(QIcon(*m_pItem->icon()->pixmap()));
 	m_pIconButton->setIcon(QIcon(*m_pItem->icon()->pixmap()));
 }
 
-void KviTextIconsOptionsWidget::chooseFromFile()
+void OptionsWidget_textIcons::chooseFromFile()
 {
 	QString szFile;
 	KviFileDialog::askForOpenFileName(szFile,"Choose icon filename",QString(),KVI_FILTER_IMAGE,"options");
@@ -184,17 +184,17 @@ void KviTextIconsOptionsWidget::chooseFromFile()
 		}
 	}
 }
-void KviTextIconsOptionsWidget::itemSelectionChanged()
+void OptionsWidget_textIcons::itemSelectionChanged()
 {
 	int i = m_pTable->currentRow();
 	m_pDel->setEnabled(i >= 0 && i < m_pTable->rowCount());
 }
-void KviTextIconsOptionsWidget::itemClicked(QTableWidgetItem *i)
+void OptionsWidget_textIcons::itemClicked(QTableWidgetItem *i)
 {
 	if (i->column()!=1) return;
 	if (m_iLastEditedRow==i->row()) return;
 
-	m_pItem=(KviTextIconTableItem *)i;
+	m_pItem=(TextIconTableItem *)i;
 
 	if(m_pIconButton)
 		delete m_pIconButton;
@@ -220,22 +220,22 @@ void KviTextIconsOptionsWidget::itemClicked(QTableWidgetItem *i)
 	m_iLastEditedRow=i->row();
 }
 
-void KviTextIconsOptionsWidget::addClicked()
+void OptionsWidget_textIcons::addClicked()
 {
 	m_pTable->setRowCount(m_pTable->rowCount() + 1);
 	m_pTable->setItem(m_pTable->rowCount() - 1,0,new QTableWidgetItem(__tr2qs_ctx("unnamed","options")));
-	m_pTable->setItem(m_pTable->rowCount() - 1,1,new KviTextIconTableItem(m_pTable,0));
+	m_pTable->setItem(m_pTable->rowCount() - 1,1,new TextIconTableItem(m_pTable,0));
 	m_pTable->scrollToBottom();
 	m_pDel->setEnabled(true);
 }
 
-void KviTextIconsOptionsWidget::restoreClicked()
+void OptionsWidget_textIcons::restoreClicked()
 {
 	g_pTextIconManager->checkDefaultAssociations();
 	fillTable();
 }
 
-void KviTextIconsOptionsWidget::delClicked()
+void OptionsWidget_textIcons::delClicked()
 {
 	int i = m_pTable->currentRow();
 
@@ -261,7 +261,7 @@ void KviTextIconsOptionsWidget::delClicked()
 	}
 }
 
-void KviTextIconsOptionsWidget::commit()
+void OptionsWidget_textIcons::commit()
 {
 
 	KviOptionsWidget::commit();
@@ -272,7 +272,7 @@ void KviTextIconsOptionsWidget::commit()
 		QString szVal = m_pTable->item(i,0)->text();
 		if(!szVal.isEmpty())
 		{
-			KviTextIconTableItem * it = (KviTextIconTableItem *)m_pTable->item(i,1);
+			TextIconTableItem * it = (TextIconTableItem *)m_pTable->item(i,1);
 			if(it)
 			{
 				g_pTextIconManager->insert(szVal,*(it->icon()));
@@ -287,5 +287,5 @@ void KviTextIconsOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_texticons.moc"
+#include "m_OptionsWidget_textIcons.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/OptionsWidget_textIcons.h
index 6fe18e55e..b53dcad93 100644
--- a/src/modules/options/optw_texticons.h
+++ b/src/modules/options/OptionsWidget_textIcons.h
@@ -2,7 +2,7 @@
 #define _OPTW_TEXTICONS_H_
 //=============================================================================
 //
-//   File : optw_texticons.h
+//   File : OptionsWidget_textIcons.h
 //   Creation date : Fri May 24 2002 00:14:02 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -33,19 +33,19 @@
 #include <QTableWidget>
 #include <QTableWidgetItem>
 
-class KviTextIconTableItem;
+class TextIconTableItem;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTextIconsOptionsWidget KVI_SMALLICON_BIGGRIN
 #define KVI_OPTIONS_WIDGET_NAME_KviTextIconsOptionsWidget __tr2qs_no_lookup("Text icons")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTextIconsOptionsWidget KviToolsOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTextIconsOptionsWidget OptionsWidget_tools
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTextIconsOptionsWidget __tr2qs_no_lookup("smileys,emoticons")
 
-class KviTextIconTableItem : public QTableWidgetItem
+class TextIconTableItem : public QTableWidgetItem
 {
-	friend class KviTextIconsOptionsWidget;
+	friend class OptionsWidget_textIcons;
 public:
-	KviTextIconTableItem(QTableWidget * t,KviTextIcon * icon);
-	~KviTextIconTableItem();
+	TextIconTableItem(QTableWidget * t,KviTextIcon * icon);
+	~TextIconTableItem();
 protected:
 	KviTextIcon * m_pIcon;
 public:
@@ -54,16 +54,16 @@ public:
 
 };
 
-class KviTextIconsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_textIcons : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTextIconsOptionsWidget(QWidget * parent);
-	~KviTextIconsOptionsWidget();
+	OptionsWidget_textIcons(QWidget * parent);
+	~OptionsWidget_textIcons();
 protected:
 	QTableWidget * m_pTable;
 	int m_iLastEditedRow;
-	KviTextIconTableItem *m_pItem;
+	TextIconTableItem *m_pItem;
 	QPushButton  * m_pAdd;
 	QPushButton  * m_pDel;
 	QPushButton  * m_pRestore;
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/OptionsWidget_theme.cpp
index 780adf84f..f2518fd1d 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/OptionsWidget_theme.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_interfacelookglobal.cpp
+//   File : OptionsWidget_theme.cpp
 //   Creation date : Sun Jun 3 2001 20:50:13 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_interfacelookglobal.h"
+#include "OptionsWidget_theme.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -34,7 +34,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(QWidget * parent)
+OptionsWidget_theme::OptionsWidget_theme(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -50,14 +50,14 @@ KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(QWidget * parent)
 	addRowSpacer(0,3,1,3);
 }
 
-KviThemeGeneralOptionsWidget::~KviThemeGeneralOptionsWidget()
+OptionsWidget_theme::~OptionsWidget_theme()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * parent)
+OptionsWidget_themeTransparency::OptionsWidget_themeTransparency(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -136,11 +136,11 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * p
 #endif
 }
 
-KviThemeTransparencyOptionsWidget::~KviThemeTransparencyOptionsWidget()
+OptionsWidget_themeTransparency::~OptionsWidget_themeTransparency()
 {
 }
 
-void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(bool)
+void OptionsWidget_themeTransparency::enableGlobalBackgroundPixmapSelector(bool)
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	#ifdef COMPILE_X11_SUPPORT
@@ -156,7 +156,7 @@ void KviThemeTransparencyOptionsWidget::enableGlobalBackgroundPixmapSelector(boo
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(QWidget * parent)
+OptionsWidget_themeMdiArea::OptionsWidget_themeMdiArea(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -167,14 +167,14 @@ KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(1,1);
 }
 
-KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
+OptionsWidget_themeMdiArea::~OptionsWidget_themeMdiArea()
 {
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(QWidget * parent)
+OptionsWidget_themeToolBarApplets::OptionsWidget_themeToolBarApplets(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -194,11 +194,11 @@ KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(QWidget
 	layout()->setRowStretch(8,1);
 }
 
-KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget()
+OptionsWidget_themeToolBarApplets::~OptionsWidget_themeToolBarApplets()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_interfacelookglobal.moc"
+#include "m_OptionsWidget_theme.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/OptionsWidget_theme.h
index 773c26e53..0196ad816 100644
--- a/src/modules/options/optw_interfacelookglobal.h
+++ b/src/modules/options/OptionsWidget_theme.h
@@ -2,7 +2,7 @@
 #define _OPTW_INTERFACELOOKGLOBAL_H_
 //=============================================================================
 //
-//   File : optw_interfacelookglobal.h
+//   File : OptionsWidget_theme.h
 //   Creation date : Sun Jun 3 2001 20:49:02 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -35,12 +35,12 @@
 #define KVI_OPTIONS_WIDGET_GROUP_KviThemeGeneralOptionsWidget "theme"
 
 
-class KviThemeGeneralOptionsWidget : public KviOptionsWidget
+class OptionsWidget_theme : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviThemeGeneralOptionsWidget(QWidget * parent);
-	~KviThemeGeneralOptionsWidget();
+	OptionsWidget_theme(QWidget * parent);
+	~OptionsWidget_theme();
 };
 
 
@@ -50,12 +50,12 @@ public:
 #define KVI_OPTIONS_WIDGET_GROUP_KviThemeTransparencyOptionsWidget "theme"
 
 
-class KviThemeTransparencyOptionsWidget : public KviOptionsWidget
+class OptionsWidget_themeTransparency : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviThemeTransparencyOptionsWidget(QWidget * parent);
-	~KviThemeTransparencyOptionsWidget();
+	OptionsWidget_themeTransparency(QWidget * parent);
+	~OptionsWidget_themeTransparency();
 protected:
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	KviPixmapSelector * m_pGlobalBackgroundPixmapSelector;
@@ -75,12 +75,12 @@ protected slots:
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviThemeMdiAreaOptionsWidget __tr2qs_no_lookup("theme,mdi")
 #define KVI_OPTIONS_WIDGET_GROUP_KviThemeMdiAreaOptionsWidget "theme"
 
-class KviThemeMdiAreaOptionsWidget : public KviOptionsWidget
+class OptionsWidget_themeMdiArea : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviThemeMdiAreaOptionsWidget(QWidget * parent);
-	~KviThemeMdiAreaOptionsWidget();
+	OptionsWidget_themeMdiArea(QWidget * parent);
+	~OptionsWidget_themeMdiArea();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviThemeToolBarAppletsOptionsWidget KVI_SMALLICON_APPLET
@@ -89,12 +89,12 @@ public:
 #define KVI_OPTIONS_WIDGET_GROUP_KviThemeToolBarAppletsOptionsWidget "theme"
 
 
-class KviThemeToolBarAppletsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_themeToolBarApplets : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviThemeToolBarAppletsOptionsWidget(QWidget * parent);
-	~KviThemeToolBarAppletsOptionsWidget();
+	OptionsWidget_themeToolBarApplets(QWidget * parent);
+	~OptionsWidget_themeToolBarApplets();
 };
 
 #endif //!_OPTW_INTERFACELOOKGLOBAL_H_
diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp
index ebd588bdc..2f5015fa7 100644
--- a/src/modules/options/optw_tools.cpp
+++ b/src/modules/options/OptionsWidget_tools.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_tools.cpp
+//   File : OptionsWidget_tools.cpp
 //   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_tools.h"
+#include "OptionsWidget_tools.h"
 
 #include "kvi_settings.h"
 #include "KviOptions.h"
@@ -30,7 +30,7 @@
 
 #include <QLayout>
 
-KviToolsOptionsWidget::KviToolsOptionsWidget(QWidget * parent)
+OptionsWidget_tools::OptionsWidget_tools(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("tools_options_widget");
@@ -42,10 +42,10 @@ KviToolsOptionsWidget::KviToolsOptionsWidget(QWidget * parent)
 
 }
 
-KviToolsOptionsWidget::~KviToolsOptionsWidget()
+OptionsWidget_tools::~OptionsWidget_tools()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_tools.moc"
+#include "m_OptionsWidget_tools.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_tools.h b/src/modules/options/OptionsWidget_tools.h
index d407d0187..53b7193fb 100644
--- a/src/modules/options/optw_tools.h
+++ b/src/modules/options/OptionsWidget_tools.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : optw_tools.h
+//   File : OptionsWidget_tools.h
 //   Creation date : Wed Ott 19 16:15:16 2005 GMT by Grifisx & Noldor
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,16 +31,16 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviToolsOptionsWidget KVI_SMALLICON_ADDONS
 #define KVI_OPTIONS_WIDGET_NAME_KviToolsOptionsWidget __tr2qs_no_lookup("Tools")
-#define KVI_OPTIONS_WIDGET_PARENT_KviToolsOptionsWidget KviIrcOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviToolsOptionsWidget OptionsWidget_irc
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviToolsOptionsWidget 50000
 #define KVI_OPTIONS_WIDGET_NOTCONTAINED_KviToolsOptionsWidget true
 
-class KviToolsOptionsWidget : public KviOptionsWidget
+class OptionsWidget_tools : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviToolsOptionsWidget(QWidget * parent);
-	~KviToolsOptionsWidget();
+	OptionsWidget_tools(QWidget * parent);
+	~OptionsWidget_tools();
 };
 
 #endif //!_OPTW_FOLDERS_H_
diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/OptionsWidget_topicLabel.cpp
index 2dde27d19..b305771ee 100644
--- a/src/modules/options/optw_topiclabel.cpp
+++ b/src/modules/options/OptionsWidget_topicLabel.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_topiclabel.cpp
+//   File : OptionsWidget_topicLabel.cpp
 //   Creation date : Mon Sep 24 02:44:55 CEST 2001 by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,13 +23,13 @@
 //
 //=============================================================================
 
-#include "optw_topiclabel.h"
+#include "OptionsWidget_topicLabel.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
 
 
-KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOptionsWidget(p, "topic_label_look_options_widget")
+OptionsWidget_topicLabel::OptionsWidget_topicLabel(QWidget *p):KviOptionsWidget(p, "topic_label_look_options_widget")
 {
 	createLayout();
 
@@ -41,10 +41,10 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOp
 	layout()->setRowStretch(3, 1);
 }
 
-KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget()
+OptionsWidget_topicLabel::~OptionsWidget_topicLabel()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_topiclabel.moc"
+#include "m_OptionsWidget_topicLabel.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_topiclabel.h b/src/modules/options/OptionsWidget_topicLabel.h
index 3f3690525..4f6c64f40 100644
--- a/src/modules/options/optw_topiclabel.h
+++ b/src/modules/options/OptionsWidget_topicLabel.h
@@ -2,7 +2,7 @@
 #define _OPTW_TOPICLABEL_H
 //=============================================================================
 //
-//   File : optw_topiclabel.h
+//   File : OptionsWidget_topicLabel.h
 //   Creation date : Mon Sep 24 02:44:55 CEST 2001 by Krzysztof Godlewski
 //
 //   This file is part of the KVIrc irc client distribution
@@ -33,12 +33,12 @@
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTopicLabelLookOptionsWidget __tr2qs_no_lookup("theme,topic")
 #define KVI_OPTIONS_WIDGET_GROUP_KviTopicLabelLookOptionsWidget "theme"
 
-class KviTopicLabelLookOptionsWidget : public KviOptionsWidget
+class OptionsWidget_topicLabel : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTopicLabelLookOptionsWidget(QWidget *);
-	~KviTopicLabelLookOptionsWidget();
+	OptionsWidget_topicLabel(QWidget *);
+	~OptionsWidget_topicLabel();
 };
 
 #endif // _OPTW_TOPICLABEL_H
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp
index 992abe31c..49d54f1c6 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/OptionsWidget_tray.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_tray.cpp
+//   File : OptionsWidget_tray.cpp
 //   Creation date : Mon 14 Aug 2006 by Alexey Uzhva
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_tray.h"
+#include "OptionsWidget_tray.h"
 
 #include "KviMainWindow.h"
 #include "KviInternalCommand.h"
@@ -33,7 +33,7 @@
 #include <QLayout>
 
 
-KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
+OptionsWidget_tray::OptionsWidget_tray(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("tray_options_widget");
@@ -63,11 +63,11 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
 	setEnabled(true);
 }
 
-KviTrayOptionsWidget::~KviTrayOptionsWidget()
+OptionsWidget_tray::~OptionsWidget_tray()
 {
 }
 
-void KviTrayOptionsWidget::setEnabled(bool)
+void OptionsWidget_tray::setEnabled(bool)
 {
 	if(m_pEnable->isChecked())
 	{
@@ -97,5 +97,5 @@ void KviTrayOptionsWidget::setEnabled(bool)
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_tray.moc"
+#include "m_OptionsWidget_tray.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_tray.h b/src/modules/options/OptionsWidget_tray.h
index 43dd4dcdf..8d79c8186 100644
--- a/src/modules/options/optw_tray.h
+++ b/src/modules/options/OptionsWidget_tray.h
@@ -2,7 +2,7 @@
 #define _OPTW_TRAY_H_
 //=============================================================================
 //
-//   File : optw_tray.cpp
+//   File : OptionsWidget_tray.cpp
 //   Creation date : Mon 14 Aug 2006 by Alexey Uzhva
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,15 +30,15 @@
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTrayOptionsWidget KVI_SMALLICON_TRAYICON
 #define KVI_OPTIONS_WIDGET_NAME_KviTrayOptionsWidget __tr2qs_no_lookup("Tray icon")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTrayOptionsWidget KviInterfaceFeaturesOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTrayOptionsWidget OptionsWidget_interfaceFeatures
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTrayOptionsWidget __tr2qs_no_lookup("tray,TRAYICON")
 
-class KviTrayOptionsWidget : public KviOptionsWidget
+class OptionsWidget_tray : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTrayOptionsWidget(QWidget * parent);
-	~KviTrayOptionsWidget();
+	OptionsWidget_tray(QWidget * parent);
+	~OptionsWidget_tray();
 protected:
 	KviBoolSelector * m_pEnable;
 	KviBoolSelector * m_pEnableFlashing;
diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/OptionsWidget_uparser.cpp
index 05fd1044f..88710b992 100644
--- a/src/modules/options/optw_uparser.cpp
+++ b/src/modules/options/OptionsWidget_uparser.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_uparser.cpp
+//   File : OptionsWidget_uparser.cpp
 //   Creation date : Sat Oct 27 16:32:26 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_uparser.h"
+#include "OptionsWidget_uparser.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -31,7 +31,7 @@
 #include <QLabel>
 
 
-KviUParserOptionsWidget::KviUParserOptionsWidget(QWidget * parent)
+OptionsWidget_uparser::OptionsWidget_uparser(QWidget * parent)
 : KviOptionsWidget(parent,"uparser_options_widget")
 {
 	createLayout();
@@ -54,11 +54,11 @@ KviUParserOptionsWidget::KviUParserOptionsWidget(QWidget * parent)
 	addRowSpacer(0,10,0,10);
 }
 
-KviUParserOptionsWidget::~KviUParserOptionsWidget()
+OptionsWidget_uparser::~OptionsWidget_uparser()
 {
 }
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_uparser.moc"
+#include "m_OptionsWidget_uparser.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_uparser.h b/src/modules/options/OptionsWidget_uparser.h
index 7ba0fc281..9b7009d43 100644
--- a/src/modules/options/optw_uparser.h
+++ b/src/modules/options/OptionsWidget_uparser.h
@@ -2,7 +2,7 @@
 #define _OPTW_UPARSER_H_
 //=============================================================================
 //
-//   File : optw_uparser.h
+//   File : OptionsWidget_uparser.h
 //   Creation date : Sat Oct 27 16:32:27 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -29,14 +29,14 @@
 #define KVI_OPTIONS_WIDGET_ICON_KviUParserOptionsWidget KVI_SMALLICON_PARSERWARNING
 #define KVI_OPTIONS_WIDGET_NAME_KviUParserOptionsWidget __tr2qs_no_lookup("Scripting Engine")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUParserOptionsWidget __tr2qs_no_lookup("scripting,kvs,debug")
-#define KVI_OPTIONS_WIDGET_PARENT_KviUParserOptionsWidget KviGeneralOptOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUParserOptionsWidget OptionsWidget_general
 
-class KviUParserOptionsWidget : public KviOptionsWidget
+class OptionsWidget_uparser : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUParserOptionsWidget(QWidget * parent);
-	~KviUParserOptionsWidget();
+	OptionsWidget_uparser(QWidget * parent);
+	~OptionsWidget_uparser();
 };
 
 #endif //_OPTW_UPARSER_H_
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/OptionsWidget_urlHandlers.cpp
index aa56fbeb8..6651125e9 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/OptionsWidget_urlHandlers.cpp
@@ -2,7 +2,7 @@
 #define _OPTW_URLHANDLERS_CPP_
 //=============================================================================
 //
-//   File : optw_urlhandlers.cpp
+//   File : OptionsWidget_urlHandlers.cpp
 //   Creation date : Fri Aug 23 02:57:40 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "optw_urlhandlers.h"
+#include "OptionsWidget_urlHandlers.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -34,7 +34,7 @@
 #include <QRadioButton>
 
 
-KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent)
+OptionsWidget_urlHandlers::OptionsWidget_urlHandlers(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
@@ -89,11 +89,11 @@ KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent)
 	addRowSpacer(0,START_ROW+6,0,START_ROW+6);
 }
 
-KviUrlHandlersOptionsWidget::~KviUrlHandlersOptionsWidget()
+OptionsWidget_urlHandlers::~OptionsWidget_urlHandlers()
 {
 }
 
-void KviUrlHandlersOptionsWidget::toggleEditors(bool bToggled)
+void OptionsWidget_urlHandlers::toggleEditors(bool bToggled)
 {
 	m_pHttpHandler->setEnabled(!bToggled);
 	m_pHttpsHandler->setEnabled(!bToggled);
@@ -103,7 +103,7 @@ void KviUrlHandlersOptionsWidget::toggleEditors(bool bToggled)
 	m_pOtherHandler->setEnabled(!bToggled);
 }
 
-void KviUrlHandlersOptionsWidget::commit()
+void OptionsWidget_urlHandlers::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -148,7 +148,7 @@ void KviUrlHandlersOptionsWidget::commit()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_urlhandlers.moc"
+#include "m_OptionsWidget_urlHandlers.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif //_OPTW_URLHANDLERS_CPP_
diff --git a/src/modules/options/optw_urlhandlers.h b/src/modules/options/OptionsWidget_urlHandlers.h
index ae7da9a11..99a5e0b9e 100644
--- a/src/modules/options/optw_urlhandlers.h
+++ b/src/modules/options/OptionsWidget_urlHandlers.h
@@ -2,7 +2,7 @@
 #define _OPTW_URLHANDLERS_H_
 //=============================================================================
 //
-//   File : optw_urlhandlers.h
+//   File : OptionsWidget_urlHandlers.h
 //   Creation date : Fri Aug 23 02:57:41 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,16 +30,16 @@ class QRadioButton;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviUrlHandlersOptionsWidget KVI_SMALLICON_WORLD
 #define KVI_OPTIONS_WIDGET_NAME_KviUrlHandlersOptionsWidget __tr2qs_no_lookup("URL handlers")
-#define KVI_OPTIONS_WIDGET_PARENT_KviUrlHandlersOptionsWidget KviGeneralOptOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUrlHandlersOptionsWidget OptionsWidget_general
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviUrlHandlersOptionsWidget 70000
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUrlHandlersOptionsWidget __tr2qs_no_lookup("url,programs")
 
-class KviUrlHandlersOptionsWidget : public KviOptionsWidget
+class OptionsWidget_urlHandlers : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUrlHandlersOptionsWidget(QWidget * parent);
-	~KviUrlHandlersOptionsWidget();
+	OptionsWidget_urlHandlers(QWidget * parent);
+	~OptionsWidget_urlHandlers();
 
 	virtual void commit();
 protected:
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/OptionsWidget_userList.cpp
index f1349e0ae..27a8d1344 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/OptionsWidget_userList.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_userlist.cpp
+//   File : OptionsWidget_userList.cpp
 //   Creation date : Sat Aug 11 2001 03:29:52 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "optw_userlist.h"
+#include "OptionsWidget_userList.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -30,12 +30,12 @@
 
 #include <QLayout>
 
-KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(QWidget * parent)
+OptionsWidget_userList::OptionsWidget_userList(QWidget * parent)
 : KviOptionsWidget(parent,"userlistlook_options_widget")
 {
 }
 
-KviUserListLookOptionsWidget::~KviUserListLookOptionsWidget()
+OptionsWidget_userList::~OptionsWidget_userList()
 {
 }
 
@@ -44,7 +44,7 @@ KviUserListLookOptionsWidget::~KviUserListLookOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(QWidget * parent)
+OptionsWidget_userListForeground::OptionsWidget_userListForeground(QWidget * parent)
 : KviOptionsWidget(parent,"userlistlook_foreground_options_widget")
 {
 	createLayout();
@@ -72,11 +72,11 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(Q
 	addRowSpacer(0,3,0,3);
 }
 
-KviUserListLookForegroundOptionsWidget::~KviUserListLookForegroundOptionsWidget()
+OptionsWidget_userListForeground::~OptionsWidget_userListForeground()
 {
 }
 
-KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(QWidget * parent)
+OptionsWidget_userListGrid::OptionsWidget_userListGrid(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	createLayout();
@@ -103,11 +103,11 @@ KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(QWidget * parent)
 	addRowSpacer(0,3,0,3);
 }
 
-KviUserListGridOptionsWidget::~KviUserListGridOptionsWidget()
+OptionsWidget_userListGrid::~OptionsWidget_userListGrid()
 {
 }
 
-void KviUserListGridOptionsWidget::commit()
+void OptionsWidget_userListGrid::commit()
 {
 	KviOptionsWidget::commit();
 	KVI_OPTION_UINT(KviOption_uintUserListViewGridType) = m_pGridTypeCombo->currentIndex();
@@ -118,7 +118,7 @@ void KviUserListGridOptionsWidget::commit()
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(QWidget * parent)
+OptionsWidget_userListBackground::OptionsWidget_userListBackground(QWidget * parent)
 : KviOptionsWidget(parent,"userlistlook_background_options_widget")
 {
 	createLayout();
@@ -184,11 +184,11 @@ KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(Q
 	layout()->setRowStretch(1,1);
 }
 
-KviUserListLookBackgroundOptionsWidget::~KviUserListLookBackgroundOptionsWidget()
+OptionsWidget_userListBackground::~OptionsWidget_userListBackground()
 {
 }
 
-void KviUserListLookBackgroundOptionsWidget::commit()
+void OptionsWidget_userListBackground::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -224,7 +224,7 @@ void KviUserListLookBackgroundOptionsWidget::commit()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(QWidget * parent)
+OptionsWidget_userListFeatures::OptionsWidget_userListFeatures(QWidget * parent)
 : KviOptionsWidget(parent,"userlistfeatures_options_widget")
 {
 	createLayout();
@@ -241,10 +241,10 @@ KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(QWidget * par
 	addRowSpacer(0,8,0,8);
 }
 
-KviUserListFeaturesOptionsWidget::~KviUserListFeaturesOptionsWidget()
+OptionsWidget_userListFeatures::~OptionsWidget_userListFeatures()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_userlist.moc"
+#include "m_OptionsWidget_userList.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_userlist.h b/src/modules/options/OptionsWidget_userList.h
index f250d89d9..63b0ceff3 100644
--- a/src/modules/options/optw_userlist.h
+++ b/src/modules/options/OptionsWidget_userList.h
@@ -2,7 +2,7 @@
 #define _OPTW_USERLIST_H_
 //=============================================================================
 //
-//   File : optw_userlist.h
+//   File : OptionsWidget_userList.h
 //   Creation date : Sat Mar 02 2002 12:09:19 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -34,28 +34,28 @@
 #define KVI_OPTIONS_WIDGET_GROUP_KviUserListLookOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviUserListLookOptionsWidget true
 
-class KviUserListLookOptionsWidget : public KviOptionsWidget
+class OptionsWidget_userList : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUserListLookOptionsWidget(QWidget * parent);
-	~KviUserListLookOptionsWidget();
+	OptionsWidget_userList(QWidget * parent);
+	~OptionsWidget_userList();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviUserListLookBackgroundOptionsWidget KVI_SMALLICON_TRANSPARENT
 #define KVI_OPTIONS_WIDGET_NAME_KviUserListLookBackgroundOptionsWidget __tr2qs_no_lookup("Background")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookBackgroundOptionsWidget __tr2qs_no_lookup("theme,userlist,channel,background")
 #define KVI_OPTIONS_WIDGET_GROUP_KviUserListLookBackgroundOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviUserListLookBackgroundOptionsWidget KviUserListLookOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUserListLookBackgroundOptionsWidget OptionsWidget_userList
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviUserListLookBackgroundOptionsWidget 30
 
 
-class KviUserListLookBackgroundOptionsWidget : public KviOptionsWidget
+class OptionsWidget_userListBackground : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUserListLookBackgroundOptionsWidget(QWidget * parent);
-	~KviUserListLookBackgroundOptionsWidget();
+	OptionsWidget_userListBackground(QWidget * parent);
+	~OptionsWidget_userListBackground();
 protected:
 	QComboBox* m_pHorizontalAlign;
 	QComboBox* m_pVerticalAlign;
@@ -67,32 +67,32 @@ public:
 #define KVI_OPTIONS_WIDGET_NAME_KviUserListLookForegroundOptionsWidget __tr2qs_no_lookup("Foreground")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListLookForegroundOptionsWidget __tr2qs_no_lookup("theme,userlist,channel,colors")
 #define KVI_OPTIONS_WIDGET_GROUP_KviUserListLookForegroundOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviUserListLookForegroundOptionsWidget KviUserListLookOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUserListLookForegroundOptionsWidget OptionsWidget_userList
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviUserListLookForegroundOptionsWidget 20
 
 
-class KviUserListLookForegroundOptionsWidget : public KviOptionsWidget
+class OptionsWidget_userListForeground : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUserListLookForegroundOptionsWidget(QWidget * parent);
-	~KviUserListLookForegroundOptionsWidget();
+	OptionsWidget_userListForeground(QWidget * parent);
+	~OptionsWidget_userListForeground();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviUserListGridOptionsWidget KVI_SMALLICON_GUI
 #define KVI_OPTIONS_WIDGET_NAME_KviUserListGridOptionsWidget __tr2qs_no_lookup("Nickname Grid")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListGridOptionsWidget __tr2qs_no_lookup("theme,userlist,channel,grid")
 #define KVI_OPTIONS_WIDGET_GROUP_KviUserListGridOptionsWidget "theme"
-#define KVI_OPTIONS_WIDGET_PARENT_KviUserListGridOptionsWidget KviUserListLookOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUserListGridOptionsWidget OptionsWidget_userList
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviUserListGridOptionsWidget 30
 
 
-class KviUserListGridOptionsWidget : public KviOptionsWidget
+class OptionsWidget_userListGrid : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUserListGridOptionsWidget(QWidget * parent);
-	~KviUserListGridOptionsWidget();
+	OptionsWidget_userListGrid(QWidget * parent);
+	~OptionsWidget_userListGrid();
 protected:
 	QComboBox * m_pGridTypeCombo;
 public:
@@ -102,15 +102,15 @@ public:
 #define KVI_OPTIONS_WIDGET_ICON_KviUserListFeaturesOptionsWidget KVI_SMALLICON_GUI
 #define KVI_OPTIONS_WIDGET_NAME_KviUserListFeaturesOptionsWidget __tr2qs_no_lookup("Features")
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviUserListFeaturesOptionsWidget __tr2qs_no_lookup("userlist,channel")
-#define KVI_OPTIONS_WIDGET_PARENT_KviUserListFeaturesOptionsWidget KviUserListLookOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviUserListFeaturesOptionsWidget OptionsWidget_userList
 #define KVI_OPTIONS_WIDGET_PRIORITY_KviUserListFeaturesOptionsWidget 10
 
-class KviUserListFeaturesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_userListFeatures : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviUserListFeaturesOptionsWidget(QWidget * parent);
-	~KviUserListFeaturesOptionsWidget();
+	OptionsWidget_userListFeatures(QWidget * parent);
+	~OptionsWidget_userListFeatures();
 };
 
 #endif //!_OPTW_USERLIST_H_
diff --git a/src/modules/options/optw_windowlist.cpp b/src/modules/options/OptionsWidget_windowList.cpp
index d3cb828fa..53b61c8a9 100644
--- a/src/modules/options/optw_windowlist.cpp
+++ b/src/modules/options/OptionsWidget_windowList.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : optw_windowlist.cpp
+//   File : OptionsWidget_windowList.cpp
 //   Creation date : Wed Jan 16 04:30:39 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "optw_windowlist.h"
+#include "OptionsWidget_windowList.h"
 
 #include "kvi_settings.h"
 #include "KviLocale.h"
 #include "KviOptions.h"
 
 
-KviWindowListOptionsWidget::KviWindowListOptionsWidget(QWidget * parent)
+OptionsWidget_windowList::OptionsWidget_windowList(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("windowlist_options_widget");
@@ -54,7 +54,7 @@ KviWindowListOptionsWidget::KviWindowListOptionsWidget(QWidget * parent)
 }
 
 
-KviWindowListOptionsWidget::~KviWindowListOptionsWidget()
+OptionsWidget_windowList::~OptionsWidget_windowList()
 {
 }
 
@@ -62,20 +62,20 @@ KviWindowListOptionsWidget::~KviWindowListOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeWindowListOptionsWidget::KviTreeWindowListOptionsWidget(QWidget * parent)
+OptionsWidget_windowListTree::OptionsWidget_windowListTree(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("treewindowlist_options_widget");
 }
 
-KviTreeWindowListOptionsWidget::~KviTreeWindowListOptionsWidget()
+OptionsWidget_windowListTree::~OptionsWidget_windowListTree()
 {
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeWindowListForegroundOptionsWidget::KviTreeWindowListForegroundOptionsWidget(QWidget * parent)
+OptionsWidget_windowListTreeForeground::OptionsWidget_windowListTreeForeground(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("treewindowlist_options_widget");
@@ -100,7 +100,7 @@ KviTreeWindowListForegroundOptionsWidget::KviTreeWindowListForegroundOptionsWidg
 }
 
 
-KviTreeWindowListForegroundOptionsWidget::~KviTreeWindowListForegroundOptionsWidget()
+OptionsWidget_windowListTreeForeground::~OptionsWidget_windowListTreeForeground()
 {
 }
 
@@ -109,7 +109,7 @@ KviTreeWindowListForegroundOptionsWidget::~KviTreeWindowListForegroundOptionsWid
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeWindowListBackgroundOptionsWidget::KviTreeWindowListBackgroundOptionsWidget(QWidget * parent)
+OptionsWidget_windowListTreeBackground::OptionsWidget_windowListTreeBackground(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("treewindowlist_options_widget");
@@ -174,11 +174,11 @@ KviTreeWindowListBackgroundOptionsWidget::KviTreeWindowListBackgroundOptionsWidg
 }
 
 
-KviTreeWindowListBackgroundOptionsWidget::~KviTreeWindowListBackgroundOptionsWidget()
+OptionsWidget_windowListTreeBackground::~OptionsWidget_windowListTreeBackground()
 {
 }
 
-void KviTreeWindowListBackgroundOptionsWidget::commit()
+void OptionsWidget_windowListTreeBackground::commit()
 {
 	KviOptionsWidget::commit();
 
@@ -213,7 +213,7 @@ void KviTreeWindowListBackgroundOptionsWidget::commit()
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviTreeWindowListFeaturesOptionsWidget::KviTreeWindowListFeaturesOptionsWidget(QWidget * parent)
+OptionsWidget_windowListTreeFeatures::OptionsWidget_windowListTreeFeatures(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("treewindowlist_options_widget");
@@ -227,14 +227,14 @@ KviTreeWindowListFeaturesOptionsWidget::KviTreeWindowListFeaturesOptionsWidget(Q
 }
 
 
-KviTreeWindowListFeaturesOptionsWidget::~KviTreeWindowListFeaturesOptionsWidget()
+OptionsWidget_windowListTreeFeatures::~OptionsWidget_windowListTreeFeatures()
 {
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviClassicWindowListOptionsWidget::KviClassicWindowListOptionsWidget(QWidget * parent)
+OptionsWidget_windowListClassic::OptionsWidget_windowListClassic(QWidget * parent)
 : KviOptionsWidget(parent)
 {
 	setObjectName("classicwindowlist_options_widget");
@@ -260,10 +260,10 @@ KviClassicWindowListOptionsWidget::KviClassicWindowListOptionsWidget(QWidget * p
 }
 
 
-KviClassicWindowListOptionsWidget::~KviClassicWindowListOptionsWidget()
+OptionsWidget_windowListClassic::~OptionsWidget_windowListClassic()
 {
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_optw_windowlist.moc"
+#include "m_OptionsWidget_windowList.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/optw_windowlist.h b/src/modules/options/OptionsWidget_windowList.h
index 663de7961..4eb29217b 100644
--- a/src/modules/options/optw_windowlist.h
+++ b/src/modules/options/OptionsWidget_windowList.h
@@ -3,7 +3,7 @@
 
 //===============================================================================
 //
-//   File : optw_windowlist.h
+//   File : OptionsWidget_windowList.h
 //   Creation date : Wed Jan 16 04:30:41 2002 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -36,91 +36,91 @@
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviWindowListOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviWindowListOptionsWidget "theme"
 
-class KviWindowListOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowList : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviWindowListOptionsWidget(QWidget * parent);
-	~KviWindowListOptionsWidget();
+	OptionsWidget_windowList(QWidget * parent);
+	~OptionsWidget_windowList();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
 #define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListOptionsWidget __tr2qs_no_lookup("Tree Window List")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListOptionsWidget KviWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListOptionsWidget OptionsWidget_windowList
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeWindowListOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListOptionsWidget "theme"
 #define KVI_OPTIONS_WIDGET_CONTAINER_KviTreeWindowListOptionsWidget true
 
-class KviTreeWindowListOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowListTree : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTreeWindowListOptionsWidget(QWidget * pParent);
-	~KviTreeWindowListOptionsWidget();
+	OptionsWidget_windowListTree(QWidget * pParent);
+	~OptionsWidget_windowListTree();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListForegroundOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
 #define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListForegroundOptionsWidget __tr2qs_no_lookup("Foreground")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListForegroundOptionsWidget KviTreeWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListForegroundOptionsWidget OptionsWidget_windowListTree
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskForegroundBarOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListForegroundOptionsWidget "theme"
 
-class KviTreeWindowListForegroundOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowListTreeForeground : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTreeWindowListForegroundOptionsWidget(QWidget * parent);
-	~KviTreeWindowListForegroundOptionsWidget();
+	OptionsWidget_windowListTreeForeground(QWidget * parent);
+	~OptionsWidget_windowListTreeForeground();
 };
 
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListBackgroundOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
 #define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListBackgroundOptionsWidget __tr2qs_no_lookup("Background")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListBackgroundOptionsWidget KviTreeWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListBackgroundOptionsWidget OptionsWidget_windowListTree
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskBackgroundBarOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListBackgroundOptionsWidget "theme"
 
-class KviTreeWindowListBackgroundOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowListTreeBackground : public KviOptionsWidget
 {
 	Q_OBJECT
 private:
 	QComboBox* m_pHorizontalAlign;
 	QComboBox* m_pVerticalAlign;
 public:
-	KviTreeWindowListBackgroundOptionsWidget(QWidget * parent);
-	~KviTreeWindowListBackgroundOptionsWidget();
+	OptionsWidget_windowListTreeBackground(QWidget * parent);
+	~OptionsWidget_windowListTreeBackground();
 
 	virtual void commit();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviTreeWindowListFeaturesOptionsWidget KVI_SMALLICON_TREEWINDOWLIST
 #define KVI_OPTIONS_WIDGET_NAME_KviTreeWindowListFeaturesOptionsWidget __tr2qs_no_lookup("Features")
-#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListFeaturesOptionsWidget KviTreeWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviTreeWindowListFeaturesOptionsWidget OptionsWidget_windowListTree
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviTreeTaskFeaturesBarOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviTreeWindowListFeaturesOptionsWidget "theme"
 
-class KviTreeWindowListFeaturesOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowListTreeFeatures : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviTreeWindowListFeaturesOptionsWidget(QWidget * parent);
-	~KviTreeWindowListFeaturesOptionsWidget();
+	OptionsWidget_windowListTreeFeatures(QWidget * parent);
+	~OptionsWidget_windowListTreeFeatures();
 };
 
 #define KVI_OPTIONS_WIDGET_ICON_KviClassicWindowListOptionsWidget KVI_SMALLICON_CLASSICWINDOWLIST
 #define KVI_OPTIONS_WIDGET_NAME_KviClassicWindowListOptionsWidget __tr2qs_no_lookup("Classic Window List")
-#define KVI_OPTIONS_WIDGET_PARENT_KviClassicWindowListOptionsWidget KviWindowListOptionsWidget
+#define KVI_OPTIONS_WIDGET_PARENT_KviClassicWindowListOptionsWidget OptionsWidget_windowList
 #define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_KviClassicWindowListOptionsWidget 2
 #define KVI_OPTIONS_WIDGET_KEYWORDS_KviClassicWindowListOptionsWidget __tr2qs_no_lookup("theme")
 #define KVI_OPTIONS_WIDGET_GROUP_KviClassicWindowListOptionsWidget "theme"
 
-class KviClassicWindowListOptionsWidget : public KviOptionsWidget
+class OptionsWidget_windowListClassic : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviClassicWindowListOptionsWidget(QWidget * parent);
-	~KviClassicWindowListOptionsWidget();
+	OptionsWidget_windowListClassic(QWidget * parent);
+	~OptionsWidget_windowListClassic();
 };
 
 #endif //_OPTW_WINDOWLIST_H_
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 9e323587a..e80cab7a6 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -53,12 +53,12 @@
 
 
 //extern KviModule * g_pOptionsModule;
-extern KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict;
+extern KviPointerHashTable<QString,OptionsDialog> * g_pOptionsDialogDict;
 
 extern KVIRC_API KviApplication * g_pApp;
-extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
+extern OptionsInstanceManager * g_pOptionsInstanceManager;
 
-KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const QString &szText)
+OptionsDialogFrontWidget::OptionsDialogFrontWidget(QWidget *parent,const QString &szText)
 :KviOptionsWidget(parent)
 {
 	setObjectName("general_options_front_widget");
@@ -69,12 +69,12 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const
 	layout()->addWidget(l,0,0);
 }
 
-KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
+OptionsDialogFrontWidget::~OptionsDialogFrontWidget()
 {
 }
 
 
-KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOptionsWidgetInstanceEntry * e)
+OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidget *parent,OptionsWidgetInstanceEntry * e)
 :QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
@@ -84,7 +84,7 @@ KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOption
 	parent->insertTopLevelItem(0, this);
 }
 
-KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e)
+OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidgetItem *parent,OptionsWidgetInstanceEntry * e)
 :QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
@@ -94,11 +94,11 @@ KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOp
 	parent->insertChild(0, this);
 }
 
-KviOptionsTreeWidgetItem::~KviOptionsTreeWidgetItem()
+OptionsDialogTreeWidgetItem::~OptionsDialogTreeWidgetItem()
 {
 }
 
-KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
+OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup)
 : QWidget(par)
 {
 	setObjectName("general_options_dialog");
@@ -219,7 +219,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	vbox->setStretchFactor(m_pWidgetStack,1);
 
 	// First widget visible
-	m_pFrontWidget = new KviGeneralOptionsFrontWidget(m_pWidgetStack,szFrontText);
+	m_pFrontWidget = new OptionsDialogFrontWidget(m_pWidgetStack,szFrontText);
 	m_pWidgetStack->addWidget(m_pFrontWidget);
 
 	int idx = m_pWidgetStack->indexOf(m_pFrontWidget);
@@ -272,7 +272,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	new QShortcut(Qt::Key_Escape,this,SLOT(close()));
 }
 
-KviOptionsDialog::~KviOptionsDialog()
+OptionsDialog::~OptionsDialog()
 {
 	if(!parent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = QRect(pos().x(),pos().y(),
 			size().width(),size().height());
@@ -280,7 +280,7 @@ KviOptionsDialog::~KviOptionsDialog()
 		g_pOptionsDialogDict->remove(m_szGroup);
 }
 
-void KviOptionsDialog::showEvent(QShowEvent *e)
+void OptionsDialog::showEvent(QShowEvent *e)
 {
 	QRect r = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
 
@@ -303,12 +303,12 @@ void KviOptionsDialog::showEvent(QShowEvent *e)
 	QWidget::showEvent(e);
 }
 
-void KviOptionsDialog::searchLineEditTextChanged(const QString &)
+void OptionsDialog::searchLineEditTextChanged(const QString &)
 {
 	QString txt = m_pSearchLineEdit->text().trimmed();
 	m_pSearchButton->setEnabled(txt.length() > 0);
 }
-bool KviOptionsDialog::searchInSelectors(KviOptionsWidget *pOptionsWidget,const QStringList &lKeywords)
+bool OptionsDialog::searchInSelectors(KviOptionsWidget *pOptionsWidget,const QStringList &lKeywords)
 {
 	KviPointerList<KviSelectorInterface> *selectors=pOptionsWidget->selectors();
 	bool bFoundSomethingHere=false;
@@ -347,7 +347,7 @@ bool KviOptionsDialog::searchInSelectors(KviOptionsWidget *pOptionsWidget,const
 	return bFoundSomethingHere;
 }
 
-bool KviOptionsDialog::recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QStringList &lKeywords)
+bool OptionsDialog::recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QStringList &lKeywords)
 {
 	if(!pItem)return false;
 	if(!pItem->m_pOptionsWidget)
@@ -399,7 +399,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QS
 	{
 		for(int j=0;j<ccount;j++)
 		{
-			KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)pItem->child(j);
+			OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)pItem->child(j);
 			bool bRet = recursiveSearch(pChild,lKeywords);
 			if(bRet)bFoundSomethingInside = true;
 		}
@@ -410,41 +410,41 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QS
 	return (bFoundSomethingInside || bFoundSomethingHere);
 }
 
-void KviOptionsDialog::search(const QStringList &lKeywords)
+void OptionsDialog::search(const QStringList &lKeywords)
 {
 	m_pTreeWidget->setUpdatesEnabled(false);
 
 	int count=m_pTreeWidget->topLevelItemCount();
 	for (int i=0;i<count;i++)
 	{
-		KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		recursiveSearch(pChild,lKeywords);
 	}
 	m_pTreeWidget->setUpdatesEnabled(true);
 	m_pTreeWidget->update();
 }
 
-void KviOptionsDialog::search(const QString &szKeywords)
+void OptionsDialog::search(const QString &szKeywords)
 {
 	QStringList lKeywords = szKeywords.split(" ",QString::SkipEmptyParts);
 	search(lKeywords);
 }
 
-void KviOptionsDialog::searchClicked()
+void OptionsDialog::searchClicked()
 {
 	QString szTxt = m_pSearchLineEdit->text().trimmed();
 	if(!szTxt.isEmpty())
 		search(szTxt);
 }
 
-void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
+void OptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<OptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
 {
 	if(!l)return;
 
-	KviOptionsTreeWidgetItem * it;
-	KviOptionsWidgetInstanceEntry * e;
+	OptionsDialogTreeWidgetItem * it;
+	OptionsWidgetInstanceEntry * e;
 
-	KviPointerList<KviOptionsWidgetInstanceEntry> tmp;
+	KviPointerList<OptionsWidgetInstanceEntry> tmp;
 	tmp.setAutoDelete(false);
 
 
@@ -453,7 +453,7 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 		// must be in the correct group
 		// if we want only containers then well.. must be one
 		e->bDoInsert = KviQString::equalCI(szGroup,e->szGroup) && ((!bNotContainedOnly) || e->bIsContainer || e->bIsNotContained);
-		KviOptionsWidgetInstanceEntry * ee = tmp.first();
+		OptionsWidgetInstanceEntry * ee = tmp.first();
 		int idx = 0;
 		while(ee)
 		{
@@ -468,8 +468,8 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 	{
 		if(e->bDoInsert)
 		{
-			if(p)it = new KviOptionsTreeWidgetItem(p,e);
-			else it = new KviOptionsTreeWidgetItem(m_pTreeWidget,e);
+			if(p)it = new OptionsDialogTreeWidgetItem(p,e);
+			else it = new OptionsDialogTreeWidgetItem(m_pTreeWidget,e);
 			if(!it->m_pOptionsWidget)
 			{
 				it->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(it->m_pInstanceEntry,m_pWidgetStack);
@@ -478,7 +478,7 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 					m_pWidgetStack->addWidget(it->m_pOptionsWidget);
 			}
 		} else {
-			it = (KviOptionsTreeWidgetItem *)p;
+			it = (OptionsDialogTreeWidgetItem *)p;
 		}
 
 		if(e->pChildList)
@@ -495,7 +495,7 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 	}
 }
 
-void KviOptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *)
+void OptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *)
 {
 	if(it)
 	{
@@ -511,7 +511,7 @@ void KviOptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTree
 		str.prepend("<b>");
 		str += "</b>";
 
-		KviOptionsTreeWidgetItem *i = (KviOptionsTreeWidgetItem *)it;
+		OptionsDialogTreeWidgetItem *i = (OptionsDialogTreeWidgetItem *)it;
 		if(!i->m_pOptionsWidget)
 		{
 			i->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(i->m_pInstanceEntry,m_pWidgetStack);
@@ -525,18 +525,18 @@ void KviOptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTree
 }
 
 /*
-KviOptionsTreeWidgetItem * KviOptionsDialog::findItemByPage(KviOptionsTreeWidgetItem *it,KviOptionsWidget * pPage)
+OptionsDialogTreeWidgetItem * OptionsDialog::findItemByPage(OptionsDialogTreeWidgetItem *it,KviOptionsWidget * pPage)
 {
 	if(!it)return 0;
 	if(it->m_pOptionsWidget == pPage)return it;
 
-	KviOptionsTreeWidgetItem *i;
+	OptionsDialogTreeWidgetItem *i;
 
 	int ccount = it->childCount();
 
 	for(int j=0;j<ccount;j++)
 	{
-		KviOptionsTreeWidgetItem * i = (KviOptionsTreeWidgetItem *)it->child(j);
+		OptionsDialogTreeWidgetItem * i = (OptionsDialogTreeWidgetItem *)it->child(j);
 
 		i = findItemByPage(i,pPage);
 		if(i)return i;
@@ -545,13 +545,13 @@ KviOptionsTreeWidgetItem * KviOptionsDialog::findItemByPage(KviOptionsTreeWidget
 	// not found in the children tree.. look in the next sibling
 	for(int j=0;j<ccount;j++)
 	{
-		KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)pItem->child(j);
+		OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)pItem->child(j);
 
 		i = findItemByPage(i,pPage);
 		if(i)return i;
 	}
 
-	i = (KviOptionsTreeWidgetItem *)(it->nextSibling());
+	i = (OptionsDialogTreeWidgetItem *)(it->nextSibling());
 	if(i)
 	{
 		i = findItemByPage(i,pPage);
@@ -560,26 +560,26 @@ KviOptionsTreeWidgetItem * KviOptionsDialog::findItemByPage(KviOptionsTreeWidget
 	return 0;
 }
 */
-void KviOptionsDialog::pageWantsToSwitchToAdvancedPage(KviOptionsWidget *)
+void OptionsDialog::pageWantsToSwitchToAdvancedPage(KviOptionsWidget *)
 {
 	// unused
 }
 
-void KviOptionsDialog::applyClicked()
+void OptionsDialog::applyClicked()
 {
 	apply(false);
 }
 
-void KviOptionsDialog::apply(bool bDialogAboutToClose)
+void OptionsDialog::apply(bool bDialogAboutToClose)
 {
 	int count=m_pTreeWidget->topLevelItemCount();
 	int curTab=-1;
-	KviOptionsTreeWidgetItem * it;
+	OptionsDialogTreeWidgetItem * it;
 
 	if(!bDialogAboutToClose)
 	{
 		// bring up the current widget again!
-		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->currentItem();
+		it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->currentItem();
 		//checking if the check of the check is checkable
 		if(it)
 			if(it->m_pOptionsWidget)
@@ -589,14 +589,14 @@ void KviOptionsDialog::apply(bool bDialogAboutToClose)
 
 	for (int i=0;i<count;i++)
 	{
-		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		recursiveCommit(it);
 	}
 
 	if(!bDialogAboutToClose)
 	{
 		// bring up the current widget again!
-		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->currentItem();
+		it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->currentItem();
 		if(it)
 		{
 			treeWidgetItemSelectionChanged(it, 0);
@@ -610,31 +610,31 @@ void KviOptionsDialog::apply(bool bDialogAboutToClose)
 
 }
 
-void KviOptionsDialog::okClicked()
+void OptionsDialog::okClicked()
 {
 	apply(true);
 	deleteLater();
 }
 
-void KviOptionsDialog::cancelClicked()
+void OptionsDialog::cancelClicked()
 {
 	deleteLater();
 }
 
-void KviOptionsDialog::closeEvent(QCloseEvent *e)
+void OptionsDialog::closeEvent(QCloseEvent *e)
 {
 	e->ignore();
 	deleteLater();
 }
 
-void KviOptionsDialog::recursiveCommit(KviOptionsTreeWidgetItem *it)
+void OptionsDialog::recursiveCommit(OptionsDialogTreeWidgetItem *it)
 {
 	// First commit the children
 	if(!it) return;
 	int count=it->childCount();
 	for (int i=0;i<count;i++)
 	{
-		KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)it->child(i);
+		OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)it->child(i);
 		recursiveCommit(pChild);
 	}
 
@@ -648,7 +648,7 @@ void KviOptionsDialog::recursiveCommit(KviOptionsTreeWidgetItem *it)
 	//refreshTreeWidget(); // <-- this tends to jump into infinite recursion
 }
 
-void  KviOptionsDialog::keyPressEvent( QKeyEvent * e )
+void  OptionsDialog::keyPressEvent( QKeyEvent * e )
 {
 	if(e->key()==Qt::Key_Return)
 		e->accept();
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index a867182b8..67b92fc84 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -25,7 +25,7 @@
 //
 //=============================================================================
 
-#include "instances.h"
+#include "OptionsInstanceManager.h"
 
 #include "KviOptionsWidget.h"
 #include <QTreeWidget>
@@ -41,44 +41,44 @@ class QPushButton;
 class QLineEdit;
 class QStackedWidget;
 
-class KviGeneralOptionsFrontWidget : public KviOptionsWidget
+class OptionsDialogFrontWidget : public KviOptionsWidget
 {
 	Q_OBJECT
 public:
-	KviGeneralOptionsFrontWidget(QWidget *parent,const QString &szText);
-	~KviGeneralOptionsFrontWidget();
+	OptionsDialogFrontWidget(QWidget *parent,const QString &szText);
+	~OptionsDialogFrontWidget();
 };
 
-class KviOptionsTreeWidgetItem : public QTreeWidgetItem
+class OptionsDialogTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOptionsWidgetInstanceEntry * e);
-	KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e);
-	~KviOptionsTreeWidgetItem();
+	OptionsDialogTreeWidgetItem(QTreeWidget *parent,OptionsWidgetInstanceEntry * e);
+	OptionsDialogTreeWidgetItem(QTreeWidgetItem *parent,OptionsWidgetInstanceEntry * e);
+	~OptionsDialogTreeWidgetItem();
 public:
-	KviOptionsWidgetInstanceEntry * m_pInstanceEntry;
+	OptionsWidgetInstanceEntry * m_pInstanceEntry;
 	KviOptionsWidget              * m_pOptionsWidget;
 };
 
-class KviOptionsDialog : public QWidget
+class OptionsDialog : public QWidget
 {
 	Q_OBJECT
 public:
-	KviOptionsDialog(QWidget * par,const QString &szGroup);
-	~KviOptionsDialog();
+	OptionsDialog(QWidget * par,const QString &szGroup);
+	~OptionsDialog();
 private:
 	QTreeWidget                  * m_pTreeWidget;
 	QLabel                       * m_pCategoryLabel;
 	QStackedWidget               * m_pWidgetStack;
-	KviGeneralOptionsFrontWidget * m_pFrontWidget;
+	OptionsDialogFrontWidget * m_pFrontWidget;
 	QString                        m_szGroup;
 	QLineEdit                    * m_pSearchLineEdit;
 	QToolButton                  * m_pSearchButton;
 private:
-	void recursiveCommit(KviOptionsTreeWidgetItem *it);
-	void fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
-	//KviOptionsTreeWidgetItem * showHiddenChildren(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-	//KviOptionsTreeWidgetItem * findItemByPage(KviOptionsTreeWidgetItem *it,KviOptionsWidget * pPage);
+	void recursiveCommit(OptionsDialogTreeWidgetItem *it);
+	void fillTreeWidget(QTreeWidgetItem * p,KviPointerList<OptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
+	//OptionsDialogTreeWidgetItem * showHiddenChildren(QTreeWidgetItem * p,KviPointerList<OptionsWidgetInstanceEntry> * l);
+	//OptionsDialogTreeWidgetItem * findItemByPage(OptionsDialogTreeWidgetItem *it,KviOptionsWidget * pPage);
 private slots:
 	void treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *prev);
 	void applyClicked();
@@ -92,7 +92,7 @@ protected:
 	virtual void closeEvent(QCloseEvent *e);
 	virtual void keyPressEvent( QKeyEvent * e );
 	virtual void showEvent(QShowEvent *e);
-	bool recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QStringList &lKeywords);
+	bool recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QStringList &lKeywords);
 	bool searchInSelectors(KviOptionsWidget *pWidget,const QStringList &lKeywords);
 
 public:
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 47c9793ed..6c8b8e9dc 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "container.h"
-#include "instances.h"
+#include "OptionsWidgetContainer.h"
+#include "OptionsInstanceManager.h"
 #include "dialog.h"
 
 #include "KviModule.h"
@@ -39,9 +39,9 @@
 
 #include <QSplitter>
 
-KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict = 0;
+KviPointerHashTable<QString,OptionsDialog> * g_pOptionsDialogDict = 0;
 
-KviOptionsInstanceManager * g_pOptionsInstanceManager = 0;
+OptionsInstanceManager * g_pOptionsInstanceManager = 0;
 
 extern int g_iOptionWidgetInstances;
 
@@ -101,7 +101,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup)
 	KVSM_PARAMETERS_END(c)
 	if(szGroup.isEmpty())szGroup = "general";
-	KviOptionsDialog * d = g_pOptionsDialogDict->find(szGroup);
+	OptionsDialog * d = g_pOptionsDialogDict->find(szGroup);
 	if(d)
 	{
 		if(c->hasSwitch('t',"toplevel"))
@@ -122,9 +122,9 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 	} else {
 		if(c->hasSwitch('t',"toplevel"))
 		{
-			d = new KviOptionsDialog(0,szGroup);
+			d = new OptionsDialog(0,szGroup);
 		} else {
-			d = new KviOptionsDialog(c->window()->frame()->splitter(),szGroup);
+			d = new OptionsDialog(c->window()->frame()->splitter(),szGroup);
 		}
 		g_pOptionsDialogDict->insert(szGroup,d);
 	}
@@ -150,14 +150,14 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 */
 
 
-static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,KviOptionsWidgetInstanceEntry * e,const char * prefix)
+static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,OptionsWidgetInstanceEntry * e,const char * prefix)
 {
 	c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c  (%Q)",prefix,KviMircCntrl::Bold,e->szClassName,KviMircCntrl::Bold,&(e->szName));
 	KviCString szPre = prefix;
 	szPre.append("  ");
 	if(e->pChildList)
 	{
-		for(KviOptionsWidgetInstanceEntry * ex = e->pChildList->first();ex;ex = e->pChildList->next())
+		for(OptionsWidgetInstanceEntry * ex = e->pChildList->first();ex;ex = e->pChildList->next())
 		{
 			options_kvs_module_print_pages(c,ex,szPre.ptr());
 		}
@@ -166,9 +166,9 @@ static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,KviOption
 
 static bool options_kvs_cmd_pages(KviKvsModuleCommandCall * c)
 {
-	KviPointerList<KviOptionsWidgetInstanceEntry> * l = g_pOptionsInstanceManager->instanceEntryTree();
+	KviPointerList<OptionsWidgetInstanceEntry> * l = g_pOptionsInstanceManager->instanceEntryTree();
 
-	for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+	for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 	{
 		options_kvs_module_print_pages(c,e,"");
 	}
@@ -200,7 +200,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("option",KVS_PT_STRING,0,szOption)
 	KVSM_PARAMETERS_END(c)
-	KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szOption.toUtf8().data());
+	OptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szOption.toUtf8().data());
 	if(!e)
 	{
 		c->warning(__tr2qs_ctx("No such options page class name %Q","options"),&szOption);
@@ -215,7 +215,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	KviOptionsWidgetContainer * wc = new KviOptionsWidgetContainer(0,c->hasSwitch('m',"modal"));
+	OptionsWidgetContainer * wc = new OptionsWidgetContainer(0,c->hasSwitch('m',"modal"));
 
 	wc->setup(g_pOptionsInstanceManager->getInstance(e,wc));
 
@@ -266,7 +266,7 @@ static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c)
 
 static bool options_module_init(KviModule * m)
 {
-	g_pOptionsInstanceManager = new KviOptionsInstanceManager();
+	g_pOptionsInstanceManager = new OptionsInstanceManager();
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"dialog",options_kvs_cmd_dialog);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"save",options_kvs_cmd_save);
@@ -274,7 +274,7 @@ static bool options_module_init(KviModule * m)
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"edit",options_kvs_cmd_edit);
 	KVSM_REGISTER_FUNCTION(m,"isDialog",options_kvs_fnc_isdialog);
 
-	g_pOptionsDialogDict = new KviPointerHashTable<QString,KviOptionsDialog>;
+	g_pOptionsDialogDict = new KviPointerHashTable<QString,OptionsDialog>;
 	g_pOptionsDialogDict->setAutoDelete(false);
 
 	return true;
@@ -282,10 +282,10 @@ static bool options_module_init(KviModule * m)
 
 static bool options_module_cleanup(KviModule *m)
 {
-	KviPointerHashTableIterator<QString,KviOptionsDialog> it(*g_pOptionsDialogDict);
-	KviPointerList<KviOptionsDialog> l;
+	KviPointerHashTableIterator<QString,OptionsDialog> it(*g_pOptionsDialogDict);
+	KviPointerList<OptionsDialog> l;
 	l.setAutoDelete(false);
-	KviOptionsDialog * d;
+	OptionsDialog * d;
 	while( (d = it.current()) )
 	{
 		l.append(d);
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index 189e20b72..b4de22c53 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -2,7 +2,7 @@
 
 #################################################################################
 #
-# Generator for instances.h and instances.cpp
+# Generator for OptionsInstanceManager.h and OptionsInstanceManager.cpp
 #
 # This file is part of the KVirc irc client distribution
 # Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
@@ -10,17 +10,17 @@
 #################################################################################
 
 
-echo "" > instances.h
+echo "" > OptionsInstanceManager.h
 
 #################################################################################
-cat >> instances.h <<EOF
+cat >> OptionsInstanceManager.h <<EOF
 
 #ifndef __OPTIONS_INSTANCES_H__
 #define __OPTIONS_INSTANCES_H__
 
 //=============================================================================
 //
-//   File : instances.h
+//   File : OptionsInstanceManager.h
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
@@ -53,10 +53,10 @@ cat >> instances.h <<EOF
 #include "KviPointerList.h"
 #include "KviQString.h"
 
-typedef struct _KviOptionsWidgetInstanceEntry KviOptionsWidgetInstanceEntry;
+typedef struct _OptionsWidgetInstanceEntry OptionsWidgetInstanceEntry;
 
 
-typedef struct _KviOptionsWidgetInstanceEntry
+typedef struct _OptionsWidgetInstanceEntry
 {
 	KviOptionsWidget                          * (*createProc)(QWidget *);
 	KviOptionsWidget                          * pWidget;   // singleton
@@ -70,28 +70,28 @@ typedef struct _KviOptionsWidgetInstanceEntry
 	QString                                     szGroup;
 	bool                                        bIsContainer;
 	bool                                        bIsNotContained;
-	KviPointerList<KviOptionsWidgetInstanceEntry> * pChildList;
-	bool                                        bDoInsert; // a helper for KviOptionsDialog::fillListView()
-} KviOptionsWidgetInstanceEntry;
+	KviPointerList<OptionsWidgetInstanceEntry> * pChildList;
+	bool                                        bDoInsert; // a helper for OptionsDialog::fillListView()
+} OptionsWidgetInstanceEntry;
 
 
-class KviOptionsInstanceManager : public QObject
+class OptionsInstanceManager : public QObject
 {
 	Q_OBJECT
 public:
-	KviOptionsInstanceManager();
-	virtual ~KviOptionsInstanceManager();
+	OptionsInstanceManager();
+	virtual ~OptionsInstanceManager();
 protected:
-	KviPointerList<KviOptionsWidgetInstanceEntry> *  m_pInstanceTree;
+	KviPointerList<OptionsWidgetInstanceEntry> *  m_pInstanceTree;
 public:
-	KviPointerList<KviOptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
-	KviOptionsWidget * getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par);
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
+	KviPointerList<OptionsWidgetInstanceEntry> * instanceEntryTree(){ return m_pInstanceTree; };
+	KviOptionsWidget * getInstance(OptionsWidgetInstanceEntry * e,QWidget * par);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName);
 	void cleanup(KviModule * m);
 protected:
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-	KviOptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
-	void deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l);
+	OptionsWidgetInstanceEntry * findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l);
+	void deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l);
 protected slots:
 	void widgetDestroyed();
 };
@@ -101,19 +101,19 @@ protected slots:
 EOF
 ######################################################################################################
 
-CLASS_LIST=`grep -h "[ ]*\:[ ]*public[ ]*KviOptionsWidget" optw_*.h | sed -e 's/[ ]*\:[ ]*public[ ]*KviOptionsWidget'//g | sed -e 's/[ 	]*class[ ]*//g'`
+CLASS_LIST=`grep -h "[ ]*\:[ ]*public[ ]*KviOptionsWidget" OptionsWidget_*.h | sed -e 's/[ ]*\:[ ]*public[ ]*KviOptionsWidget'//g | sed -e 's/[ 	]*class[ ]*//g'`
 
 
-TARGET="instances.cpp"
+TARGET="OptionsInstanceManager.cpp"
 
 echo "" > $TARGET
 
 #################################################################################
-cat >> instances.cpp <<EOF
+cat >> OptionsInstanceManager.cpp <<EOF
 
 //=============================================================================
 //
-//   File : instances.cpp
+//   File : OptionsInstanceManager.cpp
 //
 //   This file is part of the KVirc irc client distribution
 //   Copyright (C) 2001-2008 Szymon Stefanek (stefanek@tin.it)
@@ -145,16 +145,16 @@ EOF
 #################################################################################
 
 
-for afile in optw_*.h; do
+for afile in OptionsWidget_*.h; do
 	echo "#include \"$afile\"" >> $TARGET
 done
 
 #################################################################################
-cat >> instances.cpp <<EOF
+cat >> OptionsInstanceManager.cpp <<EOF
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
-#include "instances.h"
+#include "OptionsInstanceManager.h"
 
 int g_iOptionWidgetInstances = 0;
 
@@ -172,7 +172,7 @@ for aclass in $CLASS_LIST; do
 done
 
 #################################################################################
-cat >> instances.cpp <<EOF
+cat >> OptionsInstanceManager.cpp <<EOF
 
 
 EOF
@@ -184,15 +184,15 @@ for aclass in $CLASS_LIST; do
 done
 
 #################################################################################
-cat >> instances.cpp <<EOF
+cat >> OptionsInstanceManager.cpp <<EOF
 
-KviOptionsInstanceManager::KviOptionsInstanceManager()
+OptionsInstanceManager::OptionsInstanceManager()
 : QObject(0)
 {
 
 	//qDebug("Instantiating");
 	// Create the global widget dict : case sensitive, do not copy keys
-	m_pInstanceTree = new KviPointerList<KviOptionsWidgetInstanceEntry>;
+	m_pInstanceTree = new KviPointerList<OptionsWidgetInstanceEntry>;
 	m_pInstanceTree->setAutoDelete(true);
 
 EOF
@@ -205,7 +205,7 @@ mkdir -p $CLASSDIR
 rm -f $CLASSDIR/*
 
 for aclass in $CLASS_LIST; do
-	PARENT=`grep -h "KVI_OPTIONS_WIDGET_PARENT_$aclass" optw_*.h | sed -e 's/#define//g' | sed -e s/KVI_OPTIONS_WIDGET_PARENT_$aclass//g | sed -e 's/[ ]*//g'`
+	PARENT=`grep -h "KVI_OPTIONS_WIDGET_PARENT_$aclass" OptionsWidget_*.h | sed -e 's/#define//g' | sed -e s/KVI_OPTIONS_WIDGET_PARENT_$aclass//g | sed -e 's/[ ]*//g'`
 	if [ -z "$PARENT" ]; then
 		PARENT="NOPARENT"
 	fi
@@ -225,10 +225,10 @@ printclass()
 		fi
 	done
 	if [ -z "$found" ]; then
-		echo "$3	KviOptionsWidgetInstanceEntry * e$1;" >> $TARGET
+		echo "$3	OptionsWidgetInstanceEntry * e$1;" >> $TARGET
 		DECLARED="$DECLARED $1"
 	fi
-	echo "$3	e$1 = new KviOptionsWidgetInstanceEntry;"  >> $TARGET
+	echo "$3	e$1 = new OptionsWidgetInstanceEntry;"  >> $TARGET
 	echo -n "$3	e$1->createProc = &class$2"  >> $TARGET
 		echo "_createInstanceProc;"  >> $TARGET
 	echo "$3	e$1->pWidget = 0;" >> $TARGET
@@ -283,7 +283,7 @@ addchildren()
 			printclass $1 $achild "$3"
 			if [ -f "$CLASSDIR/$achild" ]; then
 				echo "" >> $TARGET
-				echo "$3	e$1->pChildList = new KviPointerList<KviOptionsWidgetInstanceEntry>;" >> $TARGET
+				echo "$3	e$1->pChildList = new KviPointerList<OptionsWidgetInstanceEntry>;" >> $TARGET
 				echo "$3	e$1->pChildList->setAutoDelete(true);" >> $TARGET
 				NEXTLEVEL=`expr $1 + 1`
 				addchildren $NEXTLEVEL $achild "$3	"
@@ -304,15 +304,15 @@ cat >> $TARGET <<EOF
 
 }
 
-void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+void OptionsInstanceManager::deleteInstanceTree(KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(e->pWidget)
 			{
-				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
+				if(e->pWidget->parent()->inherits("OptionsWidgetContainer"))
 				{
 					disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
 					delete e->pWidget->parent();
@@ -328,21 +328,21 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 }
 
 
-KviOptionsInstanceManager::~KviOptionsInstanceManager()
+OptionsInstanceManager::~OptionsInstanceManager()
 {
 	if(m_pInstanceTree)
-		qDebug("Ops...KviOptionsInstanceManager::cleanup() not called ?");
+		qDebug("Ops...OptionsInstanceManager::cleanup() not called ?");
 }
 
-void KviOptionsInstanceManager::cleanup(KviModule *)
+void OptionsInstanceManager::cleanup(KviModule *)
 {
 	deleteInstanceTree(m_pInstanceTree);
 	m_pInstanceTree = 0;
 }
 
-void KviOptionsInstanceManager::widgetDestroyed()
+void OptionsInstanceManager::widgetDestroyed()
 {
-	KviOptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree);
+	OptionsWidgetInstanceEntry * e = findInstanceEntry(sender(),m_pInstanceTree);
 	if(e)
 		e->pWidget = 0;
 	if(g_iOptionWidgetInstances > 0)
@@ -350,7 +350,7 @@ void KviOptionsInstanceManager::widgetDestroyed()
 
 }
 
-KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstanceEntry * e,QWidget * par)
+KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * e,QWidget * par)
 {
 	if(!e)
 		return NULL;
@@ -379,7 +379,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	{
 		QWidget * oldPar = (QWidget *)e->pWidget->parent();
 		e->pWidget->setParent(par); //reparent(par,QPoint(0,0));
-		if(oldPar->inherits("KviOptionsWidgetContainer"))
+		if(oldPar->inherits("OptionsWidgetContainer"))
 			delete oldPar;
 		// else it's very likely a QStackedWidget, child of a KviOptionsWidget: don't delete
 	}
@@ -390,15 +390,15 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 		e->pWidget->createTabbedPage();
 		if(e->pChildList)
 		{
-			KviPointerList<KviOptionsWidgetInstanceEntry> tmp;
+			KviPointerList<OptionsWidgetInstanceEntry> tmp;
 			tmp.setAutoDelete(false);
 
-			for(KviOptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next())
+			for(OptionsWidgetInstanceEntry * e2 = e->pChildList->first();e2;e2 = e->pChildList->next())
 			{
 				// add only non containers and widgets not explicitly marked as noncontained
 				if((!e2->bIsContainer) && (!e2->bIsNotContained))
 				{
-					KviOptionsWidgetInstanceEntry * ee = tmp.first();
+					OptionsWidgetInstanceEntry * ee = tmp.first();
 					int idx = 0;
 					while(ee)
 					{
@@ -410,7 +410,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 				}
 			}
 
-			for(KviOptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev())
+			for(OptionsWidgetInstanceEntry * e3 = tmp.last();e3;e3 = tmp.prev())
 			{
 				KviOptionsWidget * ow = getInstance(e3,e->pWidget->tabWidget());
 				e->pWidget->addOptionsWidget(e3->szName,*(g_pIconManager->getSmallIcon(e3->iIcon)),ow);
@@ -420,16 +420,16 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 	return e->pWidget;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QObject * ptr,KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(ptr == e->pWidget)return e;
 			if(e->pChildList)
 			{
-				KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList);
+				OptionsWidgetInstanceEntry * e2 = findInstanceEntry(ptr,e->pChildList);
 				if(e2)return e2;
 			}
 		}
@@ -437,16 +437,16 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 	return 0;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<KviOptionsWidgetInstanceEntry> * l)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName,KviPointerList<OptionsWidgetInstanceEntry> * l)
 {
 	if(l)
 	{
-		for(KviOptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
+		for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next())
 		{
 			if(kvi_strEqualCI(e->szClassName,clName))return e;
 			if(e->pChildList)
 			{
-				KviOptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList);
+				OptionsWidgetInstanceEntry * e2 = findInstanceEntry(clName,e->pChildList);
 				if(e2)return e2;
 			}
 		}
@@ -454,13 +454,13 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con
 	return 0;
 }
 
-KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(const char * clName)
+OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * clName)
 {
 	return findInstanceEntry(clName,m_pInstanceTree);
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "m_instances.moc"
+	#include "m_OptionsInstanceManager.moc"
 #endif
 
 EOF
diff --git a/src/modules/popupeditor/CMakeLists.txt b/src/modules/popupeditor/CMakeLists.txt
index 87c8617b4..7fd16323d 100644
--- a/src/modules/popupeditor/CMakeLists.txt
+++ b/src/modules/popupeditor/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/popupeditor
 
 SET(kvipopupeditor_MOC_HDRS
-	popupeditor.h
+	PopupEditorWindow.h
 )
 
 SET(kvipopupeditor_SRCS
 	libkvipopupeditor.cpp
-	popupeditor.cpp
+	PopupEditorWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp
index 8cacc85e6..f7e5ed24a 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/PopupEditorWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : popupeditor.cpp
+//   File : PopupEditorWindow.cpp
 //   Creation date : Mon Dec 23 2002 20:28:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "popupeditor.h"
+#include "PopupEditorWindow.h"
 
 #include "KviIconManager.h"
 #include "KviOptions.h"
@@ -53,26 +53,26 @@
 #include <QAbstractItemView>
 
 
-extern KviPopupEditorWindow * g_pPopupEditorWindow;
+extern PopupEditorWindow * g_pPopupEditorWindow;
 
 
 
 //KviPopupEntryItem
-KviPopupTreeWidgetItem::KviPopupTreeWidgetItem(QTreeWidget * pTreeWidget,KviPopupTreeWidgetItem * after,Type t)
+PopupTreeWidgetItem::PopupTreeWidgetItem(QTreeWidget * pTreeWidget,PopupTreeWidgetItem * after,Type t)
 : QTreeWidgetItem(pTreeWidget, after)
 {
 	m_type = t;
 	init();
 }
 
-KviPopupTreeWidgetItem::KviPopupTreeWidgetItem(KviPopupTreeWidgetItem * parent,KviPopupTreeWidgetItem * after,Type t)
+PopupTreeWidgetItem::PopupTreeWidgetItem(PopupTreeWidgetItem * parent,PopupTreeWidgetItem * after,Type t)
 : QTreeWidgetItem(parent, after)
 {
 	m_type = t;
 	init();
 }
 
-void KviPopupTreeWidgetItem::init()
+void PopupTreeWidgetItem::init()
 {
 	switch(m_type)
 	{
@@ -105,7 +105,7 @@ void KviPopupTreeWidgetItem::init()
 	}
 }
 
-void KviPopupTreeWidgetItem::setItemText(const QString & szText)
+void PopupTreeWidgetItem::setItemText(const QString & szText)
 {
 	switch(m_type)
 	{
@@ -121,7 +121,7 @@ void KviPopupTreeWidgetItem::setItemText(const QString & szText)
 	}
 }
 
-void KviPopupTreeWidgetItem::setCondition(const QString & szCondition)
+void PopupTreeWidgetItem::setCondition(const QString & szCondition)
 {
 	switch(m_type)
 	{
@@ -137,7 +137,7 @@ void KviPopupTreeWidgetItem::setCondition(const QString & szCondition)
 	}
 }
 
-void KviPopupTreeWidgetItem::setCode(const QString & szCode)
+void PopupTreeWidgetItem::setCode(const QString & szCode)
 {
 	switch(m_type)
 	{
@@ -152,12 +152,12 @@ void KviPopupTreeWidgetItem::setCode(const QString & szCode)
 	}
 }
 
-void KviPopupTreeWidgetItem::setId(const QString & szId)
+void PopupTreeWidgetItem::setId(const QString & szId)
 {
 	m_szId = szId;
 }
 
-void KviPopupTreeWidgetItem::setIcon(const QString & szIcon)
+void PopupTreeWidgetItem::setIcon(const QString & szIcon)
 {
 	switch(m_type)
 	{
@@ -180,7 +180,7 @@ void KviPopupTreeWidgetItem::setIcon(const QString & szIcon)
 }
 
 
-KviSinglePopupEditor::KviSinglePopupEditor(QWidget * par)
+SinglePopupEditor::SinglePopupEditor(QWidget * par)
 : QWidget(par)
 {
 	m_pLastSelectedItem = 0;
@@ -274,14 +274,14 @@ KviSinglePopupEditor::KviSinglePopupEditor(QWidget * par)
 	g->setRowStretch(1,1);
 }
 
-KviSinglePopupEditor::~KviSinglePopupEditor()
+SinglePopupEditor::~SinglePopupEditor()
 {
 	if(m_pClipboard)delete m_pClipboard;
 	if(m_pTestPopup)delete m_pTestPopup;
 	KviScriptEditor::destroyInstance(m_pEditor);
 }
 
-void KviSinglePopupEditor::testPopup()
+void SinglePopupEditor::testPopup()
 {
 
 	if(m_pTestPopup)delete m_pTestPopup;
@@ -297,11 +297,11 @@ void KviSinglePopupEditor::testPopup()
 	m_pTestPopup->doPopup(pnt,g_pActiveWindow,parms,true);
 }
 
-KviPopupTreeWidgetItem * KviSinglePopupEditor::findMatchingItem(KviKvsPopupMenuItem * it,KviPopupTreeWidgetItem * item)
+PopupTreeWidgetItem * SinglePopupEditor::findMatchingItem(KviKvsPopupMenuItem * it,PopupTreeWidgetItem * item)
 {
 
 	if(it->type() != KviKvsPopupMenuItem::Item)goto not_this_one;
-	if(item->m_type != KviPopupTreeWidgetItem::Item)goto not_this_one;
+	if(item->m_type != PopupTreeWidgetItem::Item)goto not_this_one;
 	if(it->name() != item->m_szId)goto not_this_one;
 	if(it->kvsText())
 	{
@@ -334,15 +334,15 @@ not_this_one:
 	int count=item->childCount();
 	for(int i=0; i<count; i++)
 	{
-		item = (KviPopupTreeWidgetItem *)item->child(i);
-		KviPopupTreeWidgetItem * found = findMatchingItem(it,item);
+		item = (PopupTreeWidgetItem *)item->child(i);
+		PopupTreeWidgetItem * found = findMatchingItem(it,item);
 		if(found)return found;
 	}
 
 	return 0;
 }
 
-void KviSinglePopupEditor::testModeMenuItemClicked(KviKvsPopupMenuItem * it)
+void SinglePopupEditor::testModeMenuItemClicked(KviKvsPopupMenuItem * it)
 {
 
 	saveLastSelectedItem(); // that's the first thingie
@@ -350,8 +350,8 @@ void KviSinglePopupEditor::testModeMenuItemClicked(KviKvsPopupMenuItem * it)
 	int count=m_pTreeWidget->topLevelItemCount();
 	for(int i=0; i<count; i++)
 	{
-		KviPopupTreeWidgetItem * item = (KviPopupTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
-		KviPopupTreeWidgetItem * found = findMatchingItem(it,item);
+		PopupTreeWidgetItem * item = (PopupTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		PopupTreeWidgetItem * found = findMatchingItem(it,item);
 		if(found)
 		{
 			// set the item as current
@@ -365,19 +365,19 @@ void KviSinglePopupEditor::testModeMenuItemClicked(KviKvsPopupMenuItem * it)
 
 }
 
-void KviSinglePopupEditor::customContextMenuRequested(const QPoint &pos)
+void SinglePopupEditor::customContextMenuRequested(const QPoint &pos)
 {
 	QTreeWidgetItem *it=m_pTreeWidget->itemAt(pos);
 
 	m_pContextPopup->clear();
 
-	KviPopupTreeWidgetItem * parentMenu = 0;
+	PopupTreeWidgetItem * parentMenu = 0;
 	bool bIsMenu = false;
 
 	if(it)
 	{
-		parentMenu = (KviPopupTreeWidgetItem *) (((KviPopupTreeWidgetItem *)it)->parent());
-		bIsMenu = ((KviPopupTreeWidgetItem *)it)->m_type == KviPopupTreeWidgetItem::Menu;
+		parentMenu = (PopupTreeWidgetItem *) (((PopupTreeWidgetItem *)it)->parent());
+		bIsMenu = ((PopupTreeWidgetItem *)it)->m_type == PopupTreeWidgetItem::Menu;
 	}
 
 	m_pContextPopup->insertItem(__tr2qs_ctx("New Separator Below","editor"),this,SLOT(contextNewSeparatorBelow()));
@@ -466,119 +466,119 @@ void KviSinglePopupEditor::customContextMenuRequested(const QPoint &pos)
 	m_pContextPopup->popup(QCursor::pos());
 }
 
-void KviSinglePopupEditor::createNewItemAboveLastSelected(KviPopupTreeWidgetItem::Type t)
+void SinglePopupEditor::createNewItemAboveLastSelected(PopupTreeWidgetItem::Type t)
 {
 	m_pTreeWidget->setCurrentItem(newItemAbove(m_pLastSelectedItem,t));
 }
 
-void KviSinglePopupEditor::createNewItemBelowLastSelected(KviPopupTreeWidgetItem::Type t)
+void SinglePopupEditor::createNewItemBelowLastSelected(PopupTreeWidgetItem::Type t)
 {
 	m_pTreeWidget->setCurrentItem(newItemBelow(m_pLastSelectedItem,t));
 }
 
-void KviSinglePopupEditor::createNewItemInsideLastSelected(KviPopupTreeWidgetItem::Type t)
+void SinglePopupEditor::createNewItemInsideLastSelected(PopupTreeWidgetItem::Type t)
 {
 	if(m_pLastSelectedItem)m_pLastSelectedItem->setExpanded(true);
 	m_pTreeWidget->setCurrentItem(newItemInside(m_pLastSelectedItem,t));
 }
 
-void KviSinglePopupEditor::contextNewSeparatorAbove()
+void SinglePopupEditor::contextNewSeparatorAbove()
 {
-	createNewItemAboveLastSelected(KviPopupTreeWidgetItem::Separator);
+	createNewItemAboveLastSelected(PopupTreeWidgetItem::Separator);
 }
 
-void KviSinglePopupEditor::contextNewSeparatorBelow()
+void SinglePopupEditor::contextNewSeparatorBelow()
 {
-	createNewItemBelowLastSelected(KviPopupTreeWidgetItem::Separator);
+	createNewItemBelowLastSelected(PopupTreeWidgetItem::Separator);
 }
 
-void KviSinglePopupEditor::contextNewSeparatorInside()
+void SinglePopupEditor::contextNewSeparatorInside()
 {
-	createNewItemInsideLastSelected(KviPopupTreeWidgetItem::Separator);
+	createNewItemInsideLastSelected(PopupTreeWidgetItem::Separator);
 }
 
-void KviSinglePopupEditor::contextNewItemBelow()
+void SinglePopupEditor::contextNewItemBelow()
 {
-	createNewItemBelowLastSelected(KviPopupTreeWidgetItem::Item);
+	createNewItemBelowLastSelected(PopupTreeWidgetItem::Item);
 }
 
-void KviSinglePopupEditor::contextNewItemAbove()
+void SinglePopupEditor::contextNewItemAbove()
 {
-	createNewItemAboveLastSelected(KviPopupTreeWidgetItem::Item);
+	createNewItemAboveLastSelected(PopupTreeWidgetItem::Item);
 }
 
-void KviSinglePopupEditor::contextNewItemInside()
+void SinglePopupEditor::contextNewItemInside()
 {
-	createNewItemInsideLastSelected(KviPopupTreeWidgetItem::Item);
+	createNewItemInsideLastSelected(PopupTreeWidgetItem::Item);
 }
 
-void KviSinglePopupEditor::contextNewMenuBelow()
+void SinglePopupEditor::contextNewMenuBelow()
 {
-	createNewItemBelowLastSelected(KviPopupTreeWidgetItem::Menu);
+	createNewItemBelowLastSelected(PopupTreeWidgetItem::Menu);
 }
 
-void KviSinglePopupEditor::contextNewMenuAbove()
+void SinglePopupEditor::contextNewMenuAbove()
 {
-	createNewItemAboveLastSelected(KviPopupTreeWidgetItem::Menu);
+	createNewItemAboveLastSelected(PopupTreeWidgetItem::Menu);
 }
 
-void KviSinglePopupEditor::contextNewMenuInside()
+void SinglePopupEditor::contextNewMenuInside()
 {
-	createNewItemInsideLastSelected(KviPopupTreeWidgetItem::Menu);
+	createNewItemInsideLastSelected(PopupTreeWidgetItem::Menu);
 }
 
-void KviSinglePopupEditor::contextNewExtMenuBelow()
+void SinglePopupEditor::contextNewExtMenuBelow()
 {
-	createNewItemBelowLastSelected(KviPopupTreeWidgetItem::ExtMenu);
+	createNewItemBelowLastSelected(PopupTreeWidgetItem::ExtMenu);
 }
 
-void KviSinglePopupEditor::contextNewExtMenuAbove()
+void SinglePopupEditor::contextNewExtMenuAbove()
 {
-	createNewItemAboveLastSelected(KviPopupTreeWidgetItem::ExtMenu);
+	createNewItemAboveLastSelected(PopupTreeWidgetItem::ExtMenu);
 }
-void KviSinglePopupEditor::contextNewExtMenuInside()
+void SinglePopupEditor::contextNewExtMenuInside()
 {
-	createNewItemInsideLastSelected(KviPopupTreeWidgetItem::ExtMenu);
+	createNewItemInsideLastSelected(PopupTreeWidgetItem::ExtMenu);
 }
 
-void KviSinglePopupEditor::contextNewLabelBelow()
+void SinglePopupEditor::contextNewLabelBelow()
 {
-	createNewItemBelowLastSelected(KviPopupTreeWidgetItem::Label);
+	createNewItemBelowLastSelected(PopupTreeWidgetItem::Label);
 }
 
-void KviSinglePopupEditor::contextNewLabelAbove()
+void SinglePopupEditor::contextNewLabelAbove()
 {
-	createNewItemAboveLastSelected(KviPopupTreeWidgetItem::Label);
+	createNewItemAboveLastSelected(PopupTreeWidgetItem::Label);
 }
 
-void KviSinglePopupEditor::contextNewLabelInside()
+void SinglePopupEditor::contextNewLabelInside()
 {
-	createNewItemInsideLastSelected(KviPopupTreeWidgetItem::Label);
+	createNewItemInsideLastSelected(PopupTreeWidgetItem::Label);
 }
 
-KviPopupTreeWidgetItem * KviSinglePopupEditor::newItem(KviPopupTreeWidgetItem * par,KviPopupTreeWidgetItem * after,KviPopupTreeWidgetItem::Type t)
+PopupTreeWidgetItem * SinglePopupEditor::newItem(PopupTreeWidgetItem * par,PopupTreeWidgetItem * after,PopupTreeWidgetItem::Type t)
 {
-	if(par)return new KviPopupTreeWidgetItem(par,after,t);
-	return new KviPopupTreeWidgetItem(m_pTreeWidget,after,t);
+	if(par)return new PopupTreeWidgetItem(par,after,t);
+	return new PopupTreeWidgetItem(m_pTreeWidget,after,t);
 }
 
-KviPopupTreeWidgetItem * KviSinglePopupEditor::newItemBelow(KviPopupTreeWidgetItem * it,KviPopupTreeWidgetItem::Type t)
+PopupTreeWidgetItem * SinglePopupEditor::newItemBelow(PopupTreeWidgetItem * it,PopupTreeWidgetItem::Type t)
 {
 	if(!it)return newItem(0,0,t);
-	return newItem((KviPopupTreeWidgetItem *)it->parent(),it,t);
+	return newItem((PopupTreeWidgetItem *)it->parent(),it,t);
 }
 
-KviPopupTreeWidgetItem * KviSinglePopupEditor::newItemAbove(KviPopupTreeWidgetItem * it,KviPopupTreeWidgetItem::Type t)
+PopupTreeWidgetItem * SinglePopupEditor::newItemAbove(PopupTreeWidgetItem * it,PopupTreeWidgetItem::Type t)
 {
 	if(!it)return newItem(0,0,t);
-	return newItem((KviPopupTreeWidgetItem *)it->parent(),(KviPopupTreeWidgetItem *)m_pTreeWidget->itemAbove(it),t);
+	return newItem((PopupTreeWidgetItem *)it->parent(),(PopupTreeWidgetItem *)m_pTreeWidget->itemAbove(it),t);
 }
 
-KviPopupTreeWidgetItem * KviSinglePopupEditor::newItemInside(KviPopupTreeWidgetItem * it,KviPopupTreeWidgetItem::Type t)
+PopupTreeWidgetItem * SinglePopupEditor::newItemInside(PopupTreeWidgetItem * it,PopupTreeWidgetItem::Type t)
 {
 	if(it)
 	{
-		if(it->m_type != KviPopupTreeWidgetItem::Menu)
+		if(it->m_type != PopupTreeWidgetItem::Menu)
 		{
 			return newItemBelow(it,t);
 		}
@@ -586,36 +586,36 @@ KviPopupTreeWidgetItem * KviSinglePopupEditor::newItemInside(KviPopupTreeWidgetI
 	return newItem(it,it,t);
 }
 
-void KviSinglePopupEditor::contextNewPrologue()
+void SinglePopupEditor::contextNewPrologue()
 {
-	KviPopupTreeWidgetItem * it = m_pLastSelectedItem ? (KviPopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
+	PopupTreeWidgetItem * it = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
 //	if(!findPrologue(it))
 //	{
-		m_pTreeWidget->setCurrentItem(newItem(it,it,KviPopupTreeWidgetItem::Prologue));
+		m_pTreeWidget->setCurrentItem(newItem(it,it,PopupTreeWidgetItem::Prologue));
 //	}
 }
 
-void KviSinglePopupEditor::contextNewEpilogue()
+void SinglePopupEditor::contextNewEpilogue()
 {
-	KviPopupTreeWidgetItem * it = m_pLastSelectedItem ? (KviPopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
+	PopupTreeWidgetItem * it = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
 //	if(!findEpilogue(it))
 //	{
-		KviPopupTreeWidgetItem * after = it ? (KviPopupTreeWidgetItem *)it->child(0) : (KviPopupTreeWidgetItem *)m_pTreeWidget->topLevelItem(0);
+		PopupTreeWidgetItem * after = it ? (PopupTreeWidgetItem *)it->child(0) : (PopupTreeWidgetItem *)m_pTreeWidget->topLevelItem(0);
 		if(after)
 		{
 			while(m_pTreeWidget->itemAbove(after))
 			{
 				if(after->parent()==m_pTreeWidget->itemAbove(after)->parent())
-					after = (KviPopupTreeWidgetItem *)m_pTreeWidget->itemAbove(after);
+					after = (PopupTreeWidgetItem *)m_pTreeWidget->itemAbove(after);
 			}
 		} else {
 			after = it;
 		}
-		m_pTreeWidget->setCurrentItem(newItem(it,after,KviPopupTreeWidgetItem::Epilogue));
+		m_pTreeWidget->setCurrentItem(newItem(it,after,PopupTreeWidgetItem::Epilogue));
 //	}
 }
 
-void KviSinglePopupEditor::contextCopy()
+void SinglePopupEditor::contextCopy()
 {
 	if(!m_pLastSelectedItem)return;
 	if(m_pClipboard)delete m_pClipboard;
@@ -623,38 +623,38 @@ void KviSinglePopupEditor::contextCopy()
 	addItemToMenu(m_pClipboard,m_pLastSelectedItem);
 }
 
-void KviSinglePopupEditor::contextCut()
+void SinglePopupEditor::contextCut()
 {
 	if(!m_pLastSelectedItem)return;
 	contextCopy();
 
-	KviPopupTreeWidgetItem * it = m_pLastSelectedItem;
+	PopupTreeWidgetItem * it = m_pLastSelectedItem;
 	m_pLastSelectedItem = 0;
 	delete it;
 	if(!m_pLastSelectedItem)selectionChanged();
 }
 
-void KviSinglePopupEditor::contextPasteBelow()
+void SinglePopupEditor::contextPasteBelow()
 {
 	if(!m_pClipboard)return;
-	KviPopupTreeWidgetItem * par = m_pLastSelectedItem ? (KviPopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
+	PopupTreeWidgetItem * par = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
 	populateMenu(m_pClipboard,par,m_pLastSelectedItem);
 }
 
-void KviSinglePopupEditor::contextPasteAbove()
+void SinglePopupEditor::contextPasteAbove()
 {
 	if(!m_pClipboard)return;
-	KviPopupTreeWidgetItem * par = m_pLastSelectedItem ? (KviPopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
-	KviPopupTreeWidgetItem * above = m_pLastSelectedItem ? (KviPopupTreeWidgetItem *)m_pTreeWidget->itemAbove(m_pLastSelectedItem) : 0;
+	PopupTreeWidgetItem * par = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pLastSelectedItem->parent() : 0;
+	PopupTreeWidgetItem * above = m_pLastSelectedItem ? (PopupTreeWidgetItem *)m_pTreeWidget->itemAbove(m_pLastSelectedItem) : 0;
 	populateMenu(m_pClipboard,par,above);
 }
 
-void KviSinglePopupEditor::contextPasteInside()
+void SinglePopupEditor::contextPasteInside()
 {
 	if(!m_pClipboard)return;
 	if(m_pLastSelectedItem)
 	{
-		if(m_pLastSelectedItem->m_type != KviPopupTreeWidgetItem::Menu)
+		if(m_pLastSelectedItem->m_type != PopupTreeWidgetItem::Menu)
 		{
 			contextPasteBelow();
 			return;
@@ -664,7 +664,7 @@ void KviSinglePopupEditor::contextPasteInside()
 	populateMenu(m_pClipboard,m_pLastSelectedItem,0);
 }
 
-void KviSinglePopupEditor::saveLastSelectedItem()
+void SinglePopupEditor::saveLastSelectedItem()
 {
 	if(!m_pLastSelectedItem)return;
 
@@ -672,9 +672,9 @@ void KviSinglePopupEditor::saveLastSelectedItem()
 
 	switch(m_pLastSelectedItem->m_type)
 	{
-		case KviPopupTreeWidgetItem::Prologue:
-		case KviPopupTreeWidgetItem::Epilogue:
-		case KviPopupTreeWidgetItem::Item:
+		case PopupTreeWidgetItem::Prologue:
+		case PopupTreeWidgetItem::Epilogue:
+		case PopupTreeWidgetItem::Item:
 		{
 			QString tmpx;
 			m_pEditor->getText(tmpx);
@@ -689,9 +689,9 @@ void KviSinglePopupEditor::saveLastSelectedItem()
 
 	switch(m_pLastSelectedItem->m_type)
 	{
-		case KviPopupTreeWidgetItem::Menu:
-		case KviPopupTreeWidgetItem::ExtMenu:
-		case KviPopupTreeWidgetItem::Item:
+		case PopupTreeWidgetItem::Menu:
+		case PopupTreeWidgetItem::ExtMenu:
+		case PopupTreeWidgetItem::Item:
 			m_pLastSelectedItem->setIcon(m_pIconEditor->text());
 		break;
 		default:
@@ -700,10 +700,10 @@ void KviSinglePopupEditor::saveLastSelectedItem()
 
 	switch(m_pLastSelectedItem->m_type)
 	{
-		case KviPopupTreeWidgetItem::Menu:
-		case KviPopupTreeWidgetItem::Item:
-		case KviPopupTreeWidgetItem::Label:
-		case KviPopupTreeWidgetItem::ExtMenu:
+		case PopupTreeWidgetItem::Menu:
+		case PopupTreeWidgetItem::Item:
+		case PopupTreeWidgetItem::Label:
+		case PopupTreeWidgetItem::ExtMenu:
 			m_pLastSelectedItem->setItemText(m_pTextEditor->text());
 		break;
 		default:
@@ -712,61 +712,61 @@ void KviSinglePopupEditor::saveLastSelectedItem()
 
 	switch(m_pLastSelectedItem->m_type)
 	{
-		case KviPopupTreeWidgetItem::Menu:
-		case KviPopupTreeWidgetItem::Item:
-		case KviPopupTreeWidgetItem::Label:
-		case KviPopupTreeWidgetItem::ExtMenu:
-		case KviPopupTreeWidgetItem::Separator:
+		case PopupTreeWidgetItem::Menu:
+		case PopupTreeWidgetItem::Item:
+		case PopupTreeWidgetItem::Label:
+		case PopupTreeWidgetItem::ExtMenu:
+		case PopupTreeWidgetItem::Separator:
 			m_pLastSelectedItem->setCondition(m_pConditionEditor->text());
 		break;
 		default:
 		break;
 	}
 
-	if(m_pLastSelectedItem->m_type == KviPopupTreeWidgetItem::ExtMenu)
+	if(m_pLastSelectedItem->m_type == PopupTreeWidgetItem::ExtMenu)
 	{
 		m_pLastSelectedItem->setCode(m_pExtNameEditor->text());
 	}
 }
 
-void KviSinglePopupEditor::addItemToMenu(KviKvsPopupMenu * p,KviPopupTreeWidgetItem *it)
+void SinglePopupEditor::addItemToMenu(KviKvsPopupMenu * p,PopupTreeWidgetItem *it)
 {
 	it->m_szId.trimmed();
 	switch(it->m_type)
 	{
-		case KviPopupTreeWidgetItem::Prologue:
+		case PopupTreeWidgetItem::Prologue:
 			it->m_szCode.trimmed();
 			p->addPrologue(it->m_szId,it->m_szCode);
 		break;
-		case KviPopupTreeWidgetItem::Epilogue:
+		case PopupTreeWidgetItem::Epilogue:
 			it->m_szCode.trimmed();
 			p->addEpilogue(it->m_szId,it->m_szCode);
 		break;
-		case KviPopupTreeWidgetItem::Separator:
+		case PopupTreeWidgetItem::Separator:
 			it->m_szCondition.trimmed();
 			p->addSeparator(it->m_szId,it->m_szCondition);
 		break;
-		case KviPopupTreeWidgetItem::Label:
+		case PopupTreeWidgetItem::Label:
 			it->m_szText.trimmed();
 			it->m_szCondition.trimmed();
 			it->m_szIcon.trimmed();
 			p->addLabel(it->m_szId,it->m_szText,it->m_szIcon,it->m_szCondition);
 		break;
-		case KviPopupTreeWidgetItem::Item:
+		case PopupTreeWidgetItem::Item:
 			it->m_szText.trimmed();
 			it->m_szIcon.trimmed();
 			it->m_szCondition.trimmed();
 			it->m_szCode.trimmed();
 			p->addItem(it->m_szId,it->m_szCode,it->m_szText,it->m_szIcon,it->m_szCondition);
 		break;
-		case KviPopupTreeWidgetItem::ExtMenu:
+		case PopupTreeWidgetItem::ExtMenu:
 			it->m_szText.trimmed();
 			it->m_szIcon.trimmed();
 			it->m_szCondition.trimmed();
 			it->m_szCode.trimmed();// <-- this is the ext name in fact
 			p->addExtPopup(it->m_szId,it->m_szCode,it->m_szText,it->m_szIcon,it->m_szCondition);
 		break;
-		case KviPopupTreeWidgetItem::Menu:
+		case PopupTreeWidgetItem::Menu:
 		{
 			it->m_szText.trimmed();
 			it->m_szIcon.trimmed();
@@ -775,7 +775,7 @@ void KviSinglePopupEditor::addItemToMenu(KviKvsPopupMenu * p,KviPopupTreeWidgetI
 			int count= it->childCount();
 			for(int i=0; i<count; i++)
 			{
-				addItemToMenu(menu,(KviPopupTreeWidgetItem *)it->child(i));
+				addItemToMenu(menu,(PopupTreeWidgetItem *)it->child(i));
 			}
 		}
 		break;
@@ -784,7 +784,7 @@ void KviSinglePopupEditor::addItemToMenu(KviKvsPopupMenu * p,KviPopupTreeWidgetI
 	}
 }
 
-KviKvsPopupMenu * KviSinglePopupEditor::getMenu()
+KviKvsPopupMenu * SinglePopupEditor::getMenu()
 {
 	saveLastSelectedItem();
 
@@ -796,12 +796,12 @@ KviKvsPopupMenu * KviSinglePopupEditor::getMenu()
 	int count= m_pTreeWidget->topLevelItemCount();
 	for(int i=0; i<count; i++)
 	{
-		addItemToMenu(p,(KviPopupTreeWidgetItem *)m_pTreeWidget->topLevelItem(i));
+		addItemToMenu(p,(PopupTreeWidgetItem *)m_pTreeWidget->topLevelItem(i));
 	}
 	return p;
 }
 
-void KviSinglePopupEditor::selectionChanged()
+void SinglePopupEditor::selectionChanged()
 {
 	saveLastSelectedItem();
 
@@ -822,67 +822,67 @@ void KviSinglePopupEditor::selectionChanged()
 
 	if(it)
 	{
-		m_pIdEditor->setText(((KviPopupTreeWidgetItem *)it)->m_szId);
+		m_pIdEditor->setText(((PopupTreeWidgetItem *)it)->m_szId);
 
-		switch(((KviPopupTreeWidgetItem *)it)->m_type)
+		switch(((PopupTreeWidgetItem *)it)->m_type)
 		{
-			case KviPopupTreeWidgetItem::Prologue:
-			case KviPopupTreeWidgetItem::Epilogue:
-			case KviPopupTreeWidgetItem::Item:
-				m_pEditor->setText(((KviPopupTreeWidgetItem *)it)->m_szCode);
+			case PopupTreeWidgetItem::Prologue:
+			case PopupTreeWidgetItem::Epilogue:
+			case PopupTreeWidgetItem::Item:
+				m_pEditor->setText(((PopupTreeWidgetItem *)it)->m_szCode);
 				bEditorEnabled = true;
 			break;
 			default:
 			break;
 		}
 
-		switch(((KviPopupTreeWidgetItem *)it)->m_type)
+		switch(((PopupTreeWidgetItem *)it)->m_type)
 		{
-			case KviPopupTreeWidgetItem::Menu:
-			case KviPopupTreeWidgetItem::Item:
-			case KviPopupTreeWidgetItem::Label:
-			case KviPopupTreeWidgetItem::ExtMenu:
-				m_pIconEditor->setText(((KviPopupTreeWidgetItem *)it)->m_szIcon);
+			case PopupTreeWidgetItem::Menu:
+			case PopupTreeWidgetItem::Item:
+			case PopupTreeWidgetItem::Label:
+			case PopupTreeWidgetItem::ExtMenu:
+				m_pIconEditor->setText(((PopupTreeWidgetItem *)it)->m_szIcon);
 				bIconEditorEnabled = true;
 			break;
 			default:
 			break;		}
 
-		switch(((KviPopupTreeWidgetItem *)it)->m_type)
+		switch(((PopupTreeWidgetItem *)it)->m_type)
 		{
-			case KviPopupTreeWidgetItem::Menu:
-			case KviPopupTreeWidgetItem::Item:
-			case KviPopupTreeWidgetItem::Label:
-			case KviPopupTreeWidgetItem::ExtMenu:
-				m_pTextEditor->setText(((KviPopupTreeWidgetItem *)it)->m_szText);
+			case PopupTreeWidgetItem::Menu:
+			case PopupTreeWidgetItem::Item:
+			case PopupTreeWidgetItem::Label:
+			case PopupTreeWidgetItem::ExtMenu:
+				m_pTextEditor->setText(((PopupTreeWidgetItem *)it)->m_szText);
 				bTextEditorEnabled = true;
 			break;
 			default:
 			break;
 		}
 
-		switch(((KviPopupTreeWidgetItem *)it)->m_type)
+		switch(((PopupTreeWidgetItem *)it)->m_type)
 		{
-			case KviPopupTreeWidgetItem::Menu:
-			case KviPopupTreeWidgetItem::Item:
-			case KviPopupTreeWidgetItem::Label:
-			case KviPopupTreeWidgetItem::ExtMenu:
-			case KviPopupTreeWidgetItem::Separator:
-				m_pConditionEditor->setText(((KviPopupTreeWidgetItem *)it)->m_szCondition);
+			case PopupTreeWidgetItem::Menu:
+			case PopupTreeWidgetItem::Item:
+			case PopupTreeWidgetItem::Label:
+			case PopupTreeWidgetItem::ExtMenu:
+			case PopupTreeWidgetItem::Separator:
+				m_pConditionEditor->setText(((PopupTreeWidgetItem *)it)->m_szCondition);
 				bConditionEditorEnabled = true;
 			break;
 			default:
 			break;
 		}
 
-		if(((KviPopupTreeWidgetItem *)it)->m_type == KviPopupTreeWidgetItem::ExtMenu)
+		if(((PopupTreeWidgetItem *)it)->m_type == PopupTreeWidgetItem::ExtMenu)
 		{
-			m_pExtNameEditor->setText(((KviPopupTreeWidgetItem *)it)->m_szCode);
+			m_pExtNameEditor->setText(((PopupTreeWidgetItem *)it)->m_szCode);
 			bNameEditorEnabled =true;
 		}
 	}
 
-	m_pLastSelectedItem = (KviPopupTreeWidgetItem *)it;
+	m_pLastSelectedItem = (PopupTreeWidgetItem *)it;
 
 	if(!bEditorEnabled)m_pEditor->setText("");
 	m_pEditor->setEnabled(bEditorEnabled);
@@ -898,25 +898,25 @@ void KviSinglePopupEditor::selectionChanged()
 	m_pIdEditor->setEnabled(it);
 }
 
-void KviSinglePopupEditor::populateMenu(KviKvsPopupMenu * pop,KviPopupTreeWidgetItem * par,KviPopupTreeWidgetItem * theItem)
+void SinglePopupEditor::populateMenu(KviKvsPopupMenu * pop,PopupTreeWidgetItem * par,PopupTreeWidgetItem * theItem)
 {
 	if(!pop)return;
 
 	for(KviKvsScript * sp = pop->prologues()->first();sp;sp = pop->prologues()->next())
 	{
-		if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Prologue);
-		else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Prologue);
+		if(par)theItem = new PopupTreeWidgetItem(par,theItem,PopupTreeWidgetItem::Prologue);
+		else theItem = new PopupTreeWidgetItem(m_pTreeWidget,theItem,PopupTreeWidgetItem::Prologue);
 		theItem->setCode(sp->code());
 		theItem->setId(sp->name());
 	}
 
-	for(KviKvsPopupMenuItem * item = pop->m_pItemList->first();item;item = pop->m_pItemList->next())
+	for(KviKvsPopupMenuItem * item = pop->itemList()->first();item;item = pop->itemList()->next())
 	{
 		switch(item->type())
 		{
 			case KviKvsPopupMenuItem::Item:
-				if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Item);
-				else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Item);
+				if(par)theItem = new PopupTreeWidgetItem(par,theItem,PopupTreeWidgetItem::Item);
+				else theItem = new PopupTreeWidgetItem(m_pTreeWidget,theItem,PopupTreeWidgetItem::Item);
 				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString());
 				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString());
 				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString());
@@ -924,8 +924,8 @@ void KviSinglePopupEditor::populateMenu(KviKvsPopupMenu * pop,KviPopupTreeWidget
 				theItem->setId(item->name());
 			break;
 			case KviKvsPopupMenuItem::ExtMenu:
-				if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::ExtMenu);
-				else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::ExtMenu);
+				if(par)theItem = new PopupTreeWidgetItem(par,theItem,PopupTreeWidgetItem::ExtMenu);
+				else theItem = new PopupTreeWidgetItem(m_pTreeWidget,theItem,PopupTreeWidgetItem::ExtMenu);
 				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString());
 				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString());
 				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString());
@@ -933,22 +933,22 @@ void KviSinglePopupEditor::populateMenu(KviKvsPopupMenu * pop,KviPopupTreeWidget
 				theItem->setId(item->name());
 			break;
 			case KviKvsPopupMenuItem::Label:
-				if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Label);
-				else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Label);
+				if(par)theItem = new PopupTreeWidgetItem(par,theItem,PopupTreeWidgetItem::Label);
+				else theItem = new PopupTreeWidgetItem(m_pTreeWidget,theItem,PopupTreeWidgetItem::Label);
 				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString());
 				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString());
 				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString());
 				theItem->setId(item->name());
 			break;
 			case KviKvsPopupMenuItem::Separator:
-				if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Separator);
-				else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Separator);
+				if(par)theItem = new PopupTreeWidgetItem(par,theItem,PopupTreeWidgetItem::Separator);
+				else theItem = new PopupTreeWidgetItem(m_pTreeWidget,theItem,PopupTreeWidgetItem::Separator);
 				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString());
 				theItem->setId(item->name());
 			break;
 			case KviKvsPopupMenuItem::Menu:
-				if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Menu);
-				else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Menu);
+				if(par)theItem = new PopupTreeWidgetItem(par,theItem,PopupTreeWidgetItem::Menu);
+				else theItem = new PopupTreeWidgetItem(m_pTreeWidget,theItem,PopupTreeWidgetItem::Menu);
 				theItem->setIcon(item->kvsIcon() ? item->kvsIcon()->code() : QString());
 				theItem->setItemText(item->kvsText() ? item->kvsText()->code() : QString());
 				theItem->setCondition(item->kvsCondition() ? item->kvsCondition()->code() : QString());
@@ -962,8 +962,8 @@ void KviSinglePopupEditor::populateMenu(KviKvsPopupMenu * pop,KviPopupTreeWidget
 
 	for(KviKvsScript * se = pop->epilogues()->first();se;se = pop->epilogues()->next())
 	{
-		if(par)theItem = new KviPopupTreeWidgetItem(par,theItem,KviPopupTreeWidgetItem::Epilogue);
-		else theItem = new KviPopupTreeWidgetItem(m_pTreeWidget,theItem,KviPopupTreeWidgetItem::Epilogue);
+		if(par)theItem = new PopupTreeWidgetItem(par,theItem,PopupTreeWidgetItem::Epilogue);
+		else theItem = new PopupTreeWidgetItem(m_pTreeWidget,theItem,PopupTreeWidgetItem::Epilogue);
 		theItem->setCode(se->code());
 		theItem->setId(se->name());
 	}
@@ -971,7 +971,7 @@ void KviSinglePopupEditor::populateMenu(KviKvsPopupMenu * pop,KviPopupTreeWidget
 	m_pTreeWidget->resizeColumnToContents(0);
 }
 
-void KviSinglePopupEditor::edit(KviMenuTreeWidgetItem * it)
+void SinglePopupEditor::edit(MenuTreeWidgetItem * it)
 {
 	saveLastSelectedItem();
 
@@ -1007,7 +1007,7 @@ void KviSinglePopupEditor::edit(KviMenuTreeWidgetItem * it)
 }
 
 
-KviMenuTreeWidgetItem::KviMenuTreeWidgetItem(QTreeWidget * par,KviKvsPopupMenu * popup)
+MenuTreeWidgetItem::MenuTreeWidgetItem(QTreeWidget * par,KviKvsPopupMenu * popup)
 : QTreeWidgetItem(par)
 {
 	setIcon(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUP)));
@@ -1015,18 +1015,18 @@ KviMenuTreeWidgetItem::KviMenuTreeWidgetItem(QTreeWidget * par,KviKvsPopupMenu *
 	m_pPopup = popup;
 }
 
-KviMenuTreeWidgetItem::~KviMenuTreeWidgetItem()
+MenuTreeWidgetItem::~MenuTreeWidgetItem()
 {
 	delete m_pPopup;
 }
 
-void KviMenuTreeWidgetItem::replacePopup(KviKvsPopupMenu * popup)
+void MenuTreeWidgetItem::replacePopup(KviKvsPopupMenu * popup)
 {
 	delete m_pPopup;
 	m_pPopup = popup;
 }
 
-KviPopupEditor::KviPopupEditor(QWidget * par)
+PopupEditorWidget::PopupEditorWidget(QWidget * par)
 : QWidget(par)
 {
 	m_bSaving = false;
@@ -1049,7 +1049,7 @@ KviPopupEditor::KviPopupEditor(QWidget * par)
 	QPushButton * gn = new QPushButton(__tr2qs_ctx("&Export selected To...","editor"),box);
 	connect(gn,SIGNAL(clicked()),this,SLOT(exportSelected()));
 
-	m_pEditor = new KviSinglePopupEditor(spl);
+	m_pEditor = new SinglePopupEditor(spl);
 
 	m_bOneTimeSetupDone = false;
 	m_pLastEditedItem = 0;
@@ -1063,11 +1063,11 @@ KviPopupEditor::KviPopupEditor(QWidget * par)
 	currentItemChanged(0,0);
 }
 
-KviPopupEditor::~KviPopupEditor()
+PopupEditorWidget::~PopupEditorWidget()
 {
 }
 
-void KviPopupEditor::oneTimeSetup()
+void PopupEditorWidget::oneTimeSetup()
 {
 	if(m_bOneTimeSetupDone)return;
 	m_bOneTimeSetupDone = true;
@@ -1082,7 +1082,7 @@ void KviPopupEditor::oneTimeSetup()
 		KviKvsPopupMenu * popup = it.current();
 		KviKvsPopupMenu * copy = new KviKvsPopupMenu(popup->popupName());
 		copy->copyFrom(popup);
-		new KviMenuTreeWidgetItem(m_pTreeWidget,copy);
+		new MenuTreeWidgetItem(m_pTreeWidget,copy);
 		++it;
 	}
 
@@ -1093,7 +1093,7 @@ void KviPopupEditor::oneTimeSetup()
 	connect(KviKvsPopupManager::instance(),SIGNAL(popupRefresh(const QString &)),this,SLOT(popupRefresh(const QString &)));
 }
 
-void KviPopupEditor::popupRefresh(const QString &szName)
+void PopupEditorWidget::popupRefresh(const QString &szName)
 {
 	if(m_bSaving)
 		return;
@@ -1106,7 +1106,7 @@ void KviPopupEditor::popupRefresh(const QString &szName)
 	// if it already exists, replace its popup
 	for(int i=0; i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		KviMenuTreeWidgetItem * ch = (KviMenuTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		MenuTreeWidgetItem * ch = (MenuTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 
 		if(KviQString::equalCI(szName,ch->m_pPopup->popupName()))
 		{
@@ -1131,10 +1131,10 @@ void KviPopupEditor::popupRefresh(const QString &szName)
 	// create it
 	KviKvsPopupMenu * pCopy = new KviKvsPopupMenu(szName);
 	pCopy->copyFrom(pPopup);
-	new KviMenuTreeWidgetItem(m_pTreeWidget,pCopy);
+	new MenuTreeWidgetItem(m_pTreeWidget,pCopy);
 }
 
-void KviPopupEditor::customContextMenuRequested(const QPoint &pos)
+void PopupEditorWidget::customContextMenuRequested(const QPoint &pos)
 {
 	QTreeWidgetItem *it=m_pTreeWidget->itemAt(pos);
 	KVI_ASSERT(m_bOneTimeSetupDone);
@@ -1172,7 +1172,7 @@ void KviPopupEditor::customContextMenuRequested(const QPoint &pos)
 	}
 }
 
-void KviPopupEditor::exportCurrentPopup()
+void PopupEditorWidget::exportCurrentPopup()
 {
 	if(!m_pLastEditedItem)return;
 	saveLastEditedItem();
@@ -1196,19 +1196,19 @@ void KviPopupEditor::exportCurrentPopup()
 	}
 }
 
-void KviPopupEditor::exportAll()
+void PopupEditorWidget::exportAll()
 {
 	bool bSelectedOnly=true;
 	exportPopups(bSelectedOnly);
 }
 
-void KviPopupEditor::exportSelected()
+void PopupEditorWidget::exportSelected()
 {
 	bool bSelectedOnly=false;
 	exportPopups(bSelectedOnly);
 }
 
-void KviPopupEditor::exportPopups(bool bSelectedOnly)
+void PopupEditorWidget::exportPopups(bool bSelectedOnly)
 {
 	saveLastEditedItem();
 
@@ -1217,7 +1217,7 @@ void KviPopupEditor::exportPopups(bool bSelectedOnly)
 
 	for(int i=0; i<topcount;i++)
 	{
-		KviMenuTreeWidgetItem * it = (KviMenuTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		MenuTreeWidgetItem * it = (MenuTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		if ( (it->isSelected()) || (bSelectedOnly == true) )
 		{
 			count++;
@@ -1243,26 +1243,26 @@ void KviPopupEditor::exportPopups(bool bSelectedOnly)
 	}
 }
 
-void KviPopupEditor::removeCurrentPopup()
+void PopupEditorWidget::removeCurrentPopup()
 {
 	if(m_pLastEditedItem)
 	{
-		KviMenuTreeWidgetItem * it = m_pLastEditedItem;
+		MenuTreeWidgetItem * it = m_pLastEditedItem;
 		m_pLastEditedItem = 0;
 		delete it;
 		if(!m_pLastEditedItem)currentItemChanged(0,0);
 	}
 }
 
-void KviPopupEditor::newPopup()
+void PopupEditorWidget::newPopup()
 {
 	QString newName;
 	getUniquePopupName(0,newName);
-	KviMenuTreeWidgetItem * it = new KviMenuTreeWidgetItem(m_pTreeWidget,new KviKvsPopupMenu(newName));
+	MenuTreeWidgetItem * it = new MenuTreeWidgetItem(m_pTreeWidget,new KviKvsPopupMenu(newName));
 	m_pTreeWidget->setCurrentItem(it);
 }
 
-void KviPopupEditor::saveLastEditedItem()
+void PopupEditorWidget::saveLastEditedItem()
 {
 	if(m_pLastEditedItem == 0)return;
 
@@ -1279,22 +1279,22 @@ void KviPopupEditor::saveLastEditedItem()
 	m_pLastEditedItem->setText(0,m->popupName());
 }
 
-void KviPopupEditor::currentItemChanged(QTreeWidgetItem *it, QTreeWidgetItem *)
+void PopupEditorWidget::currentItemChanged(QTreeWidgetItem *it, QTreeWidgetItem *)
 {
 	saveLastEditedItem();
 
-	m_pLastEditedItem = (KviMenuTreeWidgetItem *)it;
+	m_pLastEditedItem = (MenuTreeWidgetItem *)it;
 
 	m_pEditor->edit(m_pLastEditedItem);
 }
 
-void KviPopupEditor::showEvent(QShowEvent *e)
+void PopupEditorWidget::showEvent(QShowEvent *e)
 {
 	oneTimeSetup();
 	QWidget::showEvent(e);
 }
 
-void KviPopupEditor::commit()
+void PopupEditorWidget::commit()
 {
 	m_bSaving = true;
 	if(!m_bOneTimeSetupDone)return;
@@ -1311,7 +1311,7 @@ void KviPopupEditor::commit()
 
 	for(int i=0; i<topcount;i++)
 	{
-		KviMenuTreeWidgetItem * it = (KviMenuTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		MenuTreeWidgetItem * it = (MenuTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		KviKvsPopupMenu * p = KviKvsPopupManager::instance()->get(it->m_pPopup->popupName());
 		p->doClear();
 		p->copyFrom(it->m_pPopup);
@@ -1334,7 +1334,7 @@ void KviPopupEditor::commit()
 	m_bSaving = false;
 }
 
-void KviPopupEditor::getUniquePopupName(KviMenuTreeWidgetItem *item,QString &buffer)
+void PopupEditorWidget::getUniquePopupName(MenuTreeWidgetItem *item,QString &buffer)
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 
@@ -1351,7 +1351,7 @@ void KviPopupEditor::getUniquePopupName(KviMenuTreeWidgetItem *item,QString &buf
 
 		for(int i=0; i<topcount;i++)
 		{
-			KviMenuTreeWidgetItem * ch = (KviMenuTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+			MenuTreeWidgetItem * ch = (MenuTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 
 			if(KviQString::equalCI(newName,ch->m_pPopup->popupName()) && (ch != item))
 			{
@@ -1368,13 +1368,13 @@ void KviPopupEditor::getUniquePopupName(KviMenuTreeWidgetItem *item,QString &buf
 }
 
 
-KviPopupEditorWindow::KviPopupEditorWindow(KviMainWindow * lpFrm)
+PopupEditorWindow::PopupEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"popupeditor",0)
 {
 	g_pPopupEditorWindow = this;
 
 	QGridLayout * g = new QGridLayout();
-	m_pEditor = new KviPopupEditor(this);
+	m_pEditor = new PopupEditorWidget(this);
 	g->addWidget(m_pEditor,0,0,1,4);
 
 	QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this);
@@ -1397,43 +1397,43 @@ KviPopupEditorWindow::KviPopupEditorWindow(KviMainWindow * lpFrm)
 	setLayout(g);
 }
 
-KviPopupEditorWindow::~KviPopupEditorWindow()
+PopupEditorWindow::~PopupEditorWindow()
 {
 	g_pPopupEditorWindow = 0;
 }
 
-void KviPopupEditorWindow::okClicked()
+void PopupEditorWindow::okClicked()
 {
 	m_pEditor->commit();
 	close();
 }
 
-void KviPopupEditorWindow::applyClicked()
+void PopupEditorWindow::applyClicked()
 {
 	m_pEditor->commit();
 }
 
-void KviPopupEditorWindow::cancelClicked()
+void PopupEditorWindow::cancelClicked()
 {
 	close();
 }
 
-QPixmap * KviPopupEditorWindow::myIconPtr()
+QPixmap * PopupEditorWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUP);
 }
 
-void KviPopupEditorWindow::fillCaptionBuffers()
+void PopupEditorWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Popup Editor","editor");
 }
 
-void KviPopupEditorWindow::getConfigGroupName(QString &szName)
+void PopupEditorWindow::getConfigGroupName(QString &szName)
 {
 	szName = "popupeditor";
 }
 
-void KviPopupEditorWindow::saveProperties(KviConfigurationFile *) //cfg
+void PopupEditorWindow::saveProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
@@ -1444,7 +1444,7 @@ void KviPopupEditorWindow::saveProperties(KviConfigurationFile *) //cfg
 */
 }
 
-void KviPopupEditorWindow::loadProperties(KviConfigurationFile *) // cfg
+void PopupEditorWindow::loadProperties(KviConfigurationFile *) // cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/PopupEditorWindow.h
index 75089d246..cb2873502 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/PopupEditorWindow.h
@@ -2,7 +2,7 @@
 #define _POPUPEDITOR_H_
 //=============================================================================
 //
-//   File : popupeditor.h
+//   File : PopupEditorWindow.h
 //   Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -36,16 +36,16 @@
 class KviKvsPopupMenu;
 class KviKvsPopupMenuItem;
 class KviScriptEditor;
-class KviMenuTreeWidgetItem;
+class MenuTreeWidgetItem;
 
-// KviPopupTreeWidgetItem
-class KviPopupTreeWidgetItem : public QTreeWidgetItem
+// PopupTreeWidgetItem
+class PopupTreeWidgetItem : public QTreeWidgetItem
 {
 public:
 	enum Type { Item, Menu, Separator, Label, Epilogue, Prologue, ExtMenu };
 public:
-	KviPopupTreeWidgetItem(QTreeWidget * pTreeWidget,KviPopupTreeWidgetItem * after,Type t);
-	KviPopupTreeWidgetItem(KviPopupTreeWidgetItem * parent,KviPopupTreeWidgetItem * after,Type t);
+	PopupTreeWidgetItem(QTreeWidget * pTreeWidget,PopupTreeWidgetItem * after,Type t);
+	PopupTreeWidgetItem(PopupTreeWidgetItem * parent,PopupTreeWidgetItem * after,Type t);
 public:
 	Type                   m_type;
 	QString                m_szText;
@@ -64,17 +64,17 @@ public:
 };
 
 
-class KviSinglePopupEditor : public QWidget
+class SinglePopupEditor : public QWidget
 {
 	Q_OBJECT
 public:
-	KviSinglePopupEditor(QWidget * par);
-	~KviSinglePopupEditor();
+	SinglePopupEditor(QWidget * par);
+	~SinglePopupEditor();
 protected:
 	QPushButton          * m_pMenuButton;
 	KviKvsPopupMenu      * m_pClipboard;
 	KviKvsPopupMenu      * m_pTestPopup;
-	KviPopupTreeWidgetItem * m_pLastSelectedItem;
+	PopupTreeWidgetItem * m_pLastSelectedItem;
 	QTreeWidget     * m_pTreeWidget;
 	QLineEdit            * m_pNameEditor;
 	KviScriptEditor      * m_pEditor;
@@ -85,21 +85,21 @@ protected:
 	QLineEdit            * m_pExtNameEditor;
 	KviTalPopupMenu      * m_pContextPopup;
 public:
-	void edit(KviMenuTreeWidgetItem * it);
+	void edit(MenuTreeWidgetItem * it);
 	KviKvsPopupMenu * getMenu();
 protected:
 	// theItem is the item above the first item that has to be inserted
-	void populateMenu(KviKvsPopupMenu * pop,KviPopupTreeWidgetItem * par,KviPopupTreeWidgetItem * theItem = 0);
+	void populateMenu(KviKvsPopupMenu * pop,PopupTreeWidgetItem * par,PopupTreeWidgetItem * theItem = 0);
 	void saveLastSelectedItem();
-	void addItemToMenu(KviKvsPopupMenu * pop,KviPopupTreeWidgetItem * par);
-	KviPopupTreeWidgetItem * newItem(KviPopupTreeWidgetItem * par,KviPopupTreeWidgetItem * after,KviPopupTreeWidgetItem::Type t);
-	KviPopupTreeWidgetItem * newItemBelow(KviPopupTreeWidgetItem * it,KviPopupTreeWidgetItem::Type t);
-	KviPopupTreeWidgetItem * newItemAbove(KviPopupTreeWidgetItem * it,KviPopupTreeWidgetItem::Type t);
-	KviPopupTreeWidgetItem * newItemInside(KviPopupTreeWidgetItem * it,KviPopupTreeWidgetItem::Type t);
-	void createNewItemAboveLastSelected(KviPopupTreeWidgetItem::Type t);
-	void createNewItemBelowLastSelected(KviPopupTreeWidgetItem::Type t);
-	void createNewItemInsideLastSelected(KviPopupTreeWidgetItem::Type t);
-	KviPopupTreeWidgetItem * findMatchingItem(KviKvsPopupMenuItem * it,KviPopupTreeWidgetItem * item);
+	void addItemToMenu(KviKvsPopupMenu * pop,PopupTreeWidgetItem * par);
+	PopupTreeWidgetItem * newItem(PopupTreeWidgetItem * par,PopupTreeWidgetItem * after,PopupTreeWidgetItem::Type t);
+	PopupTreeWidgetItem * newItemBelow(PopupTreeWidgetItem * it,PopupTreeWidgetItem::Type t);
+	PopupTreeWidgetItem * newItemAbove(PopupTreeWidgetItem * it,PopupTreeWidgetItem::Type t);
+	PopupTreeWidgetItem * newItemInside(PopupTreeWidgetItem * it,PopupTreeWidgetItem::Type t);
+	void createNewItemAboveLastSelected(PopupTreeWidgetItem::Type t);
+	void createNewItemBelowLastSelected(PopupTreeWidgetItem::Type t);
+	void createNewItemInsideLastSelected(PopupTreeWidgetItem::Type t);
+	PopupTreeWidgetItem * findMatchingItem(KviKvsPopupMenuItem * it,PopupTreeWidgetItem * item);
 protected slots:
 	void contextCut();
 	void contextCopy();
@@ -131,11 +131,11 @@ protected slots:
 
 
 
-class KviMenuTreeWidgetItem : public QTreeWidgetItem
+class MenuTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviMenuTreeWidgetItem(QTreeWidget * par,KviKvsPopupMenu * popup);
-	~KviMenuTreeWidgetItem();
+	MenuTreeWidgetItem(QTreeWidget * par,KviKvsPopupMenu * popup);
+	~MenuTreeWidgetItem();
 public:
 	KviKvsPopupMenu * m_pPopup;
 public:
@@ -145,16 +145,16 @@ public:
 };
 
 
-class KviPopupEditor : public QWidget
+class PopupEditorWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	KviPopupEditor(QWidget * par);
-	~KviPopupEditor();
+	PopupEditorWidget(QWidget * par);
+	~PopupEditorWidget();
 public:
-	KviSinglePopupEditor * m_pEditor;
+	SinglePopupEditor * m_pEditor;
 	QTreeWidget     * m_pTreeWidget;
-	KviMenuTreeWidgetItem  * m_pLastEditedItem;
+	MenuTreeWidgetItem  * m_pLastEditedItem;
 	bool                   m_bOneTimeSetupDone;
 	KviTalPopupMenu      * m_pContextPopup;
 	KviTalPopupMenu      * m_pEmptyContextPopup;
@@ -173,23 +173,23 @@ protected slots:
 	void popupRefresh(const QString &szName);
 protected:
 	void showEvent(QShowEvent *e);
-	void getExportPopupBuffer(QString &buffer,KviMenuTreeWidgetItem * it);
+	void getExportPopupBuffer(QString &buffer,MenuTreeWidgetItem * it);
 private:
 	void oneTimeSetup();
 	void saveLastEditedItem();
-	void getUniquePopupName(KviMenuTreeWidgetItem * it,QString &buffer);
+	void getUniquePopupName(MenuTreeWidgetItem * it,QString &buffer);
 };
 
 
 
-class KviPopupEditorWindow : public KviWindow
+class PopupEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviPopupEditorWindow(KviMainWindow * lpFrm);
-	~KviPopupEditorWindow();
+	PopupEditorWindow(KviMainWindow * lpFrm);
+	~PopupEditorWindow();
 protected:
-	KviPopupEditor * m_pEditor;
+	PopupEditorWidget * m_pEditor;
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp
index 6fef3cddd..6db24dc08 100644
--- a/src/modules/popupeditor/libkvipopupeditor.cpp
+++ b/src/modules/popupeditor/libkvipopupeditor.cpp
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "popupeditor.h"
+#include "PopupEditorWindow.h"
 
 #include "KviModule.h"
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
 
-KviPopupEditorWindow * g_pPopupEditorWindow = 0;
+PopupEditorWindow * g_pPopupEditorWindow = 0;
 
 
 /*
@@ -50,7 +50,7 @@ static bool popupeditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	if(!g_pPopupEditorWindow)
 	{
-		g_pPopupEditorWindow = new KviPopupEditorWindow(c->window()->frame());
+		g_pPopupEditorWindow = new PopupEditorWindow(c->window()->frame());
 		c->window()->frame()->addWindow(g_pPopupEditorWindow);
 	}
 
diff --git a/src/modules/raweditor/CMakeLists.txt b/src/modules/raweditor/CMakeLists.txt
index 1c02c2457..12eb3710d 100644
--- a/src/modules/raweditor/CMakeLists.txt
+++ b/src/modules/raweditor/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/raweditor
 
 SET(kviraweditor_MOC_HDRS
-	raweditor.h
+	RawEditorWindow.h
 )
 
 SET(kviraweditor_SRCS
 	libkviraweditor.cpp
-	raweditor.cpp
+	RawEditorWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index 5534f2c19..234472c8d 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : raweditor.cpp
+//   File : RawEditorWindow.cpp
 //   Creation date : Mon Dec 23 2002 20:28:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "raweditor.h"
+#include "RawEditorWindow.h"
 
 #include "KviIconManager.h"
 #include "KviIconManager.h"
@@ -49,10 +49,10 @@
 #include <QInputDialog>
 #include <QPushButton>
 
-extern KviRawEditorWindow * g_pRawEditorWindow;
+extern RawEditorWindow * g_pRawEditorWindow;
 
 
-KviRawTreeWidgetItem::KviRawTreeWidgetItem(QTreeWidget *par,int idx,bool bEnabled)
+RawTreeWidgetItem::RawTreeWidgetItem(QTreeWidget *par,int idx,bool bEnabled)
 : QTreeWidgetItem(par)
 {
 	m_iIdx = idx;
@@ -62,12 +62,12 @@ KviRawTreeWidgetItem::KviRawTreeWidgetItem(QTreeWidget *par,int idx,bool bEnable
 	setEnabled(bEnabled);
 }
 
-void KviRawHandlerTreeWidgetItem::setName(const QString &szName)
+void RawHandlerTreeWidgetItem::setName(const QString &szName)
 {
 	setText(0,szName);
 }
 
-KviRawEditor::KviRawEditor(QWidget * par)
+RawEditorWidget::RawEditorWidget(QWidget * par)
 : QWidget(par)
 {
 	setObjectName("raw_event_editor");
@@ -80,7 +80,7 @@ KviRawEditor::KviRawEditor(QWidget * par)
 
 	KviTalVBox * boxi = new KviTalVBox(spl);
 	boxi->setMaximumWidth(200);
-	m_pTreeWidget = new KviRawTreeWidget(boxi);
+	m_pTreeWidget = new RawTreeWidget(boxi);
 
 
 
@@ -109,29 +109,29 @@ KviRawEditor::KviRawEditor(QWidget * par)
 	m_pLastEditedItem = 0;
 }
 
-KviRawEditor::~KviRawEditor()
+RawEditorWidget::~RawEditorWidget()
 {
 	KviScriptEditor::destroyInstance(m_pEditor);
 }
 
-void KviRawEditor::oneTimeSetup()
+void RawEditorWidget::oneTimeSetup()
 {
 	if(m_bOneTimeSetupDone)return;
 	m_bOneTimeSetupDone = true;
 
-	KviRawTreeWidgetItem * it;
+	RawTreeWidgetItem * it;
 
 	for(unsigned int i = 0;i < 999;i++)
 	{
 		KviPointerList<KviKvsEventHandler> * l = KviKvsEventManager::instance()->rawHandlers(i);
 		if(l)
 		{
-			it = new KviRawTreeWidgetItem(m_pTreeWidget,i,true);
+			it = new RawTreeWidgetItem(m_pTreeWidget,i,true);
 			for(KviKvsEventHandler * s = l->first();s;s = l->next())
 			{
 				if(s->type() == KviKvsEventHandler::Script)
 				{
-					new KviRawHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(),
+					new RawHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(),
 					((KviKvsScriptEventHandler *)s)->code(),((KviKvsScriptEventHandler *)s)->isEnabled());
 				}
 			}
@@ -140,7 +140,7 @@ void KviRawEditor::oneTimeSetup()
 	}
 }
 
-void KviRawEditor::customContextMenuRequested(const QPoint &pos)
+void RawEditorWidget::customContextMenuRequested(const QPoint &pos)
 {
 	QTreeWidgetItem *it;
 	it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
@@ -150,7 +150,7 @@ void KviRawEditor::customContextMenuRequested(const QPoint &pos)
 	{
 		if(it->parent())
 		{
-			if(!(((KviRawHandlerTreeWidgetItem *)it)->m_bEnabled))
+			if(!(((RawHandlerTreeWidgetItem *)it)->m_bEnabled))
 				m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)),
 					__tr2qs_ctx("&Enable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled()));
@@ -183,7 +183,7 @@ void KviRawEditor::customContextMenuRequested(const QPoint &pos)
         m_pContextPopup->popup(mapToGlobal(QPoint(pos.x()+15,pos.y())));
 }
 
-void KviRawEditor::getUniqueHandlerName(KviRawTreeWidgetItem *it,QString &buffer)
+void RawEditorWidget::getUniqueHandlerName(RawTreeWidgetItem *it,QString &buffer)
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 
@@ -199,7 +199,7 @@ void KviRawEditor::getUniqueHandlerName(KviRawTreeWidgetItem *it,QString &buffer
 
 		for (int i=0;i<it->childCount();i++)
 		{
-			KviRawHandlerTreeWidgetItem * ch =(KviRawHandlerTreeWidgetItem *) it->child(i);
+			RawHandlerTreeWidgetItem * ch =(RawHandlerTreeWidgetItem *) it->child(i);
 			if(KviQString::equalCI(newName,ch->text(0)))
 			{
 				bFound = true;
@@ -214,7 +214,7 @@ void KviRawEditor::getUniqueHandlerName(KviRawTreeWidgetItem *it,QString &buffer
 	buffer = newName;
 }
 
-void KviRawEditor::addRaw()
+void RawEditorWidget::addRaw()
 {
 	bool bOk = false;
 
@@ -222,11 +222,11 @@ void KviRawEditor::addRaw()
 
 	if(!bOk)return;
 
-	KviRawTreeWidgetItem * it;
+	RawTreeWidgetItem * it;
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		it=(KviRawTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
-		if(((KviRawTreeWidgetItem *)it)->m_iIdx == iIdx)
+		it=(RawTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		if(((RawTreeWidgetItem *)it)->m_iIdx == iIdx)
 		{
 			m_pTreeWidget->setCurrentItem(it);
 			m_pTreeWidget->clearSelection();
@@ -235,7 +235,7 @@ void KviRawEditor::addRaw()
 		}
 	}
 
-	it = new KviRawTreeWidgetItem(m_pTreeWidget,iIdx,true);
+	it = new RawTreeWidgetItem(m_pTreeWidget,iIdx,true);
 	m_pTreeWidget->setCurrentItem(it);
 	m_pTreeWidget->clearSelection();
 	it->setSelected(true);
@@ -245,18 +245,18 @@ add_handler:
 
 }
 
-void KviRawEditor::addHandlerForCurrentRaw()
+void RawEditorWidget::addHandlerForCurrentRaw()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 
-	KviRawTreeWidgetItem * it = (KviRawTreeWidgetItem *) m_pTreeWidget->currentItem();
+	RawTreeWidgetItem * it = (RawTreeWidgetItem *) m_pTreeWidget->currentItem();
 	if(it)
 	{
 		if(it->parent() == 0)
 		{
 			QString buffer = __tr2qs_ctx("default","editor");
-			getUniqueHandlerName((KviRawTreeWidgetItem *)it,buffer);
-			QTreeWidgetItem * ch = new KviRawHandlerTreeWidgetItem(it,buffer,"",true);
+			getUniqueHandlerName((RawTreeWidgetItem *)it,buffer);
+			QTreeWidgetItem * ch = new RawHandlerTreeWidgetItem(it,buffer,"",true);
 			it->setEnabled(true);
 			it->setExpanded(true);
 			m_pTreeWidget->setCurrentItem(ch);
@@ -266,13 +266,13 @@ void KviRawEditor::addHandlerForCurrentRaw()
 	}
 }
 
-void KviRawEditor::removeCurrentHandler()
+void RawEditorWidget::removeCurrentHandler()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(m_pLastEditedItem)
 	{
 		QTreeWidgetItem * it = m_pLastEditedItem;
-		KviRawTreeWidgetItem * parent=(KviRawTreeWidgetItem *)it->parent();
+		RawTreeWidgetItem * parent=(RawTreeWidgetItem *)it->parent();
 		m_pLastEditedItem = 0;
 		delete it;
 		m_pEditor->setEnabled(false);
@@ -281,7 +281,7 @@ void KviRawEditor::removeCurrentHandler()
 	}
 }
 
-void KviRawEditor::toggleCurrentHandlerEnabled()
+void RawEditorWidget::toggleCurrentHandlerEnabled()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(m_pLastEditedItem)
@@ -292,7 +292,7 @@ void KviRawEditor::toggleCurrentHandlerEnabled()
 	}
 }
 
-void KviRawEditor::commit()
+void RawEditorWidget::commit()
 {
 	if(!m_bOneTimeSetupDone)return; // nothing to commit
 
@@ -309,17 +309,17 @@ void KviRawEditor::commit()
 			for (int j=0;j<it->childCount();j++)
 			{
 				ch=(QTreeWidgetItem *)it->child(j);
-				qDebug("Commit handler %s",((KviRawHandlerTreeWidgetItem *)ch)->text(0).toUtf8().data());
-				//int a=(KviRawTreeWidgetItem *)it)->m_iIdx;
-				KviQString::sprintf(szContext,"RawEvent%d::%s",&(((KviRawTreeWidgetItem *)it)->m_iIdx),(((KviRawHandlerTreeWidgetItem *)ch)->text(0)).toUtf8().data());
+				qDebug("Commit handler %s",((RawHandlerTreeWidgetItem *)ch)->text(0).toUtf8().data());
+				//int a=(RawTreeWidgetItem *)it)->m_iIdx;
+				KviQString::sprintf(szContext,"RawEvent%d::%s",&(((RawTreeWidgetItem *)it)->m_iIdx),(((RawHandlerTreeWidgetItem *)ch)->text(0)).toUtf8().data());
 				KviKvsScriptEventHandler * s = new KviKvsScriptEventHandler(
-						((KviRawHandlerTreeWidgetItem *)ch)->text(0),
+						((RawHandlerTreeWidgetItem *)ch)->text(0),
 						szContext,
-						((KviRawHandlerTreeWidgetItem *)ch)->m_szBuffer,
-						((KviRawHandlerTreeWidgetItem *)ch)->m_bEnabled
+						((RawHandlerTreeWidgetItem *)ch)->m_szBuffer,
+						((RawHandlerTreeWidgetItem *)ch)->m_bEnabled
 					);
 
-				KviKvsEventManager::instance()->addRawHandler(((KviRawTreeWidgetItem *)it)->m_iIdx,s);
+				KviKvsEventManager::instance()->addRawHandler(((RawTreeWidgetItem *)it)->m_iIdx,s);
 			}
 		}
 	}
@@ -327,7 +327,7 @@ void KviRawEditor::commit()
 	g_pApp->saveRawEvents(); // otherwise this page has never been shown
 }
 
-void KviRawEditor::saveLastEditedItem()
+void RawEditorWidget::saveLastEditedItem()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(!m_pLastEditedItem)return;
@@ -336,7 +336,7 @@ void KviRawEditor::saveLastEditedItem()
 	qDebug("Check lineedit name %s and internal %s",buffer.toUtf8().data(),m_pLastEditedItem->text(0).toUtf8().data());
 	if(!KviQString::equalCI(buffer,m_pLastEditedItem->text(0)))
 	{
-		getUniqueHandlerName((KviRawTreeWidgetItem *)(m_pLastEditedItem->parent()),buffer);
+		getUniqueHandlerName((RawTreeWidgetItem *)(m_pLastEditedItem->parent()),buffer);
 		qDebug("Change name %s",buffer.toUtf8().data());
 	}
 
@@ -347,17 +347,17 @@ void KviRawEditor::saveLastEditedItem()
 	m_pLastEditedItem->m_szBuffer = tmp;
 }
 
-void KviRawEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
+void RawEditorWidget::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	saveLastEditedItem();
 	if(it->parent())
 	{
-		m_pLastEditedItem = (KviRawHandlerTreeWidgetItem *)it;
+		m_pLastEditedItem = (RawHandlerTreeWidgetItem *)it;
 		m_pNameEditor->setEnabled(true);
 		m_pNameEditor->setText(it->text(0));
 		m_pEditor->setEnabled(true);
-		m_pEditor->setText(((KviRawHandlerTreeWidgetItem *)it)->m_szBuffer);
+		m_pEditor->setText(((RawHandlerTreeWidgetItem *)it)->m_szBuffer);
 	} else {
 		m_pLastEditedItem = 0;
 		m_pNameEditor->setEnabled(false);
@@ -365,18 +365,18 @@ void KviRawEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
 		m_pEditor->setEnabled(false);
 		QString tmp;
 		KviQString::sprintf(tmp,__tr2qs_ctx("\n\nRaw Event:\n%s","editor"),
-			((KviRawHandlerTreeWidgetItem *)it)->text(0).toUtf8().data());
+			((RawHandlerTreeWidgetItem *)it)->text(0).toUtf8().data());
 		m_pEditor->setText(tmp);
 	}
 }
 
-void KviRawEditor::showEvent(QShowEvent *e)
+void RawEditorWidget::showEvent(QShowEvent *e)
 {
 	oneTimeSetup();
 	QWidget::showEvent(e);
 }
 
-void KviRawEditor::getExportEventBuffer(QString &buffer,KviRawHandlerTreeWidgetItem * it)
+void RawEditorWidget::getExportEventBuffer(QString &buffer,RawHandlerTreeWidgetItem * it)
 {
 	if(!it->parent())return;
 
@@ -385,7 +385,7 @@ void KviRawEditor::getExportEventBuffer(QString &buffer,KviRawHandlerTreeWidgetI
 	KviCommandFormatter::blockFromBuffer(szBuf);
 
 	buffer = "event(";
-	buffer += ((KviRawTreeWidgetItem *)(it->parent()))->text(0);
+	buffer += ((RawTreeWidgetItem *)(it->parent()))->text(0);
 	buffer += ",";
 	buffer += it->text(0);
 	buffer += ")\n";
@@ -396,13 +396,13 @@ void KviRawEditor::getExportEventBuffer(QString &buffer,KviRawHandlerTreeWidgetI
 	{
 		buffer += "\n";
 		buffer += "eventctl -d ";
-		buffer += ((KviRawTreeWidgetItem *)(it->parent()))->text(0);
+		buffer += ((RawTreeWidgetItem *)(it->parent()))->text(0);
 		buffer += " ";
 		buffer += it->text(0);
 	}
 }
 
-void KviRawEditor::exportCurrentHandler()
+void RawEditorWidget::exportCurrentHandler()
 {
 	if(!m_pLastEditedItem)return;
 	saveLastEditedItem();
@@ -411,7 +411,7 @@ void KviRawEditor::exportCurrentHandler()
 	QString szName = QDir::homePath();
 	if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
 	szName += "raw";
-	szName += ((KviRawTreeWidgetItem *)(m_pLastEditedItem->parent()))->text(0);
+	szName += ((RawTreeWidgetItem *)(m_pLastEditedItem->parent()))->text(0);
 	szName += ".";
 	szName += m_pLastEditedItem->text(0);
 	szName += ".kvs";
@@ -429,21 +429,21 @@ void KviRawEditor::exportCurrentHandler()
 	}
 }
 
-void KviRawEditor::exportAllEvents()
+void RawEditorWidget::exportAllEvents()
 {
 	saveLastEditedItem();
 
-	KviRawTreeWidgetItem * it;
+	RawTreeWidgetItem * it;
 	QString out;
 
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		it=(KviRawTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
-		KviRawHandlerTreeWidgetItem * item;
+		it=(RawTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		RawHandlerTreeWidgetItem * item;
 		for (int j=0;j<it->childCount();j++)
 		{
 			QString tmp;
-			item=(KviRawHandlerTreeWidgetItem *)it->child(j);
+			item=(RawHandlerTreeWidgetItem *)it->child(j);
 			getExportEventBuffer(tmp,item);
 			out += tmp;
 			out += "\n";
@@ -465,14 +465,14 @@ void KviRawEditor::exportAllEvents()
 }
 
 
-KviRawEditorWindow::KviRawEditorWindow(KviMainWindow * lpFrm)
+RawEditorWindow::RawEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"raweditor",0)
 {
 	g_pRawEditorWindow = this;
 
 	QGridLayout * g = new QGridLayout();
 
-	m_pEditor = new KviRawEditor(this);
+	m_pEditor = new RawEditorWidget(this);
 	g->addWidget(m_pEditor,0,0,1,4);
 
 	QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this);
@@ -495,43 +495,43 @@ KviRawEditorWindow::KviRawEditorWindow(KviMainWindow * lpFrm)
 	setLayout(g);
 }
 
-KviRawEditorWindow::~KviRawEditorWindow()
+RawEditorWindow::~RawEditorWindow()
 {
 	g_pRawEditorWindow = 0;
 }
 
-void KviRawEditorWindow::okClicked()
+void RawEditorWindow::okClicked()
 {
 	m_pEditor->commit();
 	close();
 }
 
-void KviRawEditorWindow::applyClicked()
+void RawEditorWindow::applyClicked()
 {
 	m_pEditor->commit();
 }
 
-void KviRawEditorWindow::cancelClicked()
+void RawEditorWindow::cancelClicked()
 {
 	close();
 }
 
-QPixmap * KviRawEditorWindow::myIconPtr()
+QPixmap * RawEditorWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT);
 }
 
-void KviRawEditorWindow::fillCaptionBuffers()
+void RawEditorWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Raw Editor","editor");
 }
 
-void KviRawEditorWindow::getConfigGroupName(QString &szName)
+void RawEditorWindow::getConfigGroupName(QString &szName)
 {
 	szName = "raweditor";
 }
 
-void KviRawEditorWindow::saveProperties(KviConfigurationFile *)
+void RawEditorWindow::saveProperties(KviConfigurationFile *)
 {
 	/*
 	#ifdef COMPILE_SCRIPTTOOLBAR
@@ -542,7 +542,7 @@ void KviRawEditorWindow::saveProperties(KviConfigurationFile *)
 	*/
 }
 
-void KviRawEditorWindow::loadProperties(KviConfigurationFile *)
+void RawEditorWindow::loadProperties(KviConfigurationFile *)
 {
 	/*
 	#ifdef COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/raweditor/raweditor.h b/src/modules/raweditor/RawEditorWindow.h
index 69926be00..d0d689496 100644
--- a/src/modules/raweditor/raweditor.h
+++ b/src/modules/raweditor/RawEditorWindow.h
@@ -2,7 +2,7 @@
 #define _RAWEDITOR_H_
 //=============================================================================
 //
-//   File : eventeditor.h
+//   File : EventEditorWindow.h
 //   Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -35,74 +35,74 @@
 class KviScriptEditor;
 class KviTalPopupMenu;
 
-class KviRawTreeWidget : public QTreeWidget
+class RawTreeWidget : public QTreeWidget
 {
 	public:
-	KviRawTreeWidget(QWidget *par)
+	RawTreeWidget(QWidget *par)
 		: QTreeWidget(par){};
 	void updateItem(QTreeWidgetItem *item)
 	{
 		update(indexFromItem(item,0));
 	};
-	~KviRawTreeWidget() {};
+	~RawTreeWidget() {};
 };
 
-class KviRawTreeWidgetItem : public QTreeWidgetItem
+class RawTreeWidgetItem : public QTreeWidgetItem
 {
 public:
 	int m_iIdx;
 public:
-	KviRawTreeWidgetItem(QTreeWidget * par,int idx,bool bEnabled);
-	~KviRawTreeWidgetItem() {};
+	RawTreeWidgetItem(QTreeWidget * par,int idx,bool bEnabled);
+	~RawTreeWidgetItem() {};
 public:
 	void setEnabled(bool bEnabled)
 	{
 		if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT)));
 			else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENTNOHANDLERS)));
-			((KviRawTreeWidget*)treeWidget())->updateItem(this);
+			((RawTreeWidget*)treeWidget())->updateItem(this);
 	};
 };
 
-class KviRawHandlerTreeWidgetItem : public QTreeWidgetItem
+class RawHandlerTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviRawHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString & name,const QString & buffer,bool bEnabled)
+	RawHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString & name,const QString & buffer,bool bEnabled)
 	: QTreeWidgetItem(par), m_szBuffer(buffer), m_bEnabled(bEnabled)
 	{
 		setText(0,name);
 		setEnabled(bEnabled);
 	};
-	~KviRawHandlerTreeWidgetItem() {};
+	~RawHandlerTreeWidgetItem() {};
 public:
 	void setEnabled(bool bEnabled)
 	{
 		if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)));
 			else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED)));
-			((KviRawTreeWidget*)treeWidget())->updateItem(this);
+			((RawTreeWidget*)treeWidget())->updateItem(this);
 	};
 	QString m_szBuffer;
 	bool   m_bEnabled;
 	void setName(const QString &szName);
 };
 
-class KviRawEditor : public QWidget
+class RawEditorWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	KviRawEditor(QWidget * par);
-	~KviRawEditor();
+	RawEditorWidget(QWidget * par);
+	~RawEditorWidget();
 public:
 	KviScriptEditor * m_pEditor;
-	KviRawTreeWidget       * m_pTreeWidget;
+	RawTreeWidget       * m_pTreeWidget;
 	QLineEdit       * m_pNameEditor;
 	KviTalPopupMenu      * m_pContextPopup;
-	KviRawHandlerTreeWidgetItem * m_pLastEditedItem;
+	RawHandlerTreeWidgetItem * m_pLastEditedItem;
 	bool              m_bOneTimeSetupDone;
 public:
 	void commit();
 	void saveLastEditedItem();
-	void getUniqueHandlerName(KviRawTreeWidgetItem *it,QString &buffer);
-	void getExportEventBuffer(QString &szBuffer,KviRawHandlerTreeWidgetItem * it);
+	void getUniqueHandlerName(RawTreeWidgetItem *it,QString &buffer);
+	void getExportEventBuffer(QString &szBuffer,RawHandlerTreeWidgetItem * it);
 protected slots:
 	void currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *);
 	void customContextMenuRequested(const QPoint &pnt);
@@ -118,14 +118,14 @@ private:
 	void oneTimeSetup();
 };
 
-class KviRawEditorWindow : public KviWindow
+class RawEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviRawEditorWindow(KviMainWindow * lpFrm);
-	~KviRawEditorWindow();
+	RawEditorWindow(KviMainWindow * lpFrm);
+	~RawEditorWindow();
 protected:
-	KviRawEditor * m_pEditor;
+	RawEditorWidget * m_pEditor;
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp
index d79c5e424..2ebf9ebf1 100644
--- a/src/modules/raweditor/libkviraweditor.cpp
+++ b/src/modules/raweditor/libkviraweditor.cpp
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "raweditor.h"
+#include "RawEditorWindow.h"
 
 #include "KviModule.h"
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
 
-KviRawEditorWindow * g_pRawEditorWindow = 0;
+RawEditorWindow * g_pRawEditorWindow = 0;
 
 
 /*
@@ -50,7 +50,7 @@ static bool raweditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	if(!g_pRawEditorWindow)
 	{
-		g_pRawEditorWindow = new KviRawEditorWindow(c->window()->frame());
+		g_pRawEditorWindow = new RawEditorWindow(c->window()->frame());
 		c->window()->frame()->addWindow(g_pRawEditorWindow);
 	}
 	g_pRawEditorWindow->setFocus();
diff --git a/src/modules/reguser/CMakeLists.txt b/src/modules/reguser/CMakeLists.txt
index 8a4e16f24..aed8d44ba 100644
--- a/src/modules/reguser/CMakeLists.txt
+++ b/src/modules/reguser/CMakeLists.txt
@@ -1,15 +1,15 @@
 # CMakeLists for src/modules/reguser
 
 SET(kvireguser_MOC_HDRS
-	edituser.h
-	wizard.h
+	RegisteredUserEntryDialog.h
+	RegistrationWizard.h
 	dialog.h
 )
 
 SET(kvireguser_SRCS
 	libkvireguser.cpp
-	edituser.cpp
-	wizard.cpp
+	RegisteredUserEntryDialog.cpp
+	RegistrationWizard.cpp
 	dialog.cpp
 )
 
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp
index fe033f14f..cd49e6e86 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : edituser.cpp
+//   File : RegisteredUserEntryDialog.cpp
 //   Creation date : Tue Dec 26 2000 12:24:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,8 +24,8 @@
 #define _WANT_OPTION_FLAGS_
 #define _EDITUSER_CPP_
 
-#include "edituser.h"
-#include "wizard.h"
+#include "RegisteredUserEntryDialog.h"
+#include "RegistrationWizard.h"
 #include "dialog.h"
 
 #include "KviRegisteredUserDataBase.h"
@@ -63,12 +63,12 @@
 #include <QCloseEvent>
 
 // KviApplication.cpp
-extern KviRegisteredUsersDialog * g_pRegisteredUsersDialog;
+extern RegisteredUsersDialog * g_pRegisteredUsersDialog;
 
 KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase; // local copy!
 
 
-KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHashTable<QString,QString> * dict)
+RegisteredUserPropertiesDialog::RegisteredUserPropertiesDialog(QWidget * p,KviPointerHashTable<QString,QString> * dict)
 : QDialog(p)
 {
 	setObjectName("property_editor");
@@ -125,17 +125,17 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHas
 	fillData();
 }
 
-KviReguserPropertiesDialog::~KviReguserPropertiesDialog()
+RegisteredUserPropertiesDialog::~RegisteredUserPropertiesDialog()
 {
 }
 
-void KviReguserPropertiesDialog::closeEvent(QCloseEvent *e)
+void RegisteredUserPropertiesDialog::closeEvent(QCloseEvent *e)
 {
 	e->accept();
 	//delete this;
 }
 
-void KviReguserPropertiesDialog::fillData()
+void RegisteredUserPropertiesDialog::fillData()
 {
 	m_pTable->setRowCount(m_pPropertyDict->count());
 	KviPointerHashTableIterator<QString,QString> it(*m_pPropertyDict);
@@ -156,7 +156,7 @@ void KviReguserPropertiesDialog::fillData()
 	if(m_pTable->rowCount() == 0)m_pDelButton->setEnabled(false);
 }
 
-void KviReguserPropertiesDialog::okClicked()
+void RegisteredUserPropertiesDialog::okClicked()
 {
 	m_pPropertyDict->clear();
 
@@ -174,7 +174,7 @@ void KviReguserPropertiesDialog::okClicked()
 	accept();
 }
 
-void KviReguserPropertiesDialog::addClicked()
+void RegisteredUserPropertiesDialog::addClicked()
 {
 	m_pTable->setRowCount(m_pTable->rowCount() + 1);
 
@@ -189,7 +189,7 @@ void KviReguserPropertiesDialog::addClicked()
 	m_pDelButton->setEnabled(true);
 }
 
-void KviReguserPropertiesDialog::delClicked()
+void RegisteredUserPropertiesDialog::delClicked()
 {
 	int i = m_pTable->currentRow();
 
@@ -202,7 +202,7 @@ void KviReguserPropertiesDialog::delClicked()
 }
 
 
-KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m)
+RegisteredUserMaskDialog::RegisteredUserMaskDialog(QWidget * p,KviIrcMask * m)
 : QDialog(p)
 {
 	setObjectName("reguser_mask_editor");
@@ -271,17 +271,17 @@ KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m)
 	m_pHostEdit->setText(m->host());
 }
 
-KviReguserMaskDialog::~KviReguserMaskDialog()
+RegisteredUserMaskDialog::~RegisteredUserMaskDialog()
 {
 }
 
-void KviReguserMaskDialog::closeEvent(QCloseEvent *e)
+void RegisteredUserMaskDialog::closeEvent(QCloseEvent *e)
 {
 	e->accept();
 	//delete this;
 }
 
-void KviReguserMaskDialog::okClicked()
+void RegisteredUserMaskDialog::okClicked()
 {
 	KviCString szTmp = m_pNickEdit->text();
 	if(szTmp.isEmpty())szTmp = "*";
@@ -299,7 +299,7 @@ void KviReguserMaskDialog::okClicked()
 }
 
 
-KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegisteredUser * r,bool bModal)
+RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget *p,KviRegisteredUser * r,bool bModal)
 : KviTalTabDialog(p,"reguser_entry_editor",bModal)
 {
 	m_pUser = r;
@@ -522,21 +522,21 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 	}
 }
 
-void KviRegisteredUserEntryDialog::closeEvent(QCloseEvent *e)
+void RegisteredUserEntryDialog::closeEvent(QCloseEvent *e)
 {
 	e->accept();
 	okClicked();
 	//delete this;
 }
 
-KviRegisteredUserEntryDialog::~KviRegisteredUserEntryDialog()
+RegisteredUserEntryDialog::~RegisteredUserEntryDialog()
 {
 	delete m_pAvatar;
 	delete m_pPropertyDict;
 	delete m_pCustomColor;
 }
 
-void KviRegisteredUserEntryDialog::notifyCheckClicked(bool bChecked)
+void RegisteredUserEntryDialog::notifyCheckClicked(bool bChecked)
 {
 	m_pNotifyNick->setEnabled(bChecked);
 	m_pNotifyLabel->setEnabled(bChecked);
@@ -568,7 +568,7 @@ void KviRegisteredUserEntryDialog::notifyCheckClicked(bool bChecked)
 	}
 }
 
-void KviRegisteredUserEntryDialog::maskCurrentChanged()
+void RegisteredUserEntryDialog::maskCurrentChanged()
 {
 	bool bHaveSelected = !m_pMaskListBox->selectedItems().empty();
 
@@ -576,7 +576,7 @@ void KviRegisteredUserEntryDialog::maskCurrentChanged()
 	m_pEditMaskButton->setEnabled(bHaveSelected);
 }
 
-void KviRegisteredUserEntryDialog::okClicked()
+void RegisteredUserEntryDialog::okClicked()
 {
 	QString szGroup;
 	if(m_pUser)
@@ -690,10 +690,10 @@ void KviRegisteredUserEntryDialog::okClicked()
 	g_pApp->optionResetUpdate(KviOption_resetUpdateGui);
 }
 
-void KviRegisteredUserEntryDialog::addMaskClicked()
+void RegisteredUserEntryDialog::addMaskClicked()
 {
 	KviIrcMask mk;
-	KviReguserMaskDialog * dlg = new KviReguserMaskDialog(this,&mk);
+	RegisteredUserMaskDialog * dlg = new RegisteredUserMaskDialog(this,&mk);
 	if(dlg->exec() == QDialog::Accepted)
 	{
 		QString m = mk.nick();
@@ -706,21 +706,21 @@ void KviRegisteredUserEntryDialog::addMaskClicked()
 	delete dlg;
 }
 
-void KviRegisteredUserEntryDialog::delMaskClicked()
+void RegisteredUserEntryDialog::delMaskClicked()
 {
 	if(m_pMaskListBox->currentItem()) {
 		delete m_pMaskListBox->currentItem();
 	}
 }
 
-void KviRegisteredUserEntryDialog::editMaskClicked()
+void RegisteredUserEntryDialog::editMaskClicked()
 {
 	if(!m_pMaskListBox->currentItem())return;
 	QString szM = m_pMaskListBox->currentItem()->text();
 	if(szM.isEmpty())return;
 
 	KviIrcMask mk(szM);
-	KviReguserMaskDialog * dlg = new KviReguserMaskDialog(this,&mk);
+	RegisteredUserMaskDialog * dlg = new RegisteredUserMaskDialog(this,&mk);
 	if(dlg->exec() == QDialog::Accepted)
 	{
 		QString m = mk.nick();
@@ -733,7 +733,7 @@ void KviRegisteredUserEntryDialog::editMaskClicked()
 	delete dlg;
 }
 
-void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
+void RegisteredUserEntryDialog::editAllPropertiesClicked()
 {
 	m_pAvatarSelector->commit();
 
@@ -761,7 +761,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 	}
 
 
-	KviReguserPropertiesDialog * dlg = new KviReguserPropertiesDialog(this,m_pPropertyDict);
+	RegisteredUserPropertiesDialog * dlg = new RegisteredUserPropertiesDialog(this,m_pPropertyDict);
 	if(dlg->exec() != QDialog::Accepted)
 	{
 		delete dlg;
@@ -794,5 +794,5 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "edituser.moc"
+#include "RegisteredUserEntryDialog.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/RegisteredUserEntryDialog.h
index 5fa608b9b..04dc745cd 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/RegisteredUserEntryDialog.h
@@ -2,7 +2,7 @@
 #define _EDITUSER_H_
 //=============================================================================
 //
-//   File : edituser.h
+//   File : RegisteredUserEntryDialog.h
 //   Creation date : Sun Dec 24 2000 15:16:17 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -45,12 +45,12 @@ class KviRegisteredUser;
 	extern KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase;
 #endif
 
-class KviReguserPropertiesDialog : public QDialog
+class RegisteredUserPropertiesDialog : public QDialog
 {
 	Q_OBJECT
 public:
-	KviReguserPropertiesDialog(QWidget *p,KviPointerHashTable<QString,QString> * dict);
-	~KviReguserPropertiesDialog();
+	RegisteredUserPropertiesDialog(QWidget *p,KviPointerHashTable<QString,QString> * dict);
+	~RegisteredUserPropertiesDialog();
 protected:
 	QTableWidget *m_pTable;
 
@@ -67,12 +67,12 @@ protected slots:
 };
 
 
-class KviReguserMaskDialog : public QDialog
+class RegisteredUserMaskDialog : public QDialog
 {
 	Q_OBJECT
 public:
-	KviReguserMaskDialog(QWidget * p,KviIrcMask * m);
-	~KviReguserMaskDialog();
+	RegisteredUserMaskDialog(QWidget * p,KviIrcMask * m);
+	~RegisteredUserMaskDialog();
 protected:
 	KviIrcMask * m_pMask;
 
@@ -86,12 +86,12 @@ protected slots:
 };
 
 
-class KviRegisteredUserEntryDialog : public KviTalTabDialog
+class RegisteredUserEntryDialog : public KviTalTabDialog
 {
 	Q_OBJECT
 public:
-	KviRegisteredUserEntryDialog(QWidget * p,KviRegisteredUser * r,bool bModal = true);
-	virtual ~KviRegisteredUserEntryDialog();
+	RegisteredUserEntryDialog(QWidget * p,KviRegisteredUser * r,bool bModal = true);
+	virtual ~RegisteredUserEntryDialog();
 protected:
 	KviRegisteredUser  * m_pUser;
 
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/RegistrationWizard.cpp
index cdb89f566..0c4cc6a38 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/RegistrationWizard.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : wizard.cpp
+//   File : RegistrationWizard.cpp
 //   Creation date : Fri Jun 26 2002 21:21:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "wizard.h"
+#include "RegistrationWizard.h"
 
 #include "KviLocale.h"
 #include "KviPointerList.h"
@@ -45,9 +45,9 @@
 
 
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
-extern KviPointerList<KviRegistrationWizard> * g_pRegistrationWizardList;
+extern KviPointerList<RegistrationWizard> * g_pRegistrationWizardList;
 
-KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal)
+RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal)
 : KviTalWizard(par)
 {
 	m_pDb = db;
@@ -268,7 +268,7 @@ KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegiste
 	// signals and slots connections
 }
 
-KviRegistrationWizard::~KviRegistrationWizard()
+RegistrationWizard::~RegistrationWizard()
 {
 	delete m_pAvatar;
 	g_pRegistrationWizardList->setAutoDelete(false);
@@ -276,7 +276,7 @@ KviRegistrationWizard::~KviRegistrationWizard()
 	g_pRegistrationWizardList->setAutoDelete(true);
 }
 
-void KviRegistrationWizard::reject()
+void RegistrationWizard::reject()
 {
 	KviTalWizard::reject();
 	if(!m_bModal)delete this;
@@ -284,7 +284,7 @@ void KviRegistrationWizard::reject()
 //	g_pApp->collectGarbage(this);
 }
 
-void KviRegistrationWizard::accept()
+void RegistrationWizard::accept()
 {
 	bool bLocalDb = true;
 	if(!m_pDb)
@@ -394,7 +394,7 @@ void KviRegistrationWizard::accept()
 }
 
 
-void KviRegistrationWizard::showEvent(QShowEvent *e)
+void RegistrationWizard::showEvent(QShowEvent *e)
 {
 	if(height() < 420)resize(width(),420);
 
@@ -403,7 +403,7 @@ void KviRegistrationWizard::showEvent(QShowEvent *e)
 	KviTalWizard::showEvent(e);
 }
 
-void KviRegistrationWizard::maskChanged(const QString &)
+void RegistrationWizard::maskChanged(const QString &)
 {
 	KviCString tmp1 = m_pNicknameEdit1->text();
 	KviCString tmp2 = m_pUsernameEdit1->text();
@@ -434,13 +434,13 @@ void KviRegistrationWizard::maskChanged(const QString &)
 	setNextEnabled(m_pPage2,mask!="*!*@*");
 }
 
-void KviRegistrationWizard::realNameChanged(const QString &)
+void RegistrationWizard::realNameChanged(const QString &)
 {
 	QString tmp = m_pEditRealName->text();
 	setNextEnabled(m_pPage1,!(tmp.isEmpty() || tmp.isNull()));
 }
 
-void KviRegistrationWizard::notifyNickChanged(const QString &)
+void RegistrationWizard::notifyNickChanged(const QString &)
 {
 	bool bYes = !m_pNotifyCheck->isChecked();
 
@@ -460,7 +460,7 @@ void KviRegistrationWizard::notifyNickChanged(const QString &)
 	setNextEnabled(m_pPage4,bYes);
 }
 
-void KviRegistrationWizard::notifyCheckToggled(bool)
+void RegistrationWizard::notifyCheckToggled(bool)
 {
 	bool bYes = m_pNotifyCheck->isChecked();
 
@@ -474,5 +474,5 @@ void KviRegistrationWizard::notifyCheckToggled(bool)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "wizard.moc"
+#include "RegistrationWizard.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/RegistrationWizard.h
index 10b1a5d2b..8047840c7 100644
--- a/src/modules/reguser/wizard.h
+++ b/src/modules/reguser/RegistrationWizard.h
@@ -2,7 +2,7 @@
 #define _WIZARD_H_
 //=============================================================================
 //
-//   File : wizard.h
+//   File : RegistrationWizard.h
 //   Creation date : Fri Jun 26 2002 21:21:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -39,12 +39,12 @@ class KviTalVBoxLayout;
 class KviTalHBoxLayout;
 class KviRegisteredUserDataBase;
 
-class KviRegistrationWizard : public KviTalWizard
+class RegistrationWizard : public KviTalWizard
 {
 	Q_OBJECT
 public:
-	KviRegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db = 0,QWidget * par = 0,bool bModal = false);
-	~KviRegistrationWizard();
+	RegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db = 0,QWidget * par = 0,bool bModal = false);
+	~RegistrationWizard();
 
 	KviRegisteredUserDataBase * m_pDb;
 
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index bfa4c89df..774275414 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : edituser.cpp
+//   File : RegisteredUserEntryDialog.cpp
 //   Creation date : Tue Dec 26 2000 12:24:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,8 +24,8 @@
 
 #define _WANT_OPTION_FLAGS_
 
-#include "edituser.h"
-#include "wizard.h"
+#include "RegisteredUserEntryDialog.h"
+#include "RegistrationWizard.h"
 #include "dialog.h"
 
 #include "KviRegisteredUserDataBase.h"
@@ -70,7 +70,7 @@
 #define LVI_MINIMUM_CELL_WIDTH (LVI_MINIMUM_TEXT_WIDTH + LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER)
 
 
-extern KviRegisteredUsersDialog * g_pRegisteredUsersDialog;
+extern RegisteredUsersDialog * g_pRegisteredUsersDialog;
 
 KviRegisteredUsersListView::KviRegisteredUsersListView(QWidget * par)
 : QTreeWidget(par)
@@ -107,8 +107,8 @@ void KviRegisteredUsersListView::mousePressEvent (QMouseEvent *e)
 	QTreeWidget::mousePressEvent(e);
 }
 
-KviRegisteredUsersDialogItem::KviRegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u)
-: KviRegisteredUsersDialogItemBase(User,par), m_pUser(u)
+RegisteredUsersDialogItem::RegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u)
+: RegisteredUsersDialogItemBase(User,par), m_pUser(u)
 {
 	QString szTmp;
 	QString t = "<nobr><b>";
@@ -141,21 +141,21 @@ KviRegisteredUsersDialogItem::KviRegisteredUsersDialogItem(QTreeWidgetItem * par
 // 	setText(0,t);
 }
 
-KviRegisteredUsersDialogItem::~KviRegisteredUsersDialogItem()
+RegisteredUsersDialogItem::~RegisteredUsersDialogItem()
 {
 }
 
-QString KviRegisteredUsersDialogItem::key(int,bool) const
+QString RegisteredUsersDialogItem::key(int,bool) const
 {
 	return m_pUser->name();
 }
 
-void KviRegisteredUsersDialogItemDelegate::paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const
+void RegisteredUsersDialogItemDelegate::paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const
 {
 
-	KviRegisteredUsersDialogItemBase *item=static_cast<KviRegisteredUsersDialogItemBase *>(index.internalPointer());
+	RegisteredUsersDialogItemBase *item=static_cast<RegisteredUsersDialogItemBase *>(index.internalPointer());
 
-	if(item->type()==KviRegisteredUsersDialogItemBase::Group)
+	if(item->type()==RegisteredUsersDialogItemBase::Group)
 	{
 		//groups
 		QStyledItemDelegate::paint(p, option, index);
@@ -166,7 +166,7 @@ void KviRegisteredUsersDialogItemDelegate::paint( QPainter * p, const QStyleOpti
 		if (opt.state & QStyle::State_Selected)
 			QApplication::style()->drawPrimitive(QStyle::PE_PanelItemViewItem,&opt, p);
 
-		KviRegisteredUsersDialogItem *it=(KviRegisteredUsersDialogItem*)item;
+		RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item;
 
 		if(index.column()==0)
 		{
@@ -195,23 +195,23 @@ void KviRegisteredUsersDialogItemDelegate::paint( QPainter * p, const QStyleOpti
 	}
 }
 
-QSize KviRegisteredUsersDialogItemDelegate::sizeHint( const QStyleOptionViewItem & option, const QModelIndex & index ) const
+QSize RegisteredUsersDialogItemDelegate::sizeHint( const QStyleOptionViewItem & option, const QModelIndex & index ) const
 {
-	KviRegisteredUsersDialogItemBase *item=static_cast<KviRegisteredUsersDialogItemBase *>(index.internalPointer());
+	RegisteredUsersDialogItemBase *item=static_cast<RegisteredUsersDialogItemBase *>(index.internalPointer());
 
-	if(item->type()==KviRegisteredUsersDialogItemBase::Group)
+	if(item->type()==RegisteredUsersDialogItemBase::Group)
 	{
 		//groups
 		return QStyledItemDelegate::sizeHint(option, index);
 	} else {
 		//users
-// 		KviRegisteredUsersDialogItem *it=(KviRegisteredUsersDialogItem*)item;
+// 		RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item;
 
 		return QSize(300, LVI_ICON_SIZE+2*LVI_BORDER);
 	}
 }
 
-KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
+RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par)
 : QWidget(par)
 {
 	g_pRegisteredUsersDialog = this;
@@ -226,7 +226,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 
 
 	m_pListView = new KviRegisteredUsersListView(this);
-	m_pListView->setItemDelegate(new KviRegisteredUsersDialogItemDelegate());
+	m_pListView->setItemDelegate(new RegisteredUsersDialogItemDelegate());
 
 	connect(m_pListView,SIGNAL(itemPressed(QTreeWidgetItem *,int)),this,SLOT(itemPressed(QTreeWidgetItem *,int)));
 	connect(m_pListView,SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),this,SLOT(itemDoubleClicked(QTreeWidgetItem *, int)));
@@ -327,7 +327,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 	}
 }
 
-KviRegisteredUsersDialog::~KviRegisteredUsersDialog()
+RegisteredUsersDialog::~RegisteredUsersDialog()
 {
 #ifndef COMPILE_ON_MAC
 	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = QRect(pos().x(),pos().y(),size().width(),size().height());
@@ -341,13 +341,13 @@ KviRegisteredUsersDialog::~KviRegisteredUsersDialog()
 	g_pLocalRegisteredUserDataBase = 0;
 }
 
-void KviRegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c)
+void RegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c)
 {
 	if(!it)return;
-	KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)it;
-	if(b->type()==KviRegisteredUsersDialogItemBase::User)
+	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it;
+	if(b->type()==RegisteredUsersDialogItemBase::User)
 	{
-		KviRegisteredUsersDialogItem *i = (KviRegisteredUsersDialogItem *)it;
+		RegisteredUsersDialogItem *i = (RegisteredUsersDialogItem *)it;
 
 		QRect r = m_pListView->visualItemRect(i);
 		int daw = m_pListView->columnWidth(0);
@@ -391,20 +391,20 @@ void KviRegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c)
 	}
 }
 
-void KviRegisteredUsersDialog::itemDoubleClicked(QTreeWidgetItem *it, int)
+void RegisteredUsersDialog::itemDoubleClicked(QTreeWidgetItem *it, int)
 {
 	if(!it)return;
-	KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)it;
-	if(b->type()==KviRegisteredUsersDialogItemBase::User)
+	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it;
+	if(b->type()==RegisteredUsersDialogItemBase::User)
 	{
-		editItem((KviRegisteredUsersDialogItem *)it);
+		editItem((RegisteredUsersDialogItem *)it);
 	} else	{
-		KviRegisteredUsersGroupItem *i = (KviRegisteredUsersGroupItem *)b;
+		RegisteredUsersGroupItem *i = (RegisteredUsersGroupItem *)b;
 		editGroup(i->group());
 	}
 }
 
-void KviRegisteredUsersDialog::addGroupClicked()
+void RegisteredUsersDialog::addGroupClicked()
 {
 	bool ok;
 	QString text = QInputDialog::getText( this,
@@ -416,7 +416,7 @@ void KviRegisteredUsersDialog::addGroupClicked()
 	}
 }
 
-void KviRegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
+void RegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
 {
 	bool ok;
 
@@ -456,12 +456,12 @@ void KviRegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
 }
 
 
-void KviRegisteredUsersDialog::rightButtonPressed ( QTreeWidgetItem * pItem, QPoint pnt)
+void RegisteredUsersDialog::rightButtonPressed ( QTreeWidgetItem * pItem, QPoint pnt)
 {
 	if(pItem)
 	{
-		KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)pItem;
-		if(b->type()==KviRegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)pItem;
+		if(b->type()==RegisteredUsersDialogItemBase::User)
 		{
 			KviTalPopupMenu *groups = new KviTalPopupMenu;
 
@@ -482,51 +482,51 @@ void KviRegisteredUsersDialog::rightButtonPressed ( QTreeWidgetItem * pItem, QPo
 	}
 }
 
-void KviRegisteredUsersDialog::moveToGroupMenuClicked(int id)
+void RegisteredUsersDialog::moveToGroupMenuClicked(int id)
 {
 	QString szGroup=(*(m_TmpDict.find(id)))->name();
 	QList<QTreeWidgetItem *> list = m_pListView->selectedItems();
 	for(int i=0; i<list.count(); i++)
 	{
-		KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)(list.at(i));
-		if(b->type()==KviRegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(list.at(i));
+		if(b->type()==RegisteredUsersDialogItemBase::User)
 		{
-			((KviRegisteredUsersDialogItem *)list.at(i))->user()->setGroup(szGroup);
+			((RegisteredUsersDialogItem *)list.at(i))->user()->setGroup(szGroup);
 		}
 	}
 	fillList();
 }
 
-void KviRegisteredUsersDialog::fillList()
+void RegisteredUsersDialog::fillList()
 {
 	m_pListView->clear();
-	KviPointerHashTable<QString,KviRegisteredUsersGroupItem> groupItems(5,false);
+	KviPointerHashTable<QString,RegisteredUsersGroupItem> groupItems(5,false);
 	groupItems.setAutoDelete(false);
 
 	KviPointerHashTable<QString,KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict();
 	for(KviRegisteredUserGroup * g = pGroups->first();g;g = pGroups->next())
 	{
-		KviRegisteredUsersGroupItem* pCur = new KviRegisteredUsersGroupItem(m_pListView,g);
+		RegisteredUsersGroupItem* pCur = new RegisteredUsersGroupItem(m_pListView,g);
 		groupItems.insert(g->name(),pCur);
 		pCur->setExpanded(TRUE);
 	}
 
 	KviPointerHashTable<QString,KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict();
-	KviRegisteredUsersDialogItem * item;
+	RegisteredUsersDialogItem * item;
 
 	for(KviRegisteredUser * u = d->first();u;u = d->next())
 	{
 		if(u->group().isEmpty())
 			u->setGroup(__tr2qs_ctx("Default","register"));
 		if(groupItems.find(u->group()))
-			item = new KviRegisteredUsersDialogItem(groupItems.find(u->group()),u);
+			item = new RegisteredUsersDialogItem(groupItems.find(u->group()),u);
 		else if(groupItems.find(__tr2qs_ctx("Default","register")))
-			item = new KviRegisteredUsersDialogItem(groupItems.find(__tr2qs_ctx("Default","register")),u);
+			item = new RegisteredUsersDialogItem(groupItems.find(__tr2qs_ctx("Default","register")),u);
 		else { //should never be called
 			KviRegisteredUserGroup* pGroup = g_pLocalRegisteredUserDataBase->addGroup(__tr2qs_ctx("Default","register"));
-			KviRegisteredUsersGroupItem* pCur = new KviRegisteredUsersGroupItem(m_pListView,pGroup);
+			RegisteredUsersGroupItem* pCur = new RegisteredUsersGroupItem(m_pListView,pGroup);
 			groupItems.insert(__tr2qs_ctx("Default","register"),pCur);
-			item = new KviRegisteredUsersDialogItem(pCur,u);
+			item = new RegisteredUsersDialogItem(pCur,u);
 		}
 	}
 	if(m_pListView->topLevelItem(0))
@@ -536,7 +536,7 @@ void KviRegisteredUsersDialog::fillList()
 	}
 }
 
-void KviRegisteredUsersDialog::closeEvent(QCloseEvent *e)
+void RegisteredUsersDialog::closeEvent(QCloseEvent *e)
 {
 	m_pListView->clear();
 	e->accept();
@@ -544,7 +544,7 @@ void KviRegisteredUsersDialog::closeEvent(QCloseEvent *e)
 	//delete this;
 }
 
-void KviRegisteredUsersDialog::okClicked()
+void RegisteredUsersDialog::okClicked()
 {
 	m_pListView->clear();
 	g_pRegisteredUserDataBase->copyFrom(g_pLocalRegisteredUserDataBase);
@@ -552,15 +552,15 @@ void KviRegisteredUsersDialog::okClicked()
 	delete this;
 }
 
-void KviRegisteredUsersDialog::cancelClicked()
+void RegisteredUsersDialog::cancelClicked()
 {
 	m_pListView->clear();
 	delete this;
 }
 
-void KviRegisteredUsersDialog::addClicked()
+void RegisteredUsersDialog::addClicked()
 {
-	KviRegisteredUserEntryDialog * dlg = new KviRegisteredUserEntryDialog(this,0);
+	RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this,0);
 	int ret = dlg->exec();
 	delete dlg;
 
@@ -572,9 +572,9 @@ void KviRegisteredUsersDialog::addClicked()
 	}
 }
 
-void KviRegisteredUsersDialog::addWizardClicked()
+void RegisteredUsersDialog::addWizardClicked()
 {
-	KviRegistrationWizard * w = new KviRegistrationWizard("",g_pLocalRegisteredUserDataBase,this,true);
+	RegistrationWizard * w = new RegistrationWizard("",g_pLocalRegisteredUserDataBase,this,true);
 	int ret = w->exec();
 	delete w;
 	if(!g_pRegisteredUsersDialog)return; // we have been deleted!
@@ -584,33 +584,33 @@ void KviRegisteredUsersDialog::addWizardClicked()
 	}
 }
 
-void KviRegisteredUsersDialog::removeClicked()
+void RegisteredUsersDialog::removeClicked()
 {
 	QList<QTreeWidgetItem *> list = m_pListView->selectedItems();
 	for(int i=0; i<list.count(); i++)
 	{
-		KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)(list.at(i));
-		if(b->type()==KviRegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(list.at(i));
+		if(b->type()==RegisteredUsersDialogItemBase::User)
 		{
-			g_pLocalRegisteredUserDataBase->removeUser(((KviRegisteredUsersDialogItem *)list.at(i))->user()->name());
+			g_pLocalRegisteredUserDataBase->removeUser(((RegisteredUsersDialogItem *)list.at(i))->user()->name());
 		} else {
-			g_pLocalRegisteredUserDataBase->removeGroup(((KviRegisteredUsersGroupItem *)list.at(i))->group()->name());
+			g_pLocalRegisteredUserDataBase->removeGroup(((RegisteredUsersGroupItem *)list.at(i))->group()->name());
 		}
 	}
 	fillList();
-// 	KviRegisteredUsersDialogItem *it = (KviRegisteredUsersDialogItem *)m_pListView->firstChild();
-// 	KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)it;
-// 	if(b->type()==KviRegisteredUsersDialogItemBase::User)
+// 	RegisteredUsersDialogItem *it = (RegisteredUsersDialogItem *)m_pListView->firstChild();
+// 	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it;
+// 	if(b->type()==RegisteredUsersDialogItemBase::User)
 // 	{
-// 		KviPointerList<KviRegisteredUsersDialogItem> l;
+// 		KviPointerList<RegisteredUsersDialogItem> l;
 // 		l.setAutoDelete(false);
 // 		while(it)
 // 		{
 // 			if(it->isSelected())l.append(it);
-// 			it = (KviRegisteredUsersDialogItem *)it->nextSibling();
+// 			it = (RegisteredUsersDialogItem *)it->nextSibling();
 // 		}
 //
-// 		for(KviRegisteredUsersDialogItem * i = l.first();i;i = l.next())
+// 		for(RegisteredUsersDialogItem * i = l.first();i;i = l.next())
 // 		{
 // 			//g_pLocalRegisteredUserDataBase->removeUser(i->user()->name());
 // 			delete i;
@@ -620,21 +620,21 @@ void KviRegisteredUsersDialog::removeClicked()
 // 	}
 }
 
-void KviRegisteredUsersDialog::editClicked()
+void RegisteredUsersDialog::editClicked()
 {
-	KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)(m_pListView->currentItem());
+	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(m_pListView->currentItem());
 	if(!b)return;
-	if(b->type()==KviRegisteredUsersDialogItemBase::User)
+	if(b->type()==RegisteredUsersDialogItemBase::User)
 	{
-		KviRegisteredUsersDialogItem *i = (KviRegisteredUsersDialogItem *)b;
+		RegisteredUsersDialogItem *i = (RegisteredUsersDialogItem *)b;
 		editItem(i);
 	} else {
-		KviRegisteredUsersGroupItem *i = (KviRegisteredUsersGroupItem *)b;
+		RegisteredUsersGroupItem *i = (RegisteredUsersGroupItem *)b;
 		editGroup(i->group());
 	}
 }
 
-void KviRegisteredUsersDialog::editItem(KviRegisteredUsersDialogItem * i)
+void RegisteredUsersDialog::editItem(RegisteredUsersDialogItem * i)
 {
 	KviRegisteredUser * u = i->user();
 
@@ -642,7 +642,7 @@ void KviRegisteredUsersDialog::editItem(KviRegisteredUsersDialogItem * i)
 
 	QString szName = u->name();
 
-	KviRegisteredUserEntryDialog * dlg = new KviRegisteredUserEntryDialog(this,u);
+	RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this,u);
 	int res = dlg->exec();
 	delete dlg;
 
@@ -658,7 +658,7 @@ void KviRegisteredUsersDialog::editItem(KviRegisteredUsersDialogItem * i)
 			QTreeWidgetItem * pGroup = m_pListView->topLevelItem(c);
 			for(int d=0;d<pGroup->childCount();d++)
 			{
-				KviRegisteredUsersDialogItem * pUser = (KviRegisteredUsersDialogItem*) pGroup->child(d);
+				RegisteredUsersDialogItem * pUser = (RegisteredUsersDialogItem*) pGroup->child(d);
 				if(KviQString::equalCI(pUser->user()->name(),szName))
 				{
 					pUser->setSelected(true);
@@ -675,7 +675,7 @@ void KviRegisteredUsersDialog::editItem(KviRegisteredUsersDialogItem * i)
 	m_pListView->update();
 }
 
-void KviRegisteredUsersDialog::selectionChanged()
+void RegisteredUsersDialog::selectionChanged()
 {
 	bool bHaveSelected = !m_pListView->selectedItems().empty();
 
@@ -695,7 +695,7 @@ typedef struct _KviReguserDbFileHeader
 	kvi_u32_t nentries;
 } KviReguserDbFileHeader;
 
-void KviRegisteredUsersDialog::exportClicked()
+void RegisteredUsersDialog::exportClicked()
 {
 	unsigned int nEntries = 0;
 
@@ -704,7 +704,7 @@ void KviRegisteredUsersDialog::exportClicked()
 	//only "user" entries matters, discard groups from count
 	for(int i=0; i<list.count(); i++)
 	{
-		if(((KviRegisteredUsersDialogItemBase *)list.at(i))->type() == KviRegisteredUsersDialogItemBase::User)
+		if(((RegisteredUsersDialogItemBase *)list.at(i))->type() == RegisteredUsersDialogItemBase::User)
 			nEntries++;
 	}
 
@@ -736,11 +736,11 @@ void KviRegisteredUsersDialog::exportClicked()
 
 	for(int i=0; i<list.count(); i++)
 	{
-		KviRegisteredUsersDialogItemBase *pBase = (KviRegisteredUsersDialogItemBase *)list.at(i);
-		if(pBase->type()!=KviRegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase *pBase = (RegisteredUsersDialogItemBase *)list.at(i);
+		if(pBase->type()!=RegisteredUsersDialogItemBase::User)
 			continue;
 
-		KviRegisteredUser * u = ((KviRegisteredUsersDialogItem *)list.at(i))->user();
+		KviRegisteredUser * u = ((RegisteredUsersDialogItem *)list.at(i))->user();
 		if(u)
 		{
 			if(!f.save(u->name()))goto write_error;
@@ -810,12 +810,12 @@ succesfull_export:
 	f.close();
 }
 
-void KviRegisteredUsersDialog::selectAllClicked()
+void RegisteredUsersDialog::selectAllClicked()
 {
 	m_pListView->selectAll();
 }
 
-void KviRegisteredUsersDialog::importClicked()
+void RegisteredUsersDialog::importClicked()
 {
 	//KviCString buffer;
 	QString buffer;
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index cc06049ce..d511560dd 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -2,7 +2,7 @@
 #define _DIALOG_H_
 //=============================================================================
 //
-//   File : edituser.h
+//   File : RegisteredUserEntryDialog.h
 //   Creation date : Sun Dec 24 2000 15:16:17 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -51,77 +51,77 @@ signals:
 	void rightButtonPressed(QTreeWidgetItem *,QPoint);
 };
 
-class KviRegisteredUsersDialogItemDelegate : public QStyledItemDelegate
+class RegisteredUsersDialogItemDelegate : public QStyledItemDelegate
 {
 public:
-	KviRegisteredUsersDialogItemDelegate(KviRegisteredUsersListView * pWidget=0)
+	RegisteredUsersDialogItemDelegate(KviRegisteredUsersListView * pWidget=0)
 		: QStyledItemDelegate(pWidget) {};
-	~KviRegisteredUsersDialogItemDelegate(){};
+	~RegisteredUsersDialogItemDelegate(){};
 	QSize sizeHint(const QStyleOptionViewItem &option,const QModelIndex &index) const;
 	void paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
 
 };
 
-class KviRegisteredUsersDialogItemBase : public QTreeWidgetItem
+class RegisteredUsersDialogItemBase : public QTreeWidgetItem
 {
 public:
 	enum Types { User,Group };
 protected:
-	KviRegisteredUsersDialogItemBase(Types type,KviRegisteredUsersListView * par)
+	RegisteredUsersDialogItemBase(Types type,KviRegisteredUsersListView * par)
 	:QTreeWidgetItem(par),m_iType(type)
 	{
 	};
-	KviRegisteredUsersDialogItemBase(Types type,QTreeWidgetItem * par)
+	RegisteredUsersDialogItemBase(Types type,QTreeWidgetItem * par)
 	:QTreeWidgetItem(par),m_iType(type)
 	{
 	};
-	~KviRegisteredUsersDialogItemBase()
+	~RegisteredUsersDialogItemBase()
 	{
 	};
 
 private:
-	KviRegisteredUsersDialogItemBase::Types m_iType;
+	RegisteredUsersDialogItemBase::Types m_iType;
 public:
-	KviRegisteredUsersDialogItemBase::Types type() { return m_iType; };
+	RegisteredUsersDialogItemBase::Types type() { return m_iType; };
 };
 
-class KviRegisteredUsersGroupItem : public KviRegisteredUsersDialogItemBase
+class RegisteredUsersGroupItem : public RegisteredUsersDialogItemBase
 {
 protected:
 	KviRegisteredUserGroup * m_pGroup;
 public:
-	KviRegisteredUsersGroupItem(KviRegisteredUsersListView * par,KviRegisteredUserGroup * g)
-	:KviRegisteredUsersDialogItemBase(Group,par), m_pGroup(g)
+	RegisteredUsersGroupItem(KviRegisteredUsersListView * par,KviRegisteredUserGroup * g)
+	:RegisteredUsersDialogItemBase(Group,par), m_pGroup(g)
 	{
 		setText(0,m_pGroup->name());
 	}
-	~KviRegisteredUsersGroupItem()
+	~RegisteredUsersGroupItem()
 	{
 	}
 	KviRegisteredUserGroup * group() { return m_pGroup; };
 };
 
-class KviRegisteredUsersDialogItem : public KviRegisteredUsersDialogItemBase
+class RegisteredUsersDialogItem : public RegisteredUsersDialogItemBase
 {
-	friend class KviRegisteredUsersDialogItemDelegate;
+	friend class RegisteredUsersDialogItemDelegate;
 protected:
 	KviRegisteredUser * m_pUser;
 	QTextDocument       m_pText;
 public:
-	KviRegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u);
-	~KviRegisteredUsersDialogItem();
+	RegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u);
+	~RegisteredUsersDialogItem();
 public:
 	KviRegisteredUser * user(){ return m_pUser; };
 	void setUser(KviRegisteredUser * u){ m_pUser = u; };
 	virtual QString key(int,bool) const;
 };
 
-class KviRegisteredUsersDialog : public QWidget
+class RegisteredUsersDialog : public QWidget
 {
 	Q_OBJECT
 public:
-	KviRegisteredUsersDialog(QWidget * par = 0);
-	~KviRegisteredUsersDialog();
+	RegisteredUsersDialog(QWidget * par = 0);
+	~RegisteredUsersDialog();
 public:
 	KviRegisteredUsersListView   * m_pListView;
 	QPushButton * m_pAddButton;
@@ -135,7 +135,7 @@ public:
 	QMultiHash<int, KviRegisteredUserGroup*> m_TmpDict;
 protected:
 	void fillList();
-	void editItem(KviRegisteredUsersDialogItem * i);
+	void editItem(RegisteredUsersDialogItem * i);
 	void editGroup(KviRegisteredUserGroup* group);
 	virtual void closeEvent(QCloseEvent *);
 protected slots:
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 0c94650c3..b5a57a788 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "edituser.h"
-#include "wizard.h"
+#include "RegisteredUserEntryDialog.h"
+#include "RegistrationWizard.h"
 #include "KviIrcConnection.h"
 #include "dialog.h"
 
@@ -51,9 +51,9 @@
 
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
 
-KviPointerList<KviRegistrationWizard> * g_pRegistrationWizardList = 0;
+KviPointerList<RegistrationWizard> * g_pRegistrationWizardList = 0;
 
-KviRegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
+RegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
 
 /*
 	@doc: reguser
@@ -127,9 +127,9 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	} else {
 		if(c->hasSwitch('t',"toplevel"))
 		{
-			g_pRegisteredUsersDialog = new KviRegisteredUsersDialog(0);
+			g_pRegisteredUsersDialog = new RegisteredUsersDialog(0);
 		} else {
-			g_pRegisteredUsersDialog = new KviRegisteredUsersDialog(c->window()->frame()->splitter());
+			g_pRegisteredUsersDialog = new RegisteredUsersDialog(c->window()->frame()->splitter());
 		}
 	}
 	g_pRegisteredUsersDialog->show();
@@ -1170,7 +1170,7 @@ static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
 	KVSM_PARAMETERS_END(c)
 
-	KviRegistrationWizard * w = new KviRegistrationWizard(szMask);
+	RegistrationWizard * w = new RegistrationWizard(szMask);
 	w->show();
 	return true;
 }
@@ -1178,7 +1178,7 @@ static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c)
 static bool reguser_module_init(KviModule * m)
 {
 	g_pLocalRegisteredUserDataBase = 0;
-	g_pRegistrationWizardList = new KviPointerList<KviRegistrationWizard>;
+	g_pRegistrationWizardList = new KviPointerList<RegistrationWizard>;
 	g_pRegistrationWizardList->setAutoDelete(true);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"add",reguser_kvs_cmd_add);
@@ -1209,7 +1209,7 @@ static bool reguser_module_cleanup(KviModule *)
 	if(g_pRegisteredUsersDialog)delete g_pRegisteredUsersDialog;
 	g_pRegisteredUsersDialog = 0;
 
-	while(KviRegistrationWizard * w = g_pRegistrationWizardList->first())delete w;
+	while(RegistrationWizard * w = g_pRegistrationWizardList->first())delete w;
 	delete g_pRegistrationWizardList;
 	g_pRegistrationWizardList = 0;
 
diff --git a/src/modules/rijndael/ablowfish.cpp b/src/modules/rijndael/BlowFish.cpp
index 0431316ff..faa014950 100644
--- a/src/modules/rijndael/ablowfish.cpp
+++ b/src/modules/rijndael/BlowFish.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : ablowfish.cpp
+//   File : BlowFish.cpp
 //   Creation date : Wed Jan 13 2005 02:04:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "ablowfish.h"
+#include "BlowFish.h"
 #include "KviMemory.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
diff --git a/src/modules/rijndael/ablowfish.h b/src/modules/rijndael/BlowFish.h
index 07a6a7d2f..dbe969936 100644
--- a/src/modules/rijndael/ablowfish.h
+++ b/src/modules/rijndael/BlowFish.h
@@ -2,7 +2,7 @@
 #define _BLOWFISH_H_
 //=============================================================================
 //
-//   File : ablowfish.h
+//   File : BlowFish.h
 //   Creation date : Wed Jan 13 2005 02:04:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
diff --git a/src/modules/rijndael/CMakeLists.txt b/src/modules/rijndael/CMakeLists.txt
index fae3a3896..6883922ed 100644
--- a/src/modules/rijndael/CMakeLists.txt
+++ b/src/modules/rijndael/CMakeLists.txt
@@ -16,8 +16,8 @@ IF(WANT_NO_EMBEDDED_CODE)
 ELSE(WANT_NO_EMBEDDED_CODE)
     SET(kvirijndael_SRCS
 	    libkvirijndael.cpp
-	    rijndael.cpp
-	    ablowfish.cpp
+	    Rijndael.cpp
+	    BlowFish.cpp
     )
 
     SET(kvirijndael_MOC_HDRS
diff --git a/src/modules/rijndael/rijndael.cpp b/src/modules/rijndael/Rijndael.cpp
index 1707511b0..f65a00629 100644
--- a/src/modules/rijndael/rijndael.cpp
+++ b/src/modules/rijndael/Rijndael.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : rijndael.cpp
+//   File : Rijndael.cpp
 //   Creation date : Sun Nov 5 2000 03:22:10 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -57,7 +57,7 @@
 
 #define _RIJNDAEL_CPP_
 
-#include "rijndael.h"
+#include "Rijndael.h"
 
 #include "KviMemory.h"
 
diff --git a/src/modules/rijndael/rijndael.h b/src/modules/rijndael/Rijndael.h
index eb775cf8f..0a140a8c5 100644
--- a/src/modules/rijndael/rijndael.h
+++ b/src/modules/rijndael/Rijndael.h
@@ -2,7 +2,7 @@
 #define _RIJNDAEL_H_
 //=============================================================================
 //
-//   File : rijndael.h
+//   File : Rijndael.h
 //   Creation date : Sun Nov 5 2000 15:42:14 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index d4c3fd83c..1937440d6 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -24,7 +24,7 @@
 //=============================================================================
 
 #include "libkvirijndael.h"
-#include "rijndael.h"
+#include "Rijndael.h"
 
 #include "KviModule.h"
 #include "kvi_debug.h"
@@ -348,7 +348,7 @@
 
 	// Mircryption stuff
 
-	#include "ablowfish.h"
+	#include "BlowFish.h"
 
 	KviMircryptionEngine::KviMircryptionEngine()
 	: KviCryptEngine()
diff --git a/src/modules/rijndael/libkvirijndael.h b/src/modules/rijndael/libkvirijndael.h
index 5845923af..96519322c 100644
--- a/src/modules/rijndael/libkvirijndael.h
+++ b/src/modules/rijndael/libkvirijndael.h
@@ -31,7 +31,7 @@
 #ifdef COMPILE_CRYPT_SUPPORT
 
 	#include "KviCryptEngine.h"
-	#include "rijndael.h"
+	#include "Rijndael.h"
 
 	class KviRijndaelEngine : public KviCryptEngine
 	{
diff --git a/src/modules/setup/CMakeLists.txt b/src/modules/setup/CMakeLists.txt
index ed4d0c978..ba0ff1003 100644
--- a/src/modules/setup/CMakeLists.txt
+++ b/src/modules/setup/CMakeLists.txt
@@ -5,12 +5,12 @@ IF(WIN32)
 ENDIF()
 
 SET(kvisetup_MOC_HDRS
-	setupwizard.h
+	SetupWizard.h
 )
 
 SET(kvisetup_SRCS
 	libkvisetup.cpp
-	setupwizard.cpp
+	SetupWizard.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/SetupWizard.cpp
index 32bec3ceb..9d2aeede4 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -1,6 +1,6 @@
 //===============================================================================
 //
-//   File : setupwizard.cpp
+//   File : SetupWizard.cpp
 //   Creation date : Sat Oct  6 02:06:53 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 
 bool g_bFoundMirc;
 
-#include "setupwizard.h"
+#include "SetupWizard.h"
 
 #include "KviApplication.h"
 #include "KviLocale.h"
@@ -73,7 +73,7 @@ extern QString szMircIni;
 	#define KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME ".config/KVIrc"
 #endif
 
-KviSetupPage::KviSetupPage(KviSetupWizard * w)
+SetupPage::SetupPage(SetupWizard * w)
 : QWidget(w)
 {
 	QGridLayout * g = new QGridLayout(this);
@@ -127,12 +127,12 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w)
 	m_pVBox->setStretchFactor(m_pTextLabel,1);
 }
 
-KviSetupPage::~KviSetupPage()
+SetupPage::~SetupPage()
 {
 }
 
 
-KviSetupWizard::KviSetupWizard()
+SetupWizard::SetupWizard()
 : KviTalWizard(0)
 {
 	setModal(true);
@@ -154,7 +154,7 @@ KviSetupWizard::KviSetupWizard()
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Welcome
 
-	m_pWelcome = new KviSetupPage(this);
+	m_pWelcome = new SetupPage(this);
 
 	// here we go...
 	QString szText = __tr2qs("<p>" \
@@ -178,7 +178,7 @@ KviSetupWizard::KviSetupWizard()
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// License
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) //it have been already shown by installer
-	KviSetupPage * m_pLicense = new KviSetupPage(this);
+	SetupPage * m_pLicense = new SetupPage(this);
 	m_pLicense->m_pTextLabel->setText(__tr2qs( \
 		"<p>All of the files in this distribution are covered by the GPL. " \
 		"In human terms this can be read as follows:<br>" \
@@ -213,7 +213,7 @@ KviSetupWizard::KviSetupWizard()
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Directories
 
-	m_pDirectory = new KviSetupPage(this);
+	m_pDirectory = new SetupPage(this);
 
 	m_pDirectory->m_pTextLabel->setText(__tr2qs("<p>Please choose a folder for " \
 		"KVIrc to store its settings and other data, and another for downloaded files. " \
@@ -314,7 +314,7 @@ KviSetupWizard::KviSetupWizard()
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Identity
 
-	m_pIdentity = new KviSetupPage(this);
+	m_pIdentity = new SetupPage(this);
 
 	m_pIdentity->m_pTextLabel->setText(__tr2qs("Please choose a Nickname.<br><br>" \
 		"Your nickname is the name that other IRC users will know you by. " \
@@ -420,7 +420,7 @@ KviSetupWizard::KviSetupWizard()
 
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Default theme
-	m_pTheme = new KviSetupPage(this);
+	m_pTheme = new SetupPage(this);
 	m_pTheme->m_pTextLabel->setText(__tr2qs( \
 		"<p>Here you can choose the default appearance of KVIrc.<br><br>" \
 		"The Fancy Theme uses icons, a transparent background and a lot of colors. " \
@@ -486,7 +486,7 @@ KviSetupWizard::KviSetupWizard()
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Desktop integration
 
-	m_pDesktopIntegration = new KviSetupPage(this);
+	m_pDesktopIntegration = new SetupPage(this);
 
 	szText  = __tr2qs( \
 		"<p>" \
@@ -520,7 +520,7 @@ KviSetupWizard::KviSetupWizard()
 	/*
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Server config
-	m_pServers = new KviSetupPage(this);
+	m_pServers = new SetupPage(this);
 
 	m_pServers->m_pTextLabel->setText(__tr2qs( \
 			"Now you should specify an IRC server, to be connected to it"));
@@ -655,12 +655,12 @@ KviSetupWizard::KviSetupWizard()
 }
 
 
-KviSetupWizard::~KviSetupWizard()
+SetupWizard::~SetupWizard()
 {
 	delete m_pLabelPixmap;
 }
 
-void KviSetupWizard::showEvent(QShowEvent *e)
+void SetupWizard::showEvent(QShowEvent *e)
 {
 	int primary_screen = g_pApp->desktop()->primaryScreen();
 	QRect r = g_pApp->desktop()->screenGeometry(primary_screen);
@@ -684,7 +684,7 @@ void KviSetupWizard::showEvent(QShowEvent *e)
 	KviTalWizard::showEvent(e);
 }
 
-void KviSetupWizard::oldDirClicked()
+void SetupWizard::oldDirClicked()
 {
 	m_pOldPathBox->setEnabled(true);
 	m_pNewPathBox->setEnabled(false);
@@ -698,22 +698,22 @@ void KviSetupWizard::oldDirClicked()
 	else setNextEnabled(m_pDirectory,true);
 }
 
-void KviSetupWizard::oldDataTextChanged ( const QString & str)
+void SetupWizard::oldDataTextChanged ( const QString & str)
 {
 	setNextEnabled(m_pDirectory,!str.isEmpty());
 }
 
-void KviSetupWizard::newDataTextChanged ( const QString & str)
+void SetupWizard::newDataTextChanged ( const QString & str)
 {
 	setNextEnabled(m_pDirectory,!str.isEmpty() && !m_pIncomingPathEdit->text().isEmpty());
 }
 
-void KviSetupWizard::newIncomingTextChanged ( const QString & str)
+void SetupWizard::newIncomingTextChanged ( const QString & str)
 {
 	setNextEnabled(m_pDirectory,!str.isEmpty() && !m_pDataPathEdit->text().isEmpty());
 }
 
-void KviSetupWizard::newDirClicked()
+void SetupWizard::newDirClicked()
 {
 	m_pOldPathBox->setEnabled(false);
 	m_pNewPathBox->setEnabled(true);
@@ -727,7 +727,7 @@ void KviSetupWizard::newDirClicked()
 	else setNextEnabled(m_pDirectory,true);
 }
 
-void KviSetupWizard::portableClicked()
+void SetupWizard::portableClicked()
 {
 	m_pOldPathBox->setEnabled(false);
 	m_pNewPathBox->setEnabled(false);
@@ -740,7 +740,7 @@ void KviSetupWizard::portableClicked()
 	setNextEnabled(m_pDirectory,true);
 }
 
-void KviSetupWizard::chooseOldDataPath()
+void SetupWizard::chooseOldDataPath()
 {
 	// FIXME: We'd like to show hidden directories here ($HOME/.kvirc is hidden)...
 	QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(m_pDataPathEdit->text(),__tr2qs("Choose an Old Configuration Folder - KVIrc Setup"),0);
@@ -768,7 +768,7 @@ void KviSetupWizard::chooseOldDataPath()
 	}
 }
 
-void KviSetupWizard::chooseDataPath()
+void SetupWizard::chooseDataPath()
 {
 	QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(m_pDataPathEdit->text(),__tr2qs("Choose a Configuration Folder - KVIrc Setup"),0);
 	KviFileUtils::adjustFilePath(szBuffer);
@@ -779,7 +779,7 @@ void KviSetupWizard::chooseDataPath()
 	}
 }
 
-void KviSetupWizard::chooseIncomingPath()
+void SetupWizard::chooseIncomingPath()
 {
 	QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(m_pIncomingPathEdit->text(),__tr2qs("Choose a Download Folder - KVIrc Setup"),0);
 	KviFileUtils::adjustFilePath(szBuffer);
@@ -789,7 +789,7 @@ void KviSetupWizard::chooseIncomingPath()
 	}
 }
 
-void KviSetupWizard::makeLink()
+void SetupWizard::makeLink()
 {
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	// Let's make a link on the desktop :)
@@ -888,7 +888,7 @@ void KviSetupWizard::makeLink()
 
 }
 
-void KviSetupWizard::setUrlHandlers()
+void SetupWizard::setUrlHandlers()
 {
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	QString szReg = "REGEDIT4\r\n" \
@@ -948,7 +948,7 @@ void KviSetupWizard::setUrlHandlers()
 #endif
 }
 
-void KviSetupWizard::reject()
+void SetupWizard::reject()
 {
 	if(QMessageBox::warning(this,__tr2qs("Abort Setup - KVIrc Setup"),
 		__tr2qs("You have chosen to abort the setup.<br>KVIrc cannot run until you complete this procedure.<br><br>Do you really wish to abort?"),
@@ -957,7 +957,7 @@ void KviSetupWizard::reject()
 	KviTalWizard::reject();
 }
 
-void KviSetupWizard::accept()
+void SetupWizard::accept()
 {
 	QString szDir;
 
@@ -1142,5 +1142,5 @@ void KviSetupWizard::accept()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "setupwizard.moc"
+#include "SetupWizard.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/SetupWizard.h
index 9a6efbf88..88df3a4a5 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/SetupWizard.h
@@ -2,7 +2,7 @@
 #define _SETUPWIZARD_H_
 //=============================================================================
 //
-//   File : setupwizard.h
+//   File : SetupWizard.h
 //   Creation date : Sat Oct  6 02:06:51 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -40,15 +40,15 @@
 #include <QCheckBox>
 #include <QGridLayout>
 
-class KviSetupWizard;
+class SetupWizard;
 
 
-class KviSetupPage : public QWidget
+class SetupPage : public QWidget
 {
 	Q_OBJECT
 public:
-	KviSetupPage(KviSetupWizard * w);
-	~KviSetupPage();
+	SetupPage(SetupWizard * w);
+	~SetupPage();
 public:
 	KviTalVBox * m_pVBox;
 	QLabel * m_pPixmapLabel;
@@ -60,22 +60,22 @@ public:
 #define THEME_APPLY_HIRES 1
 #define THEME_APPLY_LORES 2
 
-class KviSetupWizard : public  KviTalWizard
+class SetupWizard : public  KviTalWizard
 {
 	Q_OBJECT
 public:
-	KviSetupWizard();
-	~KviSetupWizard();
+	SetupWizard();
+	~SetupWizard();
 public:
 	QPixmap       * m_pLabelPixmap;
 
-	KviSetupPage  * m_pWelcome;
-	KviSetupPage  * m_pLicense;
-	KviSetupPage  * m_pDirectory;
-	KviSetupPage  * m_pIdentity;
-	KviSetupPage  * m_pTheme;
-	KviSetupPage  * m_pDesktopIntegration;
-	KviSetupPage  * m_pServers;
+	SetupPage  * m_pWelcome;
+	SetupPage  * m_pLicense;
+	SetupPage  * m_pDirectory;
+	SetupPage  * m_pIdentity;
+	SetupPage  * m_pTheme;
+	SetupPage  * m_pDesktopIntegration;
+	SetupPage  * m_pServers;
 
 	// Theme
 	QGroupBox  * m_pThemeButtonGroup;
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index 4a13e85cc..b176f0b83 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "setupwizard.h"
+#include "SetupWizard.h"
 
 #include "KviModule.h"
 #include "KviOptions.h"
@@ -58,7 +58,7 @@ KVIMODULEEXPORTFUNC bool setup_begin()
 	// FIXME: try to guess the user's .kvirc directory
 	//        and the preferred nickname from a previous installation
 
-	KviSetupWizard * w = new KviSetupWizard();
+	SetupWizard * w = new SetupWizard();
 	int retcode = w->exec();
 	delete w;
 	return (retcode == QDialog::Accepted);
diff --git a/src/modules/sharedfileswindow/CMakeLists.txt b/src/modules/sharedfileswindow/CMakeLists.txt
index 7bcdbee35..6f69065e7 100644
--- a/src/modules/sharedfileswindow/CMakeLists.txt
+++ b/src/modules/sharedfileswindow/CMakeLists.txt
@@ -3,12 +3,12 @@
 SUBDIRS(caps)
 
 SET(kvisharedfileswindow_MOC_HDRS
-	sharedfileswindow.h
+	SharedFilesWindow.h
 )
 
 SET(kvisharedfileswindow_SRCS
 	libkvisharedfileswindow.cpp
-	sharedfileswindow.cpp
+	SharedFilesWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
index 29310b428..61a6c64ed 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : sharedfileswindow.cpp
+//   File : SharedFilesWindow.cpp
 //   Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "sharedfileswindow.h"
+#include "SharedFilesWindow.h"
 
 #include "kvi_debug.h"
 #include "KviIconManager.h"
@@ -46,10 +46,10 @@
 #include <QMessageBox>
 #include <QFileInfo>
 
-extern KviSharedFilesWindow * g_pSharedFilesWindow;
+extern SharedFilesWindow * g_pSharedFilesWindow;
 extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 
-KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f)
+SharedFileEditDialog::SharedFileEditDialog(QWidget * par,KviSharedFile * f)
 : QDialog(par)//,"shared_file_editor",true)
 {
 	setModal(true);
@@ -125,12 +125,12 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f
 
 }
 
-KviSharedFileEditDialog::~KviSharedFileEditDialog()
+SharedFileEditDialog::~SharedFileEditDialog()
 {
 
 }
 
-void KviSharedFileEditDialog::browse()
+void SharedFileEditDialog::browse()
 {
 	QString szBuf;
 	QString szTxt = m_pFilePathEdit->text();
@@ -138,7 +138,7 @@ void KviSharedFileEditDialog::browse()
 	m_pFilePathEdit->setText(szBuf);
 }
 
-KviSharedFile * KviSharedFileEditDialog::getResult()
+KviSharedFile * SharedFileEditDialog::getResult()
 {
 	QString szName = m_pShareNameEdit->text();
 	QString szPath = m_pFilePathEdit->text();
@@ -149,7 +149,7 @@ KviSharedFile * KviSharedFileEditDialog::getResult()
 	return new KviSharedFile(szName,szPath,szMask,bExpires ? dt.toTime_t() : (time_t)0,f.size());
 }
 
-void KviSharedFileEditDialog::okClicked()
+void SharedFileEditDialog::okClicked()
 {
 	QString szName = m_pShareNameEdit->text();
 	QString szPath = m_pFilePathEdit->text();
@@ -185,7 +185,7 @@ void KviSharedFileEditDialog::okClicked()
 }
 
 
-KviSharedFilesTreeWidgetItem::KviSharedFilesTreeWidgetItem(QTreeWidget * lv,KviSharedFile * f)
+SharedFilesTreeWidgetItem::SharedFilesTreeWidgetItem(QTreeWidget * lv,KviSharedFile * f)
 : QTreeWidgetItem(lv)
 {
 	setText(0,f->name());
@@ -202,12 +202,12 @@ KviSharedFilesTreeWidgetItem::KviSharedFilesTreeWidgetItem(QTreeWidget * lv,KviS
 	m_pSharedFilePointer = f;
 }
 
-KviSharedFilesTreeWidgetItem::~KviSharedFilesTreeWidgetItem()
+SharedFilesTreeWidgetItem::~SharedFilesTreeWidgetItem()
 {
 }
 
 
-KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
+SharedFilesWindow::SharedFilesWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"shared files window",0), KviModuleExtension(d)
 {
 	g_pSharedFilesWindow = this;
@@ -250,29 +250,29 @@ KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviM
 	fillFileView();
 }
 
-KviSharedFilesWindow::~KviSharedFilesWindow()
+SharedFilesWindow::~SharedFilesWindow()
 {
 	g_pSharedFilesWindow = 0;
 }
 
-void KviSharedFilesWindow::enableButtons()
+void SharedFilesWindow::enableButtons()
 {
 	QTreeWidgetItem * it = (QTreeWidgetItem *)m_pTreeWidget->currentItem();
 	m_pEditButton->setEnabled(it);
 	m_pRemoveButton->setEnabled(it);
 }
 
-void KviSharedFilesWindow::removeClicked()
+void SharedFilesWindow::removeClicked()
 {
-	KviSharedFilesTreeWidgetItem * it = (KviSharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem();
+	SharedFilesTreeWidgetItem * it = (SharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem();
 	if(!it)return;
 
 	g_pSharedFilesManager->removeSharedFile(it->readOnlySharedFilePointer()->name(),it->readOnlySharedFilePointer());
 }
 
-void KviSharedFilesWindow::addClicked()
+void SharedFilesWindow::addClicked()
 {
-	KviSharedFileEditDialog dlg(0);
+	SharedFileEditDialog dlg(0);
 	if(dlg.exec() != QDialog::Accepted)return;
 
 	KviSharedFile * f = dlg.getResult();
@@ -280,15 +280,15 @@ void KviSharedFilesWindow::addClicked()
 	g_pSharedFilesManager->addSharedFile(f);
 }
 
-void KviSharedFilesWindow::editClicked()
+void SharedFilesWindow::editClicked()
 {
-	KviSharedFilesTreeWidgetItem * it = (KviSharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem();
+	SharedFilesTreeWidgetItem * it = (SharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem();
 	if(!it)return;
 
-	KviSharedFileEditDialog dlg(0,it->readOnlySharedFilePointer());
+	SharedFileEditDialog dlg(0,it->readOnlySharedFilePointer());
 	if(dlg.exec() != QDialog::Accepted)return;
 
-	KviSharedFilesTreeWidgetItem * it2 = (KviSharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem();
+	SharedFilesTreeWidgetItem * it2 = (SharedFilesTreeWidgetItem *)m_pTreeWidget->currentItem();
 	if(it2 != it)return; // ooops ?
 	KviSharedFile * f = dlg.getResult();
 	if(!f)return; // ooops 2 ?
@@ -297,7 +297,7 @@ void KviSharedFilesWindow::editClicked()
 	g_pSharedFilesManager->addSharedFile(f);
 }
 
-void KviSharedFilesWindow::fillFileView()
+void SharedFilesWindow::fillFileView()
 {
 	m_pTreeWidget->clear();
 	KviPointerHashTableIterator<QString,KviSharedFileList> it(*(g_pSharedFilesManager->sharedFileListDict()));
@@ -305,28 +305,28 @@ void KviSharedFilesWindow::fillFileView()
 	while(KviSharedFileList * l = it.current())
 	{
 		for(KviSharedFile * o = l->first();o;o = l->next())
-			new KviSharedFilesTreeWidgetItem(m_pTreeWidget,o);
+			new SharedFilesTreeWidgetItem(m_pTreeWidget,o);
 
 		++it;
 	}
 	enableButtons();
 }
 
-void KviSharedFilesWindow::sharedFileAdded(KviSharedFile * f)
+void SharedFilesWindow::sharedFileAdded(KviSharedFile * f)
 {
-	new KviSharedFilesTreeWidgetItem(m_pTreeWidget,f);
+	new SharedFilesTreeWidgetItem(m_pTreeWidget,f);
 	enableButtons();
 }
 
-void KviSharedFilesWindow::sharedFileRemoved(KviSharedFile * f)
+void SharedFilesWindow::sharedFileRemoved(KviSharedFile * f)
 {
 	QTreeWidgetItem * it;
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
 		it=(QTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
-		if(((KviSharedFilesTreeWidgetItem *)it)->readOnlySharedFilePointer() == f)
+		if(((SharedFilesTreeWidgetItem *)it)->readOnlySharedFilePointer() == f)
 		{
-			delete ((KviSharedFilesTreeWidgetItem *)it);
+			delete ((SharedFilesTreeWidgetItem *)it);
 			return;
 		}
 	}
@@ -336,7 +336,7 @@ void KviSharedFilesWindow::sharedFileRemoved(KviSharedFile * f)
 
 
 /*
-void KviSharedFilesWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt)
+void SharedFilesWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt)
 {
 
 	KviSharedFilesItem * it = (KviSharedFilesItem *)m_pTreeWidget->itemAt(pnt);
@@ -347,7 +347,7 @@ void KviSharedFilesWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt)
 }
 */
 /*
-void KviSharedFilesWindow::fillTransferView()
+void SharedFilesWindow::fillTransferView()
 {
 	KviPointerList<KviSharedFiles> * l = KviSharedFilesManager::instance()->transferList();
 	if(!l)return;
@@ -359,7 +359,7 @@ void KviSharedFilesWindow::fillTransferView()
 	}
 }
 
-KviSharedFilesItem * KviSharedFilesWindow::findItem(KviSharedFiles * t)
+KviSharedFilesItem * SharedFilesWindow::findItem(KviSharedFiles * t)
 {
 	KviSharedFilesItem * it = (KviSharedFilesItem *)m_pTreeWidget->firstChild();
 	while(it)
@@ -370,20 +370,20 @@ KviSharedFilesItem * KviSharedFilesWindow::findItem(KviSharedFiles * t)
 	return 0;
 }
 
-void KviSharedFilesWindow::transferRegistered(KviSharedFiles * t)
+void SharedFilesWindow::transferRegistered(KviSharedFiles * t)
 {
 	KviSharedFilesItem * it = new KviSharedFilesItem(m_pTreeWidget,t);
 	//t->setDisplayItem(it);
 }
 
-void KviSharedFilesWindow::transferUnregistering(KviSharedFiles * t)
+void SharedFilesWindow::transferUnregistering(KviSharedFiles * t)
 {
 	KviSharedFilesItem * it = findItem(t);
 	//t->setDisplayItem(0);
 	if(it)delete it;
 }
 
-void KviSharedFilesWindow::rightButtonPressed(QTreeWidgetItem *it,const QPoint &pnt,int col)
+void SharedFilesWindow::rightButtonPressed(QTreeWidgetItem *it,const QPoint &pnt,int col)
 {
 	if(!m_pContextPopup)m_pContextPopup = new KviTalPopupMenu(this);
 	if(!m_pLocalFilePopup)m_pLocalFilePopup = new KviTalPopupMenu(this);
@@ -495,7 +495,7 @@ void KviSharedFilesWindow::rightButtonPressed(QTreeWidgetItem *it,const QPoint &
 }
 
 
-KviSharedFiles * KviSharedFilesWindow::selectedTransfer()
+KviSharedFiles * SharedFilesWindow::selectedTransfer()
 {
 	QTreeWidgetItem * it = m_pTreeWidget->selectedItem();
 	if(!it)return 0;
@@ -503,7 +503,7 @@ KviSharedFiles * KviSharedFilesWindow::selectedTransfer()
 	return i->transfer();
 }
 
-void KviSharedFilesWindow::openFilePopupActivated(int id)
+void SharedFilesWindow::openFilePopupActivated(int id)
 {
 #ifdef COMPILE_KDE_SUPPORT
 	int ip = m_pOpenFilePopup->itemParameter(id);
@@ -534,7 +534,7 @@ void KviSharedFilesWindow::openFilePopupActivated(int id)
 #endif //COMPILE_KDE_SUPPORT
 }
 
-void KviSharedFilesWindow::openLocalFileTerminal()
+void SharedFilesWindow::openLocalFileTerminal()
 {
 #ifdef COMPILE_KDE_SUPPORT
 	KviSharedFiles * t = selectedTransfer();
@@ -553,7 +553,7 @@ void KviSharedFilesWindow::openLocalFileTerminal()
 #endif //COMPILE_KDE_SUPPORT
 }
 
-void KviSharedFilesWindow::openLocalFile()
+void SharedFilesWindow::openLocalFile()
 {
 #ifdef COMPILE_KDE_SUPPORT
 	KviSharedFiles * t = selectedTransfer();
@@ -577,7 +577,7 @@ void KviSharedFilesWindow::openLocalFile()
 #endif //COMPILE_KDE_SUPPORT
 }
 
-void KviSharedFilesWindow::openLocalFileWith()
+void SharedFilesWindow::openLocalFileWith()
 {
 #ifdef COMPILE_KDE_SUPPORT
 	KviSharedFiles * t = selectedTransfer();
@@ -593,7 +593,7 @@ void KviSharedFilesWindow::openLocalFileWith()
 #endif //COMPILE_KDE_SUPPORT
 }
 
-void KviSharedFilesWindow::copyLocalFileToClipboard()
+void SharedFilesWindow::copyLocalFileToClipboard()
 {
 	KviSharedFiles * t = selectedTransfer();
 	if(!t)return;
@@ -605,7 +605,7 @@ void KviSharedFilesWindow::copyLocalFileToClipboard()
 	QApplication::clipboard()->setText(tmp);
 }
 
-void KviSharedFilesWindow::openLocalFileFolder()
+void SharedFilesWindow::openLocalFileFolder()
 {
 #ifdef COMPILE_KDE_SUPPORT
 	KviSharedFiles * t = selectedTransfer();
@@ -629,7 +629,7 @@ void KviSharedFilesWindow::openLocalFileFolder()
 #endif //COMPILE_KDE_SUPPORT
 }
 
-void KviSharedFilesWindow::heartbeat()
+void SharedFilesWindow::heartbeat()
 {
 	if(m_pTreeWidget->childCount() < 1)return;
 
@@ -655,7 +655,7 @@ void KviSharedFilesWindow::heartbeat()
 	}
 }
 
-void KviSharedFilesWindow::clearAll()
+void SharedFilesWindow::clearAll()
 {
 	if(QMessageBox::information(this,__tr2qs_ctx("Clear all transfers","filetransferwindow"),
 				__tr2qs_ctx("Remove all the transfers including the running ones ?","filetransferwindow"),
@@ -664,39 +664,39 @@ void KviSharedFilesWindow::clearAll()
 	KviSharedFilesManager::instance()->killAllTransfers();
 }
 
-void KviSharedFilesWindow::clearTerminated()
+void SharedFilesWindow::clearTerminated()
 {
 	KviSharedFilesManager::instance()->killTerminatedTransfers();
 }
 */
-void KviSharedFilesWindow::getBaseLogFileName(QString &buffer)
+void SharedFilesWindow::getBaseLogFileName(QString &buffer)
 {
 	buffer.sprintf("SHAREDFILES");
 }
 
-QPixmap * KviSharedFilesWindow::myIconPtr()
+QPixmap * SharedFilesWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_SHAREDFILES);
 }
 
-void KviSharedFilesWindow::resizeEvent(QResizeEvent *)
+void SharedFilesWindow::resizeEvent(QResizeEvent *)
 {
 	//int h = m_pInput->heightHint();
 	m_pSplitter->setGeometry(0,0,width(),height());
 	//m_pInput->setGeometry(0,height() - h,width(),h);
 }
 
-QSize KviSharedFilesWindow::sizeHint() const
+QSize SharedFilesWindow::sizeHint() const
 {
 	return m_pSplitter->sizeHint();
 }
 
-void KviSharedFilesWindow::fillCaptionBuffers()
+void SharedFilesWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Shared Files","sharedfileswindow");
 }
 
-void KviSharedFilesWindow::die()
+void SharedFilesWindow::die()
 {
 	close();
 }
@@ -705,7 +705,7 @@ void KviSharedFilesWindow::die()
 
 //#warning "Load & save properties of this kind of window"
 
-//void KviSharedFilesWindow::saveProperties()
+//void SharedFilesWindow::saveProperties()
 //{
 //	KviWindowProperty p;
 //	p.rect = externalGeometry();
@@ -722,7 +722,7 @@ void KviSharedFilesWindow::die()
 //	g_pOptions->m_pWinPropertiesList->setProperty(caption(),&p);
 //}
 //
-//void KviSharedFilesWindow::setProperties(KviWindowProperty *p)
+//void SharedFilesWindow::setProperties(KviWindowProperty *p)
 //{
 //	QValueList<int> l;
 //	l.append(p->splitWidth1);
@@ -734,5 +734,5 @@ void KviSharedFilesWindow::die()
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_sharedfileswindow.moc"
+#include "m_SharedFilesWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.h b/src/modules/sharedfileswindow/SharedFilesWindow.h
index aaf2d96a2..80707e32c 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.h
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.h
@@ -2,7 +2,7 @@
 #define _SHAREDFILESWINDOW_H_
 //=============================================================================
 //
-//   File : sharedfileswindow.h
+//   File : SharedFilesWindow.h
 //   Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -41,11 +41,11 @@ class QLabel;
 class QLineEdit;
 class QPushButton;
 
-class KviSharedFilesTreeWidgetItem : public QTreeWidgetItem
+class SharedFilesTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviSharedFilesTreeWidgetItem(QTreeWidget * lv,KviSharedFile * f);
-	~KviSharedFilesTreeWidgetItem();
+	SharedFilesTreeWidgetItem(QTreeWidget * lv,KviSharedFile * f);
+	~SharedFilesTreeWidgetItem();
 protected:
 	KviSharedFile * m_pSharedFilePointer; // THIS IS READ ONLY!
 public:
@@ -53,12 +53,12 @@ public:
 };
 
 
-class KviSharedFileEditDialog : public QDialog
+class SharedFileEditDialog : public QDialog
 {
 	Q_OBJECT
 public:
-	KviSharedFileEditDialog(QWidget* par,KviSharedFile * f = 0);
-	~KviSharedFileEditDialog();
+	SharedFileEditDialog(QWidget* par,KviSharedFile * f = 0);
+	~SharedFileEditDialog();
 
 	QDateTimeEdit * m_pExpireDateTimeEdit;
 	QLineEdit     * m_pFilePathEdit;
@@ -74,13 +74,13 @@ protected slots:
 };
 
 
-class KviSharedFilesWindow : public KviWindow, public KviModuleExtension
+class SharedFilesWindow : public KviWindow, public KviModuleExtension
 {
 	friend class KviSharedFilesItem;
 	Q_OBJECT
 public:
-	KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm);
-	~KviSharedFilesWindow();
+	SharedFilesWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm);
+	~SharedFilesWindow();
 protected:
 	QSplitter           * m_pVertSplitter;
 
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index 888cdbb1f..99e4bee13 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -21,7 +21,7 @@
 //
 //=============================================================================
 
-#include "sharedfileswindow.h"
+#include "SharedFilesWindow.h"
 
 #include "KviModule.h"
 #include "KviApplication.h"
@@ -34,7 +34,7 @@
 
 #define KVI_SHARED_FILES_WINDOW_EXTENSION_NAME "Shared files window extension"
 
-KviSharedFilesWindow * g_pSharedFilesWindow = 0;
+SharedFilesWindow * g_pSharedFilesWindow = 0;
 
 static KviModuleExtension * sharedfileswindow_extension_alloc(KviModuleExtensionAllocStruct * s)
 {
@@ -57,7 +57,7 @@ static KviModuleExtension * sharedfileswindow_extension_alloc(KviModuleExtension
 			}
 		}
 
-		g_pSharedFilesWindow = new KviSharedFilesWindow(s->pDescriptor,g_pFrame);
+		g_pSharedFilesWindow = new SharedFilesWindow(s->pDescriptor,g_pFrame);
 		g_pFrame->addWindow(g_pSharedFilesWindow,!bCreateMinimized);
 		if(bCreateMinimized)g_pSharedFilesWindow->minimize();
 		return g_pSharedFilesWindow;
diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp
index f877746ef..aca97aad5 100644
--- a/src/modules/socketspy/libkvisocketspy.cpp
+++ b/src/modules/socketspy/libkvisocketspy.cpp
@@ -30,7 +30,7 @@
 
 #include <QSplitter>
 
-KviPointerList<KviSocketSpyWindow> * g_pSocketSpyWindowList = 0;
+KviPointerList<SocketSpyWindow> * g_pSocketSpyWindowList = 0;
 
 
 /*
@@ -52,14 +52,14 @@ KviPointerList<KviSocketSpyWindow> * g_pSocketSpyWindowList = 0;
 static bool socketspy_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	if(!c->window()->console())return c->context()->errorNoIrcContext();
-	KviSocketSpyWindow *w = new KviSocketSpyWindow(c->window()->frame(),c->window()->console());
+	SocketSpyWindow *w = new SocketSpyWindow(c->window()->frame(),c->window()->console());
 	c->window()->frame()->addWindow(w);
 	return true;
 }
 
 static bool socketspy_module_init(KviModule * m)
 {
-	g_pSocketSpyWindowList = new KviPointerList<KviSocketSpyWindow>;
+	g_pSocketSpyWindowList = new KviPointerList<SocketSpyWindow>;
 	g_pSocketSpyWindowList->setAutoDelete(false);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",socketspy_kvs_cmd_open);
diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp
index fdafff752..04e05f8b9 100644
--- a/src/modules/socketspy/socketspywindow.cpp
+++ b/src/modules/socketspy/socketspywindow.cpp
@@ -32,9 +32,9 @@
 #include "KviConsoleWindow.h"
 //#include "KviModule.h"
 
-extern KviPointerList<KviSocketSpyWindow> * g_pSocketSpyWindowList;
+extern KviPointerList<SocketSpyWindow> * g_pSocketSpyWindowList;
 
-KviSocketSpyWindow::KviSocketSpyWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole)
+SocketSpyWindow::SocketSpyWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_SOCKETSPY,lpFrm,"socket_spy",lpConsole), KviIrcDataStreamMonitor(lpConsole->context())
 {
 	g_pSocketSpyWindowList->append(this);
@@ -45,65 +45,65 @@ KviSocketSpyWindow::KviSocketSpyWindow(KviMainWindow * lpFrm,KviConsoleWindow *
 	//setFocusHandler(m_pIrcView,this);
 }
 
-KviSocketSpyWindow::~KviSocketSpyWindow()
+SocketSpyWindow::~SocketSpyWindow()
 {
 	g_pSocketSpyWindowList->removeRef(this);
 }
 
-void KviSocketSpyWindow::die()
+void SocketSpyWindow::die()
 {
 	close();
 }
 
-QPixmap * KviSocketSpyWindow::myIconPtr()
+QPixmap * SocketSpyWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_SPY);
 }
 
-void KviSocketSpyWindow::resizeEvent(QResizeEvent *)
+void SocketSpyWindow::resizeEvent(QResizeEvent *)
 {
 	m_pSplitter->setGeometry(0,0,width(),height());
 }
 
-QSize KviSocketSpyWindow::sizeHint() const
+QSize SocketSpyWindow::sizeHint() const
 {
 	return m_pIrcView->sizeHint();
 }
 
-void KviSocketSpyWindow::getBaseLogFileName(QString &buffer)
+void SocketSpyWindow::getBaseLogFileName(QString &buffer)
 {
 	buffer.sprintf("SOCKETSPY_%d",context()->id());
 }
 
-void KviSocketSpyWindow::fillCaptionBuffers()
+void SocketSpyWindow::fillCaptionBuffers()
 {
 	KviQString::sprintf(m_szPlainTextCaption,__tr2qs("Socket Spy [IRC Context %u]"),m_pConsole->context()->id());
 }
 
-bool KviSocketSpyWindow::incomingMessage(const char * message)
+bool SocketSpyWindow::incomingMessage(const char * message)
 {
 	outputNoFmt(KVI_OUT_SOCKETMESSAGE,console()->decodeText(message));
 	return false;
 }
 
-bool KviSocketSpyWindow::outgoingMessage(const char * message)
+bool SocketSpyWindow::outgoingMessage(const char * message)
 {
 	outputNoFmt(KVI_OUT_RAW,console()->decodeText(message));
 	return false;
 
 }
 
-void KviSocketSpyWindow::connectionInitiated()
+void SocketSpyWindow::connectionInitiated()
 {
 	output(KVI_OUT_SOCKETWARNING,__tr2qs("Socket open"));
 }
 
-void KviSocketSpyWindow::connectionTerminated()
+void SocketSpyWindow::connectionTerminated()
 {
 	output(KVI_OUT_SOCKETWARNING,__tr2qs("Socket closed"));
 }
 
-void KviSocketSpyWindow::applyOptions()
+void SocketSpyWindow::applyOptions()
 {
 	m_pIrcView->applyOptions();
 	KviWindow::applyOptions();
diff --git a/src/modules/socketspy/socketspywindow.h b/src/modules/socketspy/socketspywindow.h
index d4390d5e9..7030eb89f 100644
--- a/src/modules/socketspy/socketspywindow.h
+++ b/src/modules/socketspy/socketspywindow.h
@@ -30,12 +30,12 @@
 
 class KviConsoleWindow;
 
-class KviSocketSpyWindow : public KviWindow, public KviIrcDataStreamMonitor
+class SocketSpyWindow : public KviWindow, public KviIrcDataStreamMonitor
 {
 	Q_OBJECT
 public:
-	KviSocketSpyWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole);
-	~KviSocketSpyWindow();
+	SocketSpyWindow(KviMainWindow * lpFrm,KviConsoleWindow * lpConsole);
+	~SocketSpyWindow();
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
diff --git a/src/modules/spaste/CMakeLists.txt b/src/modules/spaste/CMakeLists.txt
index 68ed47aa3..13b5ff88a 100644
--- a/src/modules/spaste/CMakeLists.txt
+++ b/src/modules/spaste/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/spaste
 
 SET(kvispaste_MOC_HDRS
-	controller.h
+	SlowPasteController.h
 )
 
 SET(kvispaste_SRCS
 	libkvispaste.cpp
-	controller.cpp
+	SlowPasteController.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/SlowPasteController.cpp
index 525838e05..6debc6794 100644
--- a/src/modules/spaste/controller.cpp
+++ b/src/modules/spaste/SlowPasteController.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : controller.h
+//   File : SlowPasteController.h
 //   Creation date : Thu Apr 30 2002 17:13:12 GMT by Juanjo �lvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "controller.h"
+#include "SlowPasteController.h"
 
 #include "KviWindow.h"
 #include "KviConsoleWindow.h"
@@ -36,9 +36,9 @@
 #include <QStringList>
 #include <QClipboard>
 
-extern KviPointerList<SPasteController> * g_pControllerList;
+extern KviPointerList<SlowPasteController> * g_pControllerList;
 
-SPasteController::SPasteController(KviWindow * w,int id)
+SlowPasteController::SlowPasteController(KviWindow * w,int id)
 : m_pClipBuff(NULL),m_pFile(NULL),m_pId(id),m_pWindow(w)
 {
 	g_pControllerList->append(this);
@@ -46,7 +46,7 @@ SPasteController::SPasteController(KviWindow * w,int id)
 	m_pTimer = new QTimer(this);
 }
 
-SPasteController::~SPasteController()
+SlowPasteController::~SlowPasteController()
 {
 	g_pControllerList->removeRef(this);
 	if(m_pFile)
@@ -63,7 +63,7 @@ SPasteController::~SPasteController()
 		delete m_pClipBuff;
 }
 
-bool SPasteController::pasteFileInit(QString &fileName)
+bool SlowPasteController::pasteFileInit(QString &fileName)
 {
 	if(m_pClipBuff)return false; // can't paste a file while pasting the clipboard
 	if(m_pFile)return false; // can't paste two files at a time
@@ -78,7 +78,7 @@ bool SPasteController::pasteFileInit(QString &fileName)
 	return true;
 }
 
-bool SPasteController::pasteClipboardInit(void)
+bool SlowPasteController::pasteClipboardInit(void)
 {
 	if(m_pFile)return false; // can't paste clipboard while pasting a file
 	QString tmp(g_pApp->clipboard()->text());
@@ -97,7 +97,7 @@ bool SPasteController::pasteClipboardInit(void)
 	return true;
 }
 
-void SPasteController::pasteFile(void)
+void SlowPasteController::pasteFile(void)
 {
 	QString line;
 	char data[1024];
@@ -122,7 +122,7 @@ void SPasteController::pasteFile(void)
 	}
 }
 
-void SPasteController::pasteClipboard(void)
+void SlowPasteController::pasteClipboard(void)
 {
 	if(m_pClipBuff->isEmpty() || !g_pApp->windowExists(m_pWindow))
 	{
@@ -135,5 +135,5 @@ void SPasteController::pasteClipboard(void)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "controller.moc"
+#include "SlowPasteController.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/spaste/controller.h b/src/modules/spaste/SlowPasteController.h
index 21eb40edc..6f7c3c7d1 100644
--- a/src/modules/spaste/controller.h
+++ b/src/modules/spaste/SlowPasteController.h
@@ -2,7 +2,7 @@
 #define _SPASTE_CONTROLLER_H_
 //=============================================================================
 //
-//   File : controller.h
+//   File : SlowPasteController.h
 //   Creation date : Thu Apr 30 2002 17:13:12 GMT by Juanjo �lvarez
 //
 //   This file is part of the KVIrc irc client distribution
@@ -33,12 +33,12 @@
 #include <QStringList>
 #include <QFile>
 
-class SPasteController : public QObject
+class SlowPasteController : public QObject
 {
 	Q_OBJECT
 public:
-	SPasteController(KviWindow * w,int id);
-	~SPasteController();
+	SlowPasteController(KviWindow * w,int id);
+	~SlowPasteController();
 
 	//bool pasteFileInit(KviCString * fileName);
 	bool pasteFileInit(QString &fileName);
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 987d6cc7d..cf7fda625 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -24,7 +24,7 @@
 //=============================================================================
 
 #include "libkvispaste.h"
-#include "controller.h"
+#include "SlowPasteController.h"
 
 #include "KviModule.h"
 #include "KviFileUtils.h"
@@ -42,12 +42,12 @@
     #include <unistd.h>
 #endif
 
-KviPointerList<SPasteController> * g_pControllerList = 0;
+KviPointerList<SlowPasteController> * g_pControllerList = 0;
 int ctrlId = 0;
 
-static SPasteController * spaste_find_controller(KviWindow * w)
+static SlowPasteController * spaste_find_controller(KviWindow * w)
 {
-	for(SPasteController * spc = g_pControllerList->first();spc;spc = g_pControllerList->next())
+	for(SlowPasteController * spc = g_pControllerList->first();spc;spc = g_pControllerList->next())
 	{
 		if(spc->window() == w)return spc;
 	}
@@ -116,8 +116,8 @@ static bool spaste_kvs_cmd_file(KviKvsModuleCommandCall * c)
 	}
 	tmp.close();
 
-	SPasteController * controller = spaste_find_controller(window);
-	if(!controller)controller = new SPasteController(window,++ctrlId);
+	SlowPasteController * controller = spaste_find_controller(window);
+	if(!controller)controller = new SlowPasteController(window,++ctrlId);
 	if(!controller->pasteFileInit(szFile)) {
 		c->warning(__tr2qs("Could not paste file"));
 		return false;
@@ -159,8 +159,8 @@ static bool spaste_kvs_cmd_clipboard(KviKvsModuleCommandCall * c)
 	KviWindow * window = spaste_kvs_find_window(szWindow,c);
 	if(!window)return false;
 
-	SPasteController * controller = spaste_find_controller(window);
-	if(!controller)controller = new SPasteController(window,++ctrlId);
+	SlowPasteController * controller = spaste_find_controller(window);
+	if(!controller)controller = new SlowPasteController(window,++ctrlId);
 	controller->pasteClipboardInit();
 	return true;
 }
@@ -208,8 +208,8 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	KviPointerListIterator<SPasteController> it(*g_pControllerList);
-	SPasteController *item;
+	KviPointerListIterator<SlowPasteController> it(*g_pControllerList);
+	SlowPasteController *item;
 
 	if(!iId) //Delete all spaste's from the current window
 	{
@@ -259,8 +259,8 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 
 static bool spaste_kvs_cmd_list(KviKvsModuleCommandCall * c)
 {
-	KviPointerListIterator<SPasteController> it(*g_pControllerList);
-	SPasteController *item;
+	KviPointerListIterator<SlowPasteController> it(*g_pControllerList);
+	SlowPasteController *item;
 
 	while( (item = it.current()) != 0)
 	{
@@ -301,7 +301,7 @@ static bool spaste_kvs_cmd_setdelay(KviKvsModuleCommandCall * c)
 
 static bool spaste_module_init(KviModule * m)
 {
-	g_pControllerList = new KviPointerList<SPasteController>;
+	g_pControllerList = new KviPointerList<SlowPasteController>;
 	g_pControllerList->setAutoDelete(false);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"file",spaste_kvs_cmd_file);
diff --git a/src/modules/system/CMakeLists.txt b/src/modules/system/CMakeLists.txt
index 559250260..412856c7e 100644
--- a/src/modules/system/CMakeLists.txt
+++ b/src/modules/system/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 SET(kvisystem_SRCS
 	libkvisystem.cpp
-	plugin.cpp
+	Plugin.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/system/plugin.cpp b/src/modules/system/Plugin.cpp
index f1a47bea1..35190af95 100644
--- a/src/modules/system/plugin.cpp
+++ b/src/modules/system/Plugin.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : plugin.cpp
+//   File : Plugin.cpp
 //   Creation date : Wed Apr 11 04 2007 00:54:00 GMT+1 by TheXception
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "plugin.h"
+#include "Plugin.h"
 
 #include "KviModule.h"
 #include "KviCString.h"
@@ -102,19 +102,19 @@
 		[/example]
 */
 
-KviPlugin::KviPlugin(QLibrary * pLibrary, const QString& name)
+Plugin::Plugin(QLibrary * pLibrary, const QString& name)
 {
 	m_pLibrary = pLibrary;
 	m_szName = name;
 }
 
-KviPlugin::~KviPlugin()
+Plugin::~Plugin()
 {
 	if(m_pLibrary->isLoaded()) m_pLibrary->unload();
 	delete m_pLibrary;
 }
 
-KviPlugin* KviPlugin::load(const QString& szFileName)
+Plugin* Plugin::load(const QString& szFileName)
 {
 	QLibrary* pLibrary = new QLibrary(szFileName);
 	if (!pLibrary->load())
@@ -123,7 +123,7 @@ KviPlugin* KviPlugin::load(const QString& szFileName)
 		return 0;
 	}
 
-	KviPlugin* pPlugin = new KviPlugin(pLibrary,KviFileUtils::extractFileName(szFileName));
+	Plugin* pPlugin = new Plugin(pLibrary,KviFileUtils::extractFileName(szFileName));
 
 	plugin_load function_load;
 
@@ -136,7 +136,7 @@ KviPlugin* KviPlugin::load(const QString& szFileName)
 	return pPlugin;
 }
 
-bool KviPlugin::pfree(char * pBuffer)
+bool Plugin::pfree(char * pBuffer)
 {
 	plugin_free function_free;
 
@@ -150,7 +150,7 @@ bool KviPlugin::pfree(char * pBuffer)
 	return false;
 }
 
-bool KviPlugin::unload()
+bool Plugin::unload()
 {
 	plugin_unload function_unload;
 
@@ -165,7 +165,7 @@ bool KviPlugin::unload()
 	return true;
 }
 
-bool KviPlugin::canunload()
+bool Plugin::canunload()
 {
 	plugin_canunload function_canunload;
 
@@ -178,7 +178,7 @@ bool KviPlugin::canunload()
 	return true;
 }
 
-int KviPlugin::call(const QString& pszFunctionName, int argc, char * argv[], char ** pBuffer)
+int Plugin::call(const QString& pszFunctionName, int argc, char * argv[], char ** pBuffer)
 {
 	int r;
 	plugin_function function_call;
@@ -194,30 +194,30 @@ int KviPlugin::call(const QString& pszFunctionName, int argc, char * argv[], cha
 	return r;
 }
 
-QString KviPlugin::name() const
+QString Plugin::name() const
 {
 	return m_szName;
 }
 
-void KviPlugin::setName(const QString& Name)
+void Plugin::setName(const QString& Name)
 {
 	m_szName = Name;
 }
 
-KviPluginManager::KviPluginManager()
+PluginManager::PluginManager()
 {
-	m_pPluginDict = new KviPointerHashTable<QString,KviPlugin>(5,false);
+	m_pPluginDict = new KviPointerHashTable<QString,Plugin>(5,false);
 	m_pPluginDict->setAutoDelete(false);
 
 	m_bCanUnload = true;
 }
 
-KviPluginManager::~KviPluginManager()
+PluginManager::~PluginManager()
 {
 	delete 	m_pPluginDict;
 }
 
-bool KviPluginManager::pluginCall(KviKvsModuleFunctionCall *c)
+bool PluginManager::pluginCall(KviKvsModuleFunctionCall *c)
 {
 	//   /echo $system.call("traffic.dll",about)
 	QString szPluginPath; //contains full path and plugin name like "c:/plugin.dll"
@@ -295,7 +295,7 @@ bool KviPluginManager::pluginCall(KviKvsModuleFunctionCall *c)
 
 	//Preparing return buffer
 	char * returnBuffer;
-	KviPlugin * plugin;
+	Plugin * plugin;
 
 	plugin = getPlugin(szPluginPath);
 	int r = plugin->call(szFunctionName,iArgc,ppArgv,&returnBuffer);
@@ -325,13 +325,13 @@ bool KviPluginManager::pluginCall(KviKvsModuleFunctionCall *c)
 	return true;
 }
 
-bool KviPluginManager::checkUnload()
+bool PluginManager::checkUnload()
 {
 	/*
 	Always called when system module should be unloaded
 	Checking here if all small "modules" can be unloaded
 	*/
-	KviPointerHashTableIterator<QString,KviPlugin> it(*m_pPluginDict);
+	KviPointerHashTableIterator<QString,Plugin> it(*m_pPluginDict);
 
 	m_bCanUnload = true;
 
@@ -350,9 +350,9 @@ bool KviPluginManager::checkUnload()
 	return m_bCanUnload;
 }
 
-void KviPluginManager::unloadAll()
+void PluginManager::unloadAll()
 {
-	KviPointerHashTableIterator<QString,KviPlugin> it(*m_pPluginDict);
+	KviPointerHashTableIterator<QString,Plugin> it(*m_pPluginDict);
 
 	while(it.current())
 	{
@@ -362,7 +362,7 @@ void KviPluginManager::unloadAll()
 	}
 }
 
-bool KviPluginManager::findPlugin(QString& szPath)
+bool PluginManager::findPlugin(QString& szPath)
 {
 	QString szFileName(KviFileUtils::extractFileName(szPath));
 //	szFileName.detach();
@@ -388,22 +388,22 @@ bool KviPluginManager::findPlugin(QString& szPath)
 	return true;
 }
 
-bool KviPluginManager::isPluginLoaded(const QString& pSingleName)
+bool PluginManager::isPluginLoaded(const QString& pSingleName)
 {
-	KviPlugin * p = m_pPluginDict->find(pSingleName);
+	Plugin * p = m_pPluginDict->find(pSingleName);
 	if (!p)
 		return false;
 	else
 		return true;
 }
 
-bool KviPluginManager::loadPlugin(const QString& szPluginPath)
+bool PluginManager::loadPlugin(const QString& szPluginPath)
 {
 	if(isPluginLoaded(szPluginPath))
 	{
 		return getPlugin(szPluginPath)!=0;
 	} else {
-		KviPlugin * plugin = KviPlugin::load(szPluginPath);
+		Plugin * plugin = Plugin::load(szPluginPath);
 		if(plugin)
 		{
 			m_pPluginDict->insert(szPluginPath,plugin);
@@ -413,8 +413,8 @@ bool KviPluginManager::loadPlugin(const QString& szPluginPath)
 	return false;
 }
 
-KviPlugin * KviPluginManager::getPlugin(const QString& szPluginPath)
+Plugin * PluginManager::getPlugin(const QString& szPluginPath)
 {
-	KviPlugin * p = m_pPluginDict->find(szPluginPath);
+	Plugin * p = m_pPluginDict->find(szPluginPath);
 	return p;
 }
diff --git a/src/modules/system/plugin.h b/src/modules/system/Plugin.h
index 3edb9ad48..2a5f4f03a 100644
--- a/src/modules/system/plugin.h
+++ b/src/modules/system/Plugin.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : plugin.h
+//   File : Plugin.h
 //   Creation date : Wed Apr 11 04 2007 00:54:00 GMT+1 by TheXception
 //
 //   This file is part of the KVIrc irc client distribution
@@ -35,20 +35,20 @@ typedef int (*plugin_canunload)();
 typedef int (*plugin_load)();
 typedef int (*plugin_free)(char * pBuffer);
 
-class KviPlugin
+class Plugin
 {
 protected:
-	// You have to create plugin instance by calling KviPlugin::load()
-	KviPlugin(QLibrary * pLibrary,const QString& name);
+	// You have to create plugin instance by calling Plugin::load()
+	Plugin(QLibrary * pLibrary,const QString& name);
 public:
-	~KviPlugin();
+	~Plugin();
 private:
 	// shared
 	// internal
 	QLibrary *m_pLibrary;
 	QString   m_szName;
 public:
-	static KviPlugin* load(const QString& szFileName);
+	static Plugin* load(const QString& szFileName);
 	bool pfree(char * pBuffer);
 	bool unload();
 	bool canunload();
@@ -58,16 +58,16 @@ public:
 protected:
 };
 
-class KviPluginManager
+class PluginManager
 {
 	public:
-		KviPluginManager();
-		~KviPluginManager();
+		PluginManager();
+		~PluginManager();
 	private:
 		// shared
 		bool m_bCanUnload;
 		// internal
-		KviPointerHashTable<QString,KviPlugin> * m_pPluginDict;
+		KviPointerHashTable<QString,Plugin> * m_pPluginDict;
 	public:
 		bool pluginCall(KviKvsModuleFunctionCall *c);
 		bool checkUnload();
@@ -76,7 +76,7 @@ class KviPluginManager
 		bool findPlugin(QString& szName);
 		bool isPluginLoaded(const QString& szFileNameOrPathToLoad);
 		bool loadPlugin(const QString& szPluginPath);
-		KviPlugin * getPlugin(const QString& szPluginPath);
+		Plugin * getPlugin(const QString& szPluginPath);
 };
 
 #endif //_PLUGIN_H_
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 4c1f4ffff..3dd02cbb7 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -23,7 +23,7 @@
 //
 //=============================================================================
 
-#include "plugin.h"
+#include "Plugin.h"
 
 #include "kvi_settings.h"
 #include "KviModule.h"
@@ -53,7 +53,7 @@
 	#include <QStringList>
 #endif
 
-KviPluginManager * g_pPluginManager;
+PluginManager * g_pPluginManager;
 
 /*
 	@doc: system.ostype
@@ -777,7 +777,7 @@ static bool system_module_init(KviModule * m)
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"setSelection",system_kvs_cmd_setSelection);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"runcmd",system_kvs_cmd_runcmd);
 
-	g_pPluginManager = new(KviPluginManager);
+	g_pPluginManager = new(PluginManager);
 
 	return true;
 }
diff --git a/src/modules/term/CMakeLists.txt b/src/modules/term/CMakeLists.txt
index 3598ab444..17025fa57 100644
--- a/src/modules/term/CMakeLists.txt
+++ b/src/modules/term/CMakeLists.txt
@@ -1,14 +1,14 @@
 # CMakeLists for src/modules/term
 
 SET(kviterm_MOC_HDRS
-	termwidget.h
-	termwindow.h
+	TermWidget.h
+	TermWindow.h
 )
 
 SET(kviterm_SRCS
 	libkviterm.cpp
-	termwidget.cpp
-	termwindow.cpp
+	TermWidget.cpp
+	TermWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/TermWidget.cpp
index 410203261..4d5bedd61 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/TermWidget.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : termwidget.cpp
+//   File : TermWidget.cpp
 //   Creation date : Thu Aug 10 2000 17:42:12 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "termwidget.h"
-#include "termwindow.h"
+#include "TermWidget.h"
+#include "TermWindow.h"
 
 #include "KviModule.h"
 #include "KviMainWindow.h"
@@ -43,10 +43,10 @@
 	#include <kde_terminal_interface.h>
 
 	extern KviModule                     * g_pTermModule;
-	extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
-	extern KviPointerList<KviTermWindow> * g_pTermWindowList;
+	extern KviPointerList<TermWidget> * g_pTermWidgetList;
+	extern KviPointerList<TermWindow> * g_pTermWindowList;
 
-	KviTermWidget::KviTermWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
+	TermWidget::TermWidget(QWidget * par,KviMainWindow *,bool bIsStandalone)
 	: QFrame(par)
 	{
 		setObjectName("term_widget");
@@ -99,7 +99,7 @@
 		}
 	}
 
-	KviTermWidget::~KviTermWidget()
+	TermWidget::~TermWidget()
 	{
 		if(m_pKonsoleWidget)
 			disconnect(m_pKonsoleWidget,SIGNAL(destroyed()),this,SLOT(konsoleDestroyed()));
@@ -108,7 +108,7 @@
 		if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty())g_pTermModule->unlock();
 	}
 
-	void KviTermWidget::resizeEvent(QResizeEvent *)
+	void TermWidget::resizeEvent(QResizeEvent *)
 	{
 		int hght = 0;
 		if(m_bIsStandalone)
@@ -121,13 +121,13 @@
 			m_pKonsoleWidget->setGeometry(1,hght + 1,width() - 2,height() - (hght + 2));
 	}
 
-	void KviTermWidget::closeClicked()
+	void TermWidget::closeClicked()
 	{
 		// this is called only in standalone  mode
 		delete this;
 	}
 
-	void KviTermWidget::konsoleDestroyed()
+	void TermWidget::konsoleDestroyed()
 	{
 		m_pKonsoleWidget = 0;
 		m_pKonsolePart = 0;
@@ -135,26 +135,26 @@
 		QTimer::singleShot(0,this,SLOT(autoClose()));
 	}
 
-	void KviTermWidget::autoClose()
+	void TermWidget::autoClose()
 	{
 		if(m_bIsStandalone)delete this;
 		else ((KviWindow *)parent())->close();
 	}
 
-	void KviTermWidget::changeTitle(int,const QString& str)
+	void TermWidget::changeTitle(int,const QString& str)
 	{
 		if(m_bIsStandalone)m_pTitleLabel->setText(str);
 	}
 
-	void KviTermWidget::notifySize(int,int)
+	void TermWidget::notifySize(int,int)
 	{
 	}
 
-	void KviTermWidget::changeColumns(int)
+	void TermWidget::changeColumns(int)
 	{
 	}
 
-	QSize KviTermWidget::sizeHint() const
+	QSize TermWidget::sizeHint() const
 	{
 		int hght = 0;
 		int wdth = 0;
@@ -172,7 +172,7 @@
 	}
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "termwidget.moc"
+#include "TermWidget.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif //COMPILE_KDE_SUPPORT
diff --git a/src/modules/term/termwidget.h b/src/modules/term/TermWidget.h
index d9960c5ea..fc917a5c1 100644
--- a/src/modules/term/termwidget.h
+++ b/src/modules/term/TermWidget.h
@@ -2,7 +2,7 @@
 #define _HELPWIDGET_H_
 //=============================================================================
 //
-//   File : termwidget.h
+//   File : TermWidget.h
 //   Creation date : Wed Aug 30 2000 15:34:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -36,13 +36,13 @@
 
 	class KviMainWindow;
 
-	class KviTermWidget : public QFrame
+	class TermWidget : public QFrame
 	{
 		Q_OBJECT
 		Q_PROPERTY( int KviProperty_ChildFocusOwner READ dummy )
 	public:
-		KviTermWidget(QWidget * par,KviMainWindow * lpFrm,bool bIsStandalone = false);
-		~KviTermWidget();
+		TermWidget(QWidget * par,KviMainWindow * lpFrm,bool bIsStandalone = false);
+		~TermWidget();
 	private:
 		KviTalHBox   * m_pHBox;
 		QLabel       * m_pTitleLabel;
diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/TermWindow.cpp
index 9cad5be63..e58a32dc2 100644
--- a/src/modules/term/termwindow.cpp
+++ b/src/modules/term/TermWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : termwindow.cpp
+//   File : TermWindow.cpp
 //   Creation date : Thu Aug 31 2000 15:02:22 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "termwindow.h"
-#include "termwidget.h"
+#include "TermWindow.h"
+#include "TermWidget.h"
 
 #ifdef COMPILE_KDE_SUPPORT
 	#include "KviIconManager.h"
@@ -32,49 +32,49 @@
 	#include "KviModule.h"
 
 	extern KviModule * g_pTermModule;
-	extern KviPointerList<KviTermWindow> * g_pTermWindowList;
-	extern KviPointerList<KviTermWidget> * g_pTermWidgetList;
+	extern KviPointerList<TermWindow> * g_pTermWindowList;
+	extern KviPointerList<TermWidget> * g_pTermWidgetList;
 	extern KviIconManager * g_pIconManager;
 
-	KviTermWindow::KviTermWindow(KviMainWindow * lpFrm,const char * name)
+	TermWindow::TermWindow(KviMainWindow * lpFrm,const char * name)
 	: KviWindow(KVI_WINDOW_TYPE_TERM,lpFrm,name)
 	{
 		g_pTermWindowList->append(this);
 		m_pTermWidget = 0;
-		m_pTermWidget = new KviTermWidget(this,lpFrm);
+		m_pTermWidget = new TermWidget(this,lpFrm);
 		// Ensure proper focusing
 	//	setFocusHandler(m_pTermWidget->konsoleWidget(),this);
 	}
 
-	KviTermWindow::~KviTermWindow()
+	TermWindow::~TermWindow()
 	{
 		g_pTermWindowList->removeRef(this);
 		if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty())g_pTermModule->unlock();
 	}
 
-	QPixmap * KviTermWindow::myIconPtr()
+	QPixmap * TermWindow::myIconPtr()
 	{
 		return g_pIconManager->getSmallIcon(KVI_SMALLICON_RAW);
 	}
 
-	void KviTermWindow::resizeEvent(QResizeEvent *)
+	void TermWindow::resizeEvent(QResizeEvent *)
 	{
 		if(m_pTermWidget)m_pTermWidget->setGeometry(0,0,width(),height());
 	}
 
-	QSize KviTermWindow::sizeHint() const
+	QSize TermWindow::sizeHint() const
 	{
 		return m_pTermWidget ? m_pTermWidget->sizeHint() : KviWindow::sizeHint();
 	}
 
-	void KviTermWindow::fillCaptionBuffers()
+	void TermWindow::fillCaptionBuffers()
 	{
 		m_szPlainTextCaption = __tr("Terminal");
 	}
 
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "termwindow.moc"
+#include "TermWindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif
diff --git a/src/modules/term/termwindow.h b/src/modules/term/TermWindow.h
index f2d9b7f3c..a199173f0 100644
--- a/src/modules/term/termwindow.h
+++ b/src/modules/term/TermWindow.h
@@ -2,7 +2,7 @@
 #define _TERMWINDOW_H_
 //=============================================================================
 //
-//   File : termwindow.h
+//   File : TermWindow.h
 //   Creation date : Thu Aug 31 2000 15:00:00 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -30,16 +30,16 @@
 	#include "KviWindow.h"
 	#include "KviCString.h"
 
-	class KviTermWidget;
+	class TermWidget;
 
-	class KviTermWindow : public KviWindow
+	class TermWindow : public KviWindow
 	{
 		Q_OBJECT
 	public:
-		KviTermWindow(KviMainWindow * lpFrm,const char * name);
-		~KviTermWindow();
+		TermWindow(KviMainWindow * lpFrm,const char * name);
+		~TermWindow();
 	protected:
-		KviTermWidget * m_pTermWidget;
+		TermWidget * m_pTermWidget;
 	protected:
 		virtual QPixmap * myIconPtr();
 		virtual void fillCaptionBuffers();
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index a6dcb4c04..8d7cebb4d 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -31,11 +31,11 @@
 #include <QSplitter>
 
 #ifdef COMPILE_KDE_SUPPORT
-	#include "termwidget.h"
-	#include "termwindow.h"
+	#include "TermWidget.h"
+	#include "TermWindow.h"
 
-	KviPointerList<KviTermWidget> * g_pTermWidgetList      = 0;
-	KviPointerList<KviTermWindow> * g_pTermWindowList      = 0;
+	KviPointerList<TermWidget> * g_pTermWidgetList      = 0;
+	KviPointerList<TermWindow> * g_pTermWindowList      = 0;
 #endif
 
 KviModule * g_pTermModule = 0;
@@ -69,10 +69,10 @@ static bool term_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	c->module()->lock(); // multiple locks are allowed
 	if(c->hasSwitch('m',"mdi"))
 	{
-		KviTermWindow *w = new KviTermWindow(c->window()->frame(),"Terminal emulator");
+		TermWindow *w = new TermWindow(c->window()->frame(),"Terminal emulator");
 		c->window()->frame()->addWindow(w);
 	} else {
-		KviTermWidget *w = new KviTermWidget(c->window()->frame()->splitter(), c->window()->frame(),true);
+		TermWidget *w = new TermWidget(c->window()->frame()->splitter(), c->window()->frame(),true);
 		w->show();
 	}
 #else
@@ -86,9 +86,9 @@ static bool term_module_init(KviModule * m)
 	g_pTermModule = m;
 
 #ifdef COMPILE_KDE_SUPPORT
-	g_pTermWidgetList = new KviPointerList<KviTermWidget>;
+	g_pTermWidgetList = new KviPointerList<TermWidget>;
 	g_pTermWidgetList->setAutoDelete(false);
-	g_pTermWindowList = new KviPointerList<KviTermWindow>;
+	g_pTermWindowList = new KviPointerList<TermWindow>;
 	g_pTermWindowList->setAutoDelete(false);
 #endif
 
diff --git a/src/modules/theme/CMakeLists.txt b/src/modules/theme/CMakeLists.txt
index 2e810769b..600ec61cf 100644
--- a/src/modules/theme/CMakeLists.txt
+++ b/src/modules/theme/CMakeLists.txt
@@ -2,16 +2,16 @@
 
 SET(kvitheme_MOC_HDRS
 	managementdialog.h
-	packthemedialog.h
-	savethemedialog.h
+	PackThemeDialog.h
+	SaveThemeDialog.h
 )
 
 SET(kvitheme_SRCS
 	libkvitheme.cpp
 	managementdialog.cpp
-	packthemedialog.cpp
-	savethemedialog.cpp
-	themefunctions.cpp
+	PackThemeDialog.cpp
+	SaveThemeDialog.cpp
+	ThemeFunctions.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/PackThemeDialog.cpp
index ba44c006c..c3560ec78 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/PackThemeDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : packthemedialog.cpp
+//   File : PackThemeDialog.cpp
 //   Creation date : Wed 03 Jan 2007 01:11:44 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -23,8 +23,8 @@
 //
 //=============================================================================
 
-#include "packthemedialog.h"
-#include "themefunctions.h"
+#include "PackThemeDialog.h"
+#include "ThemeFunctions.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -58,7 +58,7 @@
 
 
 
-KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> * pThemeInfoList)
+PackThemeDialog::PackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> * pThemeInfoList)
 : QWizard(pParent)
 {
 	setWindowTitle(__tr2qs_ctx("Export Theme - KVIrc","theme"));
@@ -115,26 +115,26 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent, KviPointerList<KviThem
 	addPage(pPage);
 
 	// Theme data
-	m_pPackThemeDataWidget = new KviPackThemeDataWidget(this);
+	m_pPackThemeDataWidget = new PackThemeDataWidget(this);
 	addPage(m_pPackThemeDataWidget);
 
 	// Packager information
-	m_pPackThemeInfoWidget = new KviPackThemeInfoWidget(this);
+	m_pPackThemeInfoWidget = new PackThemeInfoWidget(this);
 	addPage(m_pPackThemeInfoWidget);
 	
 	// Screenshot/logo/icon
-	m_pPackThemeImageWidget = new KviPackThemeImageWidget(this);
+	m_pPackThemeImageWidget = new PackThemeImageWidget(this);
 	addPage(m_pPackThemeImageWidget);
 	
 	// Save file name
-	m_pPackThemeSaveWidget = new KviPackThemeSaveWidget(this);
+	m_pPackThemeSaveWidget = new PackThemeSaveWidget(this);
 	addPage(m_pPackThemeSaveWidget);
 
 	//last thing to do before starting
 	m_pPackThemeDataWidget->parseThemes(m_pThemeInfoList);
 }
 
-KviPackThemeDataWidget::KviPackThemeDataWidget(KviPackThemeDialog * pParent)
+PackThemeDataWidget::PackThemeDataWidget(PackThemeDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("theme_package_data_page");
@@ -142,7 +142,7 @@ KviPackThemeDataWidget::KviPackThemeDataWidget(KviPackThemeDialog * pParent)
 	setSubTitle(__tr2qs_ctx("This is the information list for the themes you're packaging. If it looks OK press \"Next\" to continue, otherwise press \"Cancel\" and rewiew your themes first.","theme"));
 }
 
-void KviPackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoList)
+void PackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoList)
 {
 	QString szPackageName;
 	QString szPackageAuthor;
@@ -209,7 +209,7 @@ void KviPackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeIn
 				szScreenshotPath = pThemeInfo->smallScreenshotPath();
 		}
 
-		KviThemeFunctions::getThemeHtmlDescription(
+		ThemeFunctions::getThemeHtmlDescription(
 			szThemeDescription,
 			pThemeInfo->name(),
 			pThemeInfo->version(),
@@ -245,11 +245,11 @@ void KviPackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeIn
 	setField("packageAuthor",szPackageAuthor);
 }
 
-KviPackThemeDataWidget::~KviPackThemeDataWidget()
+PackThemeDataWidget::~PackThemeDataWidget()
 {
 }
 
-KviPackThemeInfoWidget::KviPackThemeInfoWidget(KviPackThemeDialog * pParent)
+PackThemeInfoWidget::PackThemeInfoWidget(PackThemeDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("theme_package_info_page");
@@ -305,7 +305,7 @@ KviPackThemeInfoWidget::KviPackThemeInfoWidget(KviPackThemeDialog * pParent)
 	registerField("packageAuthor*",m_pPackageAuthorEdit);
 
 }
-void KviPackThemeInfoWidget::initializePage()
+void PackThemeInfoWidget::initializePage()
 {
 	QString szPackageName = field("packageName").toString();
 	QString szPackageVersion = field("packageVersion").toString();
@@ -317,11 +317,11 @@ void KviPackThemeInfoWidget::initializePage()
 	m_pPackageAuthorEdit->setText(szPackageAuthor);
 }
 
-KviPackThemeInfoWidget::~KviPackThemeInfoWidget()
+PackThemeInfoWidget::~PackThemeInfoWidget()
 {
 }
 
-KviPackThemeImageWidget::KviPackThemeImageWidget(KviPackThemeDialog * pParent)
+PackThemeImageWidget::PackThemeImageWidget(PackThemeDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("theme_package_image_page");
@@ -345,11 +345,11 @@ KviPackThemeImageWidget::KviPackThemeImageWidget(KviPackThemeDialog * pParent)
 	//m_pImageSelectionPage = pPage;
 }
 
-KviPackThemeImageWidget::~KviPackThemeImageWidget()
+PackThemeImageWidget::~PackThemeImageWidget()
 {
 }
 
-void KviPackThemeImageWidget::imageSelectionChanged(const QString & szImagePath)
+void PackThemeImageWidget::imageSelectionChanged(const QString & szImagePath)
 {
 	QImage pix(szImagePath);
 	if(!pix.isNull())
@@ -373,7 +373,7 @@ void KviPackThemeImageWidget::imageSelectionChanged(const QString & szImagePath)
 	m_pImageLabel->setPixmap(QPixmap());
 }
 
-KviPackThemeSaveWidget::KviPackThemeSaveWidget(KviPackThemeDialog * pParent)
+PackThemeSaveWidget::PackThemeSaveWidget(PackThemeDialog * pParent)
 : QWizardPage(pParent)
 {
 	setObjectName("theme_package_save_page");
@@ -396,11 +396,11 @@ KviPackThemeSaveWidget::KviPackThemeSaveWidget(KviPackThemeDialog * pParent)
 	registerField("packageSavePath*",m_pSavePathSelector);
 }
 
-KviPackThemeSaveWidget::~KviPackThemeSaveWidget()
+PackThemeSaveWidget::~PackThemeSaveWidget()
 {
 }
 
-void KviPackThemeSaveWidget::initializePage()
+void PackThemeSaveWidget::initializePage()
 {
 	m_szPackagePath = field("packageSavePath").toString();
 }
@@ -413,17 +413,17 @@ void KviPackThemeSaveWidget::initializePage()
 }
 #endif
 
-KviPackThemeDialog::~KviPackThemeDialog()
+PackThemeDialog::~PackThemeDialog()
 {
 }
 
-void KviPackThemeDialog::accept()
+void PackThemeDialog::accept()
 {
 	if(!packTheme()) return;
 	QWizard::accept();
 }
 
-bool KviPackThemeDialog::packTheme()
+bool PackThemeDialog::packTheme()
 {
 	//m_pImageSelector->commit();
 	//m_pPathSelector->commit();
diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/PackThemeDialog.h
index d99862dfe..920bed2a1 100644
--- a/src/modules/theme/packthemedialog.h
+++ b/src/modules/theme/PackThemeDialog.h
@@ -2,7 +2,7 @@
 #define _PACKTHEMEDIALOG_H_
 //=============================================================================
 //
-//   File : packthemedialog.h
+//   File : PackThemeDialog.h
 //   Creation date : Wed 03 Jan 2007 01:11:44 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -37,22 +37,22 @@ class QLabel;
 class QTextEdit;
 class KviFileSelector;
 
-class KviPackThemeDataWidget;
-class KviPackThemeInfoWidget;
-class KviPackThemeImageWidget;
-class KviPackThemeSaveWidget;
+class PackThemeDataWidget;
+class PackThemeInfoWidget;
+class PackThemeImageWidget;
+class PackThemeSaveWidget;
 
-class KviPackThemeDialog : public QWizard
+class PackThemeDialog : public QWizard
 {
 	Q_OBJECT
 public:
-	KviPackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> * pThemeInfoList);
-	~KviPackThemeDialog();
+	PackThemeDialog(QWidget * pParent, KviPointerList<KviThemeInfo> * pThemeInfoList);
+	~PackThemeDialog();
 protected:
-	KviPackThemeDataWidget       * m_pPackThemeDataWidget;
-	KviPackThemeInfoWidget       * m_pPackThemeInfoWidget;
-	KviPackThemeImageWidget      * m_pPackThemeImageWidget;
-	KviPackThemeSaveWidget       * m_pPackThemeSaveWidget;
+	PackThemeDataWidget       * m_pPackThemeDataWidget;
+	PackThemeInfoWidget       * m_pPackThemeInfoWidget;
+	PackThemeImageWidget      * m_pPackThemeImageWidget;
+	PackThemeSaveWidget       * m_pPackThemeSaveWidget;
 	KviPointerList<KviThemeInfo> * m_pThemeInfoList;
 	
 	QString                        m_szAuthor;
@@ -69,22 +69,22 @@ protected:
 	bool packTheme();
 };
 
-class KviPackThemeDataWidget : public QWizardPage
+class PackThemeDataWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
-	KviPackThemeDataWidget(KviPackThemeDialog * pParent);
-	~KviPackThemeDataWidget();
+	PackThemeDataWidget(PackThemeDialog * pParent);
+	~PackThemeDataWidget();
 public:
 	void parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoList);
 };
 
-class KviPackThemeInfoWidget : public QWizardPage
+class PackThemeInfoWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
-	KviPackThemeInfoWidget(KviPackThemeDialog * pParent);
-	~KviPackThemeInfoWidget();
+	PackThemeInfoWidget(PackThemeDialog * pParent);
+	~PackThemeInfoWidget();
 public:
 	QLineEdit * m_pPackageNameEdit;
 	QTextEdit * m_pPackageDescriptionEdit;
@@ -94,12 +94,12 @@ protected:
 	virtual void initializePage();
 };
 
-class KviPackThemeImageWidget : public QWizardPage
+class PackThemeImageWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
-	KviPackThemeImageWidget(KviPackThemeDialog * pParent);
-	~KviPackThemeImageWidget();
+	PackThemeImageWidget(PackThemeDialog * pParent);
+	~PackThemeImageWidget();
 protected:
 	KviFileSelector * m_pImageSelector;
 	QLabel          * m_pImageLabel;
@@ -108,12 +108,12 @@ protected slots:
 	void imageSelectionChanged(const QString & szImagePath);
 };
 
-class KviPackThemeSaveWidget : public QWizardPage
+class PackThemeSaveWidget : public QWizardPage
 {
 	Q_OBJECT
 public:
-	KviPackThemeSaveWidget(KviPackThemeDialog * pParent);
-	~KviPackThemeSaveWidget();
+	PackThemeSaveWidget(PackThemeDialog * pParent);
+	~PackThemeSaveWidget();
 protected:
 	KviFileSelector * m_pSavePathSelector;
 	QString           m_szPackagePath;
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/SaveThemeDialog.cpp
index 4e65b550c..388f7b163 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/SaveThemeDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : savethemedialog.cpp
+//   File : SaveThemeDialog.cpp
 //   Creation date : Wed 03 Jan 2007 03:01:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "savethemedialog.h"
-#include "themefunctions.h"
+#include "SaveThemeDialog.h"
+#include "ThemeFunctions.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -58,7 +58,7 @@
 
 
 
-KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
+SaveThemeDialog::SaveThemeDialog(QWidget * pParent)
 : KviTalWizard(pParent)
 {
 	setWindowTitle(__tr2qs_ctx("Save Current Theme - KVIrc","theme"));
@@ -177,11 +177,11 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
 	setFinishEnabled(pPage,true);
 }
 
-KviSaveThemeDialog::~KviSaveThemeDialog()
+SaveThemeDialog::~SaveThemeDialog()
 {
 }
 
-void KviSaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
+void SaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
 {
 	QImage pix(szImagePath);
 	if(!pix.isNull())
@@ -202,17 +202,17 @@ void KviSaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
 	m_pImageLabel->setPixmap(QPixmap());
 }
 
-void KviSaveThemeDialog::accept()
+void SaveThemeDialog::accept()
 {
 	if(!saveTheme())return;
 	KviTalWizard::accept();
 }
 
-void KviSaveThemeDialog::makeScreenshot()
+void SaveThemeDialog::makeScreenshot()
 {
 	QString szFileName;
 	g_pApp->getTmpFileName(szFileName,"screenshot.png");
-	if(!KviThemeFunctions::makeKVIrcScreenshot(szFileName))
+	if(!ThemeFunctions::makeKVIrcScreenshot(szFileName))
 	{
 		QMessageBox::critical(this,__tr2qs_ctx("Acquire Screenshot - KVIrc","theme"),__tr2qs_ctx("Failed to make screenshot","theme"),
 			QMessageBox::Ok,QMessageBox::NoButton,QMessageBox::NoButton);
@@ -222,7 +222,7 @@ void KviSaveThemeDialog::makeScreenshot()
 	imageSelectionChanged(szFileName);
 }
 
-bool KviSaveThemeDialog::saveTheme()
+bool SaveThemeDialog::saveTheme()
 {
 	m_pImageSelector->commit();
 
diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/SaveThemeDialog.h
index 0eceffe9a..f28347be7 100644
--- a/src/modules/theme/savethemedialog.h
+++ b/src/modules/theme/SaveThemeDialog.h
@@ -2,7 +2,7 @@
 #define _SAVETHEMEDIALOG_H_
 //=============================================================================
 //
-//   File : savethemedialog.h
+//   File : SaveThemeDialog.h
 //   Creation date : Wed 03 Jan 2007 03:01:34 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -38,12 +38,12 @@ class QTextEdit;
 class KviFileSelector;
 
 
-class KviSaveThemeDialog : public KviTalWizard
+class SaveThemeDialog : public KviTalWizard
 {
 	Q_OBJECT
 public:
-	KviSaveThemeDialog(QWidget * pParent);
-	virtual ~KviSaveThemeDialog();
+	SaveThemeDialog(QWidget * pParent);
+	virtual ~SaveThemeDialog();
 protected:
 	QString           m_szScreenshotPath;
 	KviFileSelector * m_pImageSelector;
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/ThemeFunctions.cpp
index ba7150b88..f1062cb94 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/ThemeFunctions.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : themefunctions.cpp
+//   File : ThemeFunctions.cpp
 //   Creation date : Wed 03 Jan 2007 03:14:07 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "themefunctions.h"
+#include "ThemeFunctions.h"
 
 #include "KviPackageReader.h"
 #include "KviLocale.h"
@@ -39,7 +39,7 @@
 //#include <qmime.h>
 
 
-namespace KviThemeFunctions
+namespace ThemeFunctions
 {
 
 	static bool notAValidThemePackage(QString &szError)
diff --git a/src/modules/theme/themefunctions.h b/src/modules/theme/ThemeFunctions.h
index 639e66107..08cf1b4b9 100644
--- a/src/modules/theme/themefunctions.h
+++ b/src/modules/theme/ThemeFunctions.h
@@ -2,7 +2,7 @@
 #define _THEMEFUNCTIONS_H_
 //=============================================================================
 //
-//   File : themefunctions.h
+//   File : ThemeFunctions.h
 //   Creation date : Wed 03 Jan 2007 03:14:07 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC Client distribution
@@ -31,7 +31,7 @@
 #include <QWidget>
 #include <QPixmap>
 
-namespace KviThemeFunctions
+namespace ThemeFunctions
 {
 	bool installThemePackage(const QString &szThemePackageFileName,QString &szError,QWidget * pDialogParent = 0);
 	void getThemeHtmlDescription(
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index f21979048..d17b3fe7f 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -23,7 +23,7 @@
 //=============================================================================
 
 #include "managementdialog.h"
-#include "themefunctions.h"
+#include "ThemeFunctions.h"
 
 #include "KviMessageBox.h"
 #include "KviModule.h"
@@ -70,7 +70,7 @@ static bool theme_kvs_cmd_install(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 
 	QString szError;
-	if(!KviThemeFunctions::installThemePackage(szThemePackFile,szError))
+	if(!ThemeFunctions::installThemePackage(szThemePackFile,szError))
 	{
 		c->error(__tr2qs_ctx("Error installing theme package: %Q","theme"),&szError);
 		return false;
@@ -245,7 +245,7 @@ static bool theme_kvs_cmd_screenshot(KviKvsModuleCommandCall * c)
 		szFileName+=".png";
 
 	QString szError;
-	if(!KviThemeFunctions::makeKVIrcScreenshot(szFileName))
+	if(!ThemeFunctions::makeKVIrcScreenshot(szFileName))
 	{
 		c->error(__tr2qs_ctx("Error making screenshot","theme")); // FIXME: a nicer error ?
 		return false;
@@ -273,7 +273,7 @@ static bool theme_kvs_cmd_screenshot(KviKvsModuleCommandCall * c)
 static bool theme_kvs_cmd_dialog(KviKvsModuleCommandCall *c)
 {
 
-	KviThemeManagementDialog::display(c->hasSwitch('t',"toplevel"));
+	ThemeManagementDialog::display(c->hasSwitch('t',"toplevel"));
 	return true;
 }
 
@@ -297,7 +297,7 @@ static bool theme_module_init(KviModule *m)
 
 static bool theme_module_cleanup(KviModule *m)
 {
-	KviThemeManagementDialog::cleanup();
+	ThemeManagementDialog::cleanup();
 
 	QString szBuf;
 	m->getDefaultConfigFileName(szBuf);
@@ -309,7 +309,7 @@ static bool theme_module_cleanup(KviModule *m)
 
 static bool theme_module_can_unload(KviModule *)
 {
-	return (!KviThemeManagementDialog::instance());
+	return (!ThemeManagementDialog::instance());
 }
 
 
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 6e9032bd9..5595cd19e 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -23,9 +23,9 @@
 //=============================================================================
 
 #include "managementdialog.h"
-#include "packthemedialog.h"
-#include "savethemedialog.h"
-#include "themefunctions.h"
+#include "PackThemeDialog.h"
+#include "SaveThemeDialog.h"
+#include "ThemeFunctions.h"
 
 #include "KviOptions.h"
 #include "KviLocale.h"
@@ -67,7 +67,7 @@
 extern QRect g_rectManagementDialogGeometry;
 
 
-KviThemeListWidgetItem::KviThemeListWidgetItem(KviTalListWidget * box,KviThemeInfo * inf)
+ThemeListWidgetItem::ThemeListWidgetItem(KviTalListWidget * box,KviThemeInfo * inf)
 : KviTalListWidgetItem(box)
 {
 	m_pThemeInfo = inf;
@@ -97,16 +97,16 @@ KviThemeListWidgetItem::KviThemeListWidgetItem(KviTalListWidget * box,KviThemeIn
 	setText(t);
 }
 
-KviThemeListWidgetItem::~KviThemeListWidgetItem()
+ThemeListWidgetItem::~ThemeListWidgetItem()
 {
 	delete m_pThemeInfo;
 
 }
 
-KviThemeManagementDialog * KviThemeManagementDialog::m_pInstance = 0;
+ThemeManagementDialog * ThemeManagementDialog::m_pInstance = 0;
 
 
-KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
+ThemeManagementDialog::ThemeManagementDialog(QWidget * parent)
 : QWidget(parent)
 {
 	m_pItemDelegate=0;
@@ -211,20 +211,20 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
 		g_rectManagementDialogGeometry.y());
 }
 
-KviThemeManagementDialog::~KviThemeManagementDialog()
+ThemeManagementDialog::~ThemeManagementDialog()
 {
 	if (m_pItemDelegate) delete m_pItemDelegate;
 	g_rectManagementDialogGeometry = QRect(pos().x(),pos().y(),size().width(),size().height());
 	m_pInstance = 0;
 }
 
-void KviThemeManagementDialog::closeClicked()
+void ThemeManagementDialog::closeClicked()
 {
 	delete this;
 	m_pInstance = 0;
 }
 
-void KviThemeManagementDialog::display(bool bTopLevel)
+void ThemeManagementDialog::display(bool bTopLevel)
 {
 	if(m_pInstance)
 	{
@@ -243,9 +243,9 @@ void KviThemeManagementDialog::display(bool bTopLevel)
 	} else {
 		if(bTopLevel)
 		{
-			m_pInstance = new KviThemeManagementDialog(0);
+			m_pInstance = new ThemeManagementDialog(0);
 		} else {
-			m_pInstance = new KviThemeManagementDialog(g_pFrame->splitter());
+			m_pInstance = new ThemeManagementDialog(g_pFrame->splitter());
 		}
 	}
 	m_pInstance->show();
@@ -253,28 +253,28 @@ void KviThemeManagementDialog::display(bool bTopLevel)
 	m_pInstance->setFocus();
 }
 
-void KviThemeManagementDialog::cleanup()
+void ThemeManagementDialog::cleanup()
 {
 	if(!m_pInstance)return;
 	delete m_pInstance;
 	m_pInstance = 0;
 }
 
-void KviThemeManagementDialog::packTheme()
+void ThemeManagementDialog::packTheme()
 {
 	KviPointerList<KviThemeInfo> dl;
 	dl.setAutoDelete(false);
 	QList<QListWidgetItem*> itemsSelected = m_pListWidget->selectedItems ();
 	for(int i=0;i<itemsSelected.count();i++)
-		dl.append(((KviThemeListWidgetItem *)itemsSelected.at(i))->themeInfo());
+		dl.append(((ThemeListWidgetItem *)itemsSelected.at(i))->themeInfo());
 	if(dl.isEmpty())return;
 
-	KviPackThemeDialog * pDialog = new KviPackThemeDialog(this,&dl);
+	PackThemeDialog * pDialog = new PackThemeDialog(this,&dl);
 	pDialog->exec();
 	delete pDialog;
 }
 
-void KviThemeManagementDialog::contextMenuRequested(const QPoint & pos)
+void ThemeManagementDialog::contextMenuRequested(const QPoint & pos)
 {
 	if(m_pListWidget->itemAt(pos)!=0)
 	{
@@ -286,15 +286,15 @@ void KviThemeManagementDialog::contextMenuRequested(const QPoint & pos)
 	}
 }
 
-void KviThemeManagementDialog::applyTheme ( QListWidgetItem * it)
+void ThemeManagementDialog::applyTheme ( QListWidgetItem * it)
 {
 	if(it)m_pListWidget->setCurrentItem(it);
 	applyCurrentTheme();
 }
 
-void KviThemeManagementDialog::applyCurrentTheme()
+void ThemeManagementDialog::applyCurrentTheme()
 {
-	KviThemeListWidgetItem * it = (KviThemeListWidgetItem *)m_pListWidget->currentItem();
+	ThemeListWidgetItem * it = (ThemeListWidgetItem *)m_pListWidget->currentItem();
 	if(!it)return;
 
 	if(KviMessageBox::yesNo(__tr2qs_ctx("Apply theme - KVIrc","theme"),
@@ -318,28 +318,28 @@ void KviThemeManagementDialog::applyCurrentTheme()
 	}
 }
 
-void KviThemeManagementDialog::deleteTheme()
+void ThemeManagementDialog::deleteTheme()
 {
 	QList<QListWidgetItem*> itemsSelected = m_pListWidget->selectedItems ();
 	for(int i=0;i<itemsSelected.count();i++)
 	{
 			if(!KviMessageBox::yesNo(__tr2qs_ctx("Delete Theme - KVIrc","theme"),
 				__tr2qs_ctx("Do you really wish to delete theme \"%Q\" (version %Q)?","theme"),
-					&(((KviThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->name()),&(((KviThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->version())))goto jump_out;
-			KviFileUtils::deleteDir(((KviThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->absoluteDirectory());
+					&(((ThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->name()),&(((ThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->version())))goto jump_out;
+			KviFileUtils::deleteDir(((ThemeListWidgetItem *)itemsSelected.at(i))->themeInfo()->absoluteDirectory());
 	}
 jump_out:
 	fillThemeBox();
 }
 
-void KviThemeManagementDialog::installFromFile()
+void ThemeManagementDialog::installFromFile()
 {
 	QString szFileName;
 	QString szError;
 
 	if(!KviFileDialog::askForOpenFileName(szFileName,__tr2qs_ctx("Open Theme - KVIrc","theme"),QString(),KVI_FILTER_THEME))
 		return;
-	if(!KviThemeFunctions::installThemePackage(szFileName,szError,this))
+	if(!ThemeFunctions::installThemePackage(szFileName,szError,this))
 	{
 		KviMessageBox::information(szError);
 		return;
@@ -347,21 +347,21 @@ void KviThemeManagementDialog::installFromFile()
 	fillThemeBox();
 }
 
-void KviThemeManagementDialog::getMoreThemes()
+void ThemeManagementDialog::getMoreThemes()
 {
 	if(!g_pFrame)return;
 	g_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_OPENURL_KVIRC_THEMES);
 }
 
-void KviThemeManagementDialog::saveCurrentTheme()
+void ThemeManagementDialog::saveCurrentTheme()
 {
-	KviSaveThemeDialog * pSaveThemeDialog = new KviSaveThemeDialog(this);
+	SaveThemeDialog * pSaveThemeDialog = new SaveThemeDialog(this);
 	pSaveThemeDialog->exec();
 	delete pSaveThemeDialog;
 	fillThemeBox();
 }
 
-void KviThemeManagementDialog::fillThemeBox(const QString &szDir)
+void ThemeManagementDialog::fillThemeBox(const QString &szDir)
 {
 	QDir d(szDir);
 
@@ -380,14 +380,14 @@ void KviThemeManagementDialog::fillThemeBox(const QString &szDir)
 		if(inf->loadFromDirectory(szTest))
 		{
 			inf->setSubdirectory(*it);
-			new KviThemeListWidgetItem(m_pListWidget,inf);
+			new ThemeListWidgetItem(m_pListWidget,inf);
 		} else {
 			delete inf;
 		}
 	}
 }
 
-void KviThemeManagementDialog::fillThemeBox()
+void ThemeManagementDialog::fillThemeBox()
 {
 	m_pListWidget->clear();
 
@@ -400,39 +400,39 @@ void KviThemeManagementDialog::fillThemeBox()
 	enableDisableButtons();
 }
 
-bool KviThemeManagementDialog::hasSelectedItems()
+bool ThemeManagementDialog::hasSelectedItems()
 {
 	QList<QListWidgetItem*> itemsSelected = m_pListWidget->selectedItems ();
 	return itemsSelected.count()?true:false;
 
 }
 
-void KviThemeManagementDialog::enableDisableButtons()
+void ThemeManagementDialog::enableDisableButtons()
 {
 	bool b = hasSelectedItems();
 	m_pPackThemeButton->setEnabled(b);
 	m_pDeleteThemeButton->setEnabled(b);
 }
 
-void KviThemeManagementDialog::closeEvent(QCloseEvent * e)
+void ThemeManagementDialog::closeEvent(QCloseEvent * e)
 {
 	e->ignore();
 	delete this;
 }
 
-void KviThemeManagementDialog::tipRequest(QListWidgetItem *,const QPoint &)
+void ThemeManagementDialog::tipRequest(QListWidgetItem *,const QPoint &)
 {
 	// FIXME
 	/*
-	//KviThemeListWidgetItem * it = (KviThemeListWidgetItem *)(m_pListWidget->itemAt(pnt));
+	//ThemeListWidgetItem * it = (ThemeListWidgetItem *)(m_pListWidget->itemAt(pnt));
 
 	//if(!it)return;
 
-	KviThemeInfo * pThemeInfo = ((KviThemeListWidgetItem *)it)->themeInfo();
+	KviThemeInfo * pThemeInfo = ((ThemeListWidgetItem *)it)->themeInfo();
 
 	QString szThemeDescription;
 
-	KviThemeFunctions::getThemeHtmlDescription(
+	ThemeFunctions::getThemeHtmlDescription(
 		szThemeDescription,
 		pThemeInfo->name(),
 		pThemeInfo->version(),
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index be5995c3c..beed4ade9 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -45,11 +45,11 @@ class QLabel;
 class KviDynamicToolTip;
 
 
-class KviThemeListWidgetItem : public KviTalListWidgetItem
+class ThemeListWidgetItem : public KviTalListWidgetItem
 {
 public:
-	KviThemeListWidgetItem(KviTalListWidget * box,KviThemeInfo * inf);
-	virtual ~KviThemeListWidgetItem();
+	ThemeListWidgetItem(KviTalListWidget * box,KviThemeInfo * inf);
+	virtual ~ThemeListWidgetItem();
 public:
 	KviThemeInfo   * m_pThemeInfo;
 public:
@@ -57,21 +57,21 @@ public:
 };
 
 
-class KviThemeManagementDialog : public QWidget
+class ThemeManagementDialog : public QWidget
 {
 	Q_OBJECT
 public:
-	KviThemeManagementDialog(QWidget * parent);
-	virtual ~KviThemeManagementDialog();
+	ThemeManagementDialog(QWidget * parent);
+	virtual ~ThemeManagementDialog();
 protected:
-	static KviThemeManagementDialog   * m_pInstance;
+	static ThemeManagementDialog   * m_pInstance;
 	KviTalIconAndRichTextItemDelegate * m_pItemDelegate;
 	KviTalListWidget    * m_pListWidget;
 	KviTalPopupMenu     * m_pContextPopup;
 	QToolButton         * m_pDeleteThemeButton;
 	QToolButton         * m_pPackThemeButton;
 public:
-	static KviThemeManagementDialog * instance(){ return m_pInstance; };
+	static ThemeManagementDialog * instance(){ return m_pInstance; };
 	static void display(bool bTopLevel);
 	static void cleanup();
 protected:
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index de16255d3..d5e39744d 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -37,9 +37,9 @@
 #include <QDesktopWidget>
 #include <QCloseEvent>
 
-KviTipWindow * g_pTipWindow = 0;
+TipWindow * g_pTipWindow = 0;
 
-KviTipFrame::KviTipFrame(QWidget * par)
+TipFrame::TipFrame(QWidget * par)
 : QFrame(par)
 {
 	QString buffer;
@@ -60,11 +60,11 @@ KviTipFrame::KviTipFrame(QWidget * par)
 	setLayout(layout);
 }
 
-KviTipFrame::~KviTipFrame()
+TipFrame::~TipFrame()
 {
 }
 
-void KviTipFrame::setText(const QString &text)
+void TipFrame::setText(const QString &text)
 {
 	QString szText= "<center>";
 	szText += text;
@@ -73,12 +73,12 @@ void KviTipFrame::setText(const QString &text)
 	update();
 }
 
-KviTipWindow::KviTipWindow()
+TipWindow::TipWindow()
 {
 	setObjectName("kvirc_tip_window");
 	m_pConfig = 0;
 
-	m_pTipFrame = new KviTipFrame(this);
+	m_pTipFrame = new TipFrame(this);
 	QPushButton * pb = new QPushButton("<<",this);
 	connect(pb,SIGNAL(clicked()),this,SLOT(prevTip()));
 
@@ -108,19 +108,19 @@ KviTipWindow::KviTipWindow()
 
 }
 
-KviTipWindow::~KviTipWindow()
+TipWindow::~TipWindow()
 {
 	KVI_OPTION_BOOL(KviOption_boolShowTipAtStartup) = m_pShowAtStartupCheck->isChecked();
 	if(m_pConfig)closeConfig();
 }
 
-void KviTipWindow::showEvent(QShowEvent *)
+void TipWindow::showEvent(QShowEvent *)
 {
 	QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
 	move((rect.width() - width())/2,(rect.height() - height())/2);
 }
 
-bool KviTipWindow::openConfig(QString filename,bool bEnsureExists)
+bool TipWindow::openConfig(QString filename,bool bEnsureExists)
 {
 	if(m_pConfig)closeConfig();
 
@@ -140,7 +140,7 @@ bool KviTipWindow::openConfig(QString filename,bool bEnsureExists)
 	return true;
 }
 
-void KviTipWindow::closeConfig()
+void TipWindow::closeConfig()
 {
 	QString buffer;
 	g_pApp->getLocalKvircDirectory(buffer,KviApplication::ConfigPlugins,m_szConfigFileName);
@@ -149,7 +149,7 @@ void KviTipWindow::closeConfig()
 	m_pConfig = 0;
 }
 
-void KviTipWindow::nextTip()
+void TipWindow::nextTip()
 {
 	if(!m_pConfig)
 	{
@@ -185,7 +185,7 @@ void KviTipWindow::nextTip()
 	m_pTipFrame->setText(szTip);
 }
 
-void KviTipWindow::prevTip()
+void TipWindow::prevTip()
 {
 	if(!m_pConfig)
 	{
@@ -222,7 +222,7 @@ void KviTipWindow::prevTip()
 	m_pTipFrame->setText(szTip);
 }
 
-void KviTipWindow::closeEvent(QCloseEvent *e)
+void TipWindow::closeEvent(QCloseEvent *e)
 {
 	e->ignore();
 	delete this;
@@ -257,7 +257,7 @@ static bool tip_kvs_cmd_open(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("filename",KVS_PT_STRING,KVS_PF_OPTIONAL,szTipfilename)
 	KVSM_PARAMETERS_END(c)
 
-	if(!g_pTipWindow)g_pTipWindow = new KviTipWindow();
+	if(!g_pTipWindow)g_pTipWindow = new TipWindow();
 	if (!szTipfilename.isEmpty())
 		g_pTipWindow->openConfig(szTipfilename);
 	g_pTipWindow->nextTip();
diff --git a/src/modules/tip/libkvitip.h b/src/modules/tip/libkvitip.h
index 93a0dc302..ebb7ac507 100644
--- a/src/modules/tip/libkvitip.h
+++ b/src/modules/tip/libkvitip.h
@@ -32,12 +32,12 @@
 #include <QLabel>
 #include <QCheckBox>
 
-class KviTipFrame : public QFrame
+class TipFrame : public QFrame
 {
 	Q_OBJECT
 public:
-	KviTipFrame(QWidget * par);
-	~KviTipFrame();
+	TipFrame(QWidget * par);
+	~TipFrame();
 private:
 	QLabel *m_pLabel1;
 	QLabel *m_pLabel2;
@@ -45,14 +45,14 @@ public:
 	void setText(const QString &text);
 };
 
-class KviTipWindow : public QWidget
+class TipWindow : public QWidget
 {
 	Q_OBJECT
 public:
-	KviTipWindow();
-	~KviTipWindow();
+	TipWindow();
+	~TipWindow();
 protected:
-	KviTipFrame * m_pTipFrame;
+	TipFrame * m_pTipFrame;
 	QCheckBox   * m_pShowAtStartupCheck;
 	KviConfigurationFile   * m_pConfig;
 	QString        m_szConfigFileName; // no path!
diff --git a/src/modules/toolbareditor/CMakeLists.txt b/src/modules/toolbareditor/CMakeLists.txt
index be501833f..b1d126ecf 100644
--- a/src/modules/toolbareditor/CMakeLists.txt
+++ b/src/modules/toolbareditor/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/toolbareditor
 
 SET(kvitoolbareditor_MOC_HDRS
-	toolbareditor.h
+	CustomizeToolBarsDialog.h
 )
 
 SET(kvitoolbareditor_SRCS
 	libkvitoolbareditor.cpp
-	toolbareditor.cpp
+	CustomizeToolBarsDialog.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
index 4307dbd53..f4cb97608 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : toolbareditor.cpp
+//   File : CustomizeToolBarsDialog.cpp
 //   Creation date : Wed 01 Dec 2004 14:42:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "toolbareditor.h"
+#include "CustomizeToolBarsDialog.h"
 
 #include "KviApplication.h"
 #include "KviActionDrawer.h"
@@ -54,12 +54,12 @@
 #include <QDropEvent>
 #include <QDesktopWidget>
 
-KviCustomizeToolBarsDialog * KviCustomizeToolBarsDialog::m_pInstance = 0;
+CustomizeToolBarsDialog * CustomizeToolBarsDialog::m_pInstance = 0;
 extern QRect g_rectToolBarEditorDialogGeometry;
 
 
 
-KviTrashcanLabel::KviTrashcanLabel(QWidget * p)
+TrashcanLabel::TrashcanLabel(QWidget * p)
 : QLabel(p)
 {
 	setPixmap(*(g_pIconManager->getBigIcon("kvi_bigicon_trashcan.png")));
@@ -75,7 +75,7 @@ KviTrashcanLabel::KviTrashcanLabel(QWidget * p)
 	connect(KviActionManager::instance(),SIGNAL(removeActionsHintRequest()),this,SLOT(flash()));
 }
 
-KviTrashcanLabel::~KviTrashcanLabel()
+TrashcanLabel::~TrashcanLabel()
 {
 	if(m_pFlashTimer)
 	{
@@ -84,7 +84,7 @@ KviTrashcanLabel::~KviTrashcanLabel()
 	}
 }
 
-void KviTrashcanLabel::flash()
+void TrashcanLabel::flash()
 {
 	m_uFlashCount = 0;
 	if(m_pFlashTimer)return;
@@ -93,7 +93,7 @@ void KviTrashcanLabel::flash()
 	m_pFlashTimer->start(200);
 }
 
-void KviTrashcanLabel::heartbeat()
+void TrashcanLabel::heartbeat()
 {
 	m_uFlashCount++;
 	if(m_uFlashCount % 2){
@@ -115,18 +115,18 @@ void KviTrashcanLabel::heartbeat()
 	}
 }
 
-void KviTrashcanLabel::dropEvent(QDropEvent * e)
+void TrashcanLabel::dropEvent(QDropEvent * e)
 {
 	if(e->mimeData()->hasText()) e->acceptProposedAction();
 }
 
-void KviTrashcanLabel::dragEnterEvent(QDragEnterEvent * e)
+void TrashcanLabel::dragEnterEvent(QDragEnterEvent * e)
 {
 	if(e->mimeData()->hasText()) e->acceptProposedAction();
 }
 
 
-KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId,const QString &szLabel,const QString &szIconId)
+CustomToolBarPropertiesDialog::CustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId,const QString &szLabel,const QString &szIconId)
 : QDialog(p)
 {
 	m_szId = szId;
@@ -200,11 +200,11 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c
 	g->setColumnStretch(2,1);
 }
 
-KviCustomToolBarPropertiesDialog::~KviCustomToolBarPropertiesDialog()
+CustomToolBarPropertiesDialog::~CustomToolBarPropertiesDialog()
 {
 }
 
-void KviCustomToolBarPropertiesDialog::iconSelected(const QString &szIconId)
+void CustomToolBarPropertiesDialog::iconSelected(const QString &szIconId)
 {
 	QPixmap * pix = g_pIconManager->getImage(szIconId);
 
@@ -220,7 +220,7 @@ void KviCustomToolBarPropertiesDialog::iconSelected(const QString &szIconId)
 	}
 }
 
-void KviCustomToolBarPropertiesDialog::iconButtonClicked()
+void CustomToolBarPropertiesDialog::iconButtonClicked()
 {
 	KviImageDialog * dlg = new KviImageDialog(this,__tr2qs_ctx("Please choose the icon for the ToolBar","editor"));
 	if(dlg->exec() != QDialog::Accepted)
@@ -233,7 +233,7 @@ void KviCustomToolBarPropertiesDialog::iconButtonClicked()
 	iconSelected(s);
 }
 
-void KviCustomToolBarPropertiesDialog::labelTextChanged(const QString &s)
+void CustomToolBarPropertiesDialog::labelTextChanged(const QString &s)
 {
 	if(m_szOriginalId.isEmpty())
 	{
@@ -242,7 +242,7 @@ void KviCustomToolBarPropertiesDialog::labelTextChanged(const QString &s)
 	}
 }
 
-void KviCustomToolBarPropertiesDialog::okClicked()
+void CustomToolBarPropertiesDialog::okClicked()
 {
 	if(m_szLabel.isEmpty())
 	{
@@ -273,7 +273,7 @@ void KviCustomToolBarPropertiesDialog::okClicked()
 	accept();
 }
 
-void KviCustomToolBarPropertiesDialog::advancedClicked()
+void CustomToolBarPropertiesDialog::advancedClicked()
 {
 	if(m_pAdvanced->isVisible())
 	{
@@ -287,7 +287,7 @@ void KviCustomToolBarPropertiesDialog::advancedClicked()
 }
 
 
-KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(QWidget * p)
+CustomizeToolBarsDialog::CustomizeToolBarsDialog(QWidget * p)
 : QWidget(p)
 {
 	setObjectName("Toolbar_editor");
@@ -320,7 +320,7 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(QWidget * p)
 	connect(m_pExportToolBarButton,SIGNAL(clicked()),this,SLOT(exportToolBar()));
 	g->addWidget(m_pExportToolBarButton,4,1);
 
-	KviTrashcanLabel * t = new KviTrashcanLabel(this);
+	TrashcanLabel * t = new TrashcanLabel(this);
 	g->addWidget(t,6,1);
 
 	b = new QPushButton(__tr2qs_ctx("Close","editor"),this);
@@ -348,7 +348,7 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(QWidget * p)
 		g_rectToolBarEditorDialogGeometry.y());
 }
 
-KviCustomizeToolBarsDialog::~KviCustomizeToolBarsDialog()
+CustomizeToolBarsDialog::~CustomizeToolBarsDialog()
 {
 	g_rectToolBarEditorDialogGeometry = QRect(pos().x(),pos().y(),size().width(),size().height());
 
@@ -356,13 +356,13 @@ KviCustomizeToolBarsDialog::~KviCustomizeToolBarsDialog()
 	m_pInstance = 0;
 }
 
-void KviCustomizeToolBarsDialog::currentToolBarChanged()
+void CustomizeToolBarsDialog::currentToolBarChanged()
 {
 	m_pDeleteToolBarButton->setEnabled(KviActionManager::instance()->currentToolBar());
 	m_pRenameToolBarButton->setEnabled(KviActionManager::instance()->currentToolBar());
 }
 
-void KviCustomizeToolBarsDialog::showEvent(QShowEvent * e)
+void CustomizeToolBarsDialog::showEvent(QShowEvent * e)
 {
 	QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
 	move((rect.width() - width())/2,(rect.height() - height())/2);
@@ -370,7 +370,7 @@ void KviCustomizeToolBarsDialog::showEvent(QShowEvent * e)
 	QWidget::showEvent(e);
 }
 
-void KviCustomizeToolBarsDialog::deleteToolBar()
+void CustomizeToolBarsDialog::deleteToolBar()
 {
 	KviCustomToolBar * t = KviActionManager::currentToolBar();
 	if(!t)return;
@@ -382,7 +382,7 @@ void KviCustomizeToolBarsDialog::deleteToolBar()
 	KviCustomToolBarManager::instance()->destroyDescriptor(t->descriptor()->id());
 }
 
-void KviCustomizeToolBarsDialog::exportToolBar()
+void CustomizeToolBarsDialog::exportToolBar()
 {
 	KviCustomToolBar * t = KviActionManager::currentToolBar();
 	if(!t)return;
@@ -460,12 +460,12 @@ void KviCustomizeToolBarsDialog::exportToolBar()
 	}
 }
 
-void KviCustomizeToolBarsDialog::renameToolBar()
+void CustomizeToolBarsDialog::renameToolBar()
 {
 	KviCustomToolBar * t = KviActionManager::currentToolBar();
 	if(!t)return;
 
-	KviCustomToolBarPropertiesDialog * dlg = new KviCustomToolBarPropertiesDialog(this,
+	CustomToolBarPropertiesDialog * dlg = new CustomToolBarPropertiesDialog(this,
 		__tr2qs_ctx("Please specify the properties for the toolbar \"%1\"","editor").arg(t->windowTitle()),
 		t->descriptor()->id(),
 		t->descriptor()->labelCode(),
@@ -489,9 +489,9 @@ void KviCustomizeToolBarsDialog::renameToolBar()
 	t->descriptor()->setIconId(icon);
 }
 
-void KviCustomizeToolBarsDialog::newToolBar()
+void CustomizeToolBarsDialog::newToolBar()
 {
-	KviCustomToolBarPropertiesDialog * dlg = new KviCustomToolBarPropertiesDialog(this,
+	CustomToolBarPropertiesDialog * dlg = new CustomToolBarPropertiesDialog(this,
 		__tr2qs_ctx("Please specify the properties for the new toolbar","editor"),
 		KviCustomToolBarManager::instance()->idForNewToolBar(__tr2qs_ctx("My ToolBar","editor")),
 		__tr2qs_ctx("My ToolBar","editor"));
@@ -514,19 +514,19 @@ void KviCustomizeToolBarsDialog::newToolBar()
 	KviActionManager::instance()->setCurrentToolBar(t);
 }
 
-void KviCustomizeToolBarsDialog::closeClicked()
+void CustomizeToolBarsDialog::closeClicked()
 {
 	delete this;
 }
 
-void KviCustomizeToolBarsDialog::cleanup()
+void CustomizeToolBarsDialog::cleanup()
 {
 	if(!m_pInstance)return;
 	delete m_pInstance;
 	m_pInstance = 0;
 }
 
-void KviCustomizeToolBarsDialog::display(bool bTopLevel)
+void CustomizeToolBarsDialog::display(bool bTopLevel)
 {
 	if(m_pInstance)
 	{
@@ -545,9 +545,9 @@ void KviCustomizeToolBarsDialog::display(bool bTopLevel)
 	} else {
 		if(bTopLevel)
 		{
-			m_pInstance = new KviCustomizeToolBarsDialog(0);
+			m_pInstance = new CustomizeToolBarsDialog(0);
 		} else {
-			m_pInstance = new KviCustomizeToolBarsDialog(g_pFrame->splitter());
+			m_pInstance = new CustomizeToolBarsDialog(g_pFrame->splitter());
 		}
 	}
 	m_pInstance->show();
@@ -555,13 +555,13 @@ void KviCustomizeToolBarsDialog::display(bool bTopLevel)
 	m_pInstance->setFocus();
 }
 
-void KviCustomizeToolBarsDialog::closeEvent(QCloseEvent * e)
+void CustomizeToolBarsDialog::closeEvent(QCloseEvent * e)
 {
 	e->ignore();
 	delete this;
 }
 
-void KviCustomizeToolBarsDialog::reject()
+void CustomizeToolBarsDialog::reject()
 {
 	cleanup();
 }
diff --git a/src/modules/toolbareditor/toolbareditor.h b/src/modules/toolbareditor/CustomizeToolBarsDialog.h
index 70e5a71b9..71a49f92d 100644
--- a/src/modules/toolbareditor/toolbareditor.h
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.h
@@ -2,7 +2,7 @@
 #define _TOOLBAREDITOR_H_
 //=============================================================================
 //
-//   File : toolbareditor.h
+//   File : CustomizeToolBarsDialog.h
 //   Creation date : Wed 01 Dec 2004 14:42:20 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -39,21 +39,21 @@ class QPushButton;
 class KviActionDrawer;
 
 
-class KviCustomizeToolBarsDialog : public QWidget
+class CustomizeToolBarsDialog : public QWidget
 {
 	Q_OBJECT
 protected:
-	KviCustomizeToolBarsDialog(QWidget * p);
+	CustomizeToolBarsDialog(QWidget * p);
 public:
-	~KviCustomizeToolBarsDialog();
+	~CustomizeToolBarsDialog();
 protected:
 	KviActionDrawer * m_pDrawer;
-	static KviCustomizeToolBarsDialog * m_pInstance;
+	static CustomizeToolBarsDialog * m_pInstance;
 	QPushButton * m_pDeleteToolBarButton;
 	QPushButton * m_pRenameToolBarButton;
 	QPushButton * m_pExportToolBarButton;
 public:
-	static KviCustomizeToolBarsDialog * instance(){ return m_pInstance; };
+	static CustomizeToolBarsDialog * instance(){ return m_pInstance; };
 	static void display(bool bTopLevel);
 	static void cleanup();
 protected:
@@ -70,12 +70,12 @@ protected slots:
 };
 
 
-class KviCustomToolBarPropertiesDialog : public QDialog
+class CustomToolBarPropertiesDialog : public QDialog
 {
 	Q_OBJECT
 public:
-	KviCustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId = QString(),const QString &szLabel = QString(),const QString &szIconId = QString());
-	~KviCustomToolBarPropertiesDialog();
+	CustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId = QString(),const QString &szLabel = QString(),const QString &szIconId = QString());
+	~CustomToolBarPropertiesDialog();
 protected:
 	QString m_szId;
 	QString m_szOriginalId;
@@ -101,12 +101,12 @@ protected:
 };
 
 
-class KviTrashcanLabel : public QLabel
+class TrashcanLabel : public QLabel
 {
 	Q_OBJECT
 public:
-	KviTrashcanLabel(QWidget * p);
-	virtual ~KviTrashcanLabel();
+	TrashcanLabel(QWidget * p);
+	virtual ~TrashcanLabel();
 protected:
 	unsigned int m_uFlashCount;
 	QTimer * m_pFlashTimer;
diff --git a/src/modules/toolbareditor/libkvitoolbareditor.cpp b/src/modules/toolbareditor/libkvitoolbareditor.cpp
index 7d49596cb..935467e08 100644
--- a/src/modules/toolbareditor/libkvitoolbareditor.cpp
+++ b/src/modules/toolbareditor/libkvitoolbareditor.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "toolbareditor.h"
+#include "CustomizeToolBarsDialog.h"
 
 #include "KviModule.h"
 #include "KviLocale.h"
@@ -52,7 +52,7 @@ QRect g_rectToolBarEditorDialogGeometry(0,0,0,0);
 
 static bool toolbareditor_kvs_cmd_open(KviKvsModuleCommandCall *c)
 {
-	KviCustomizeToolBarsDialog::display(c->hasSwitch('t',"toplevel"));
+	CustomizeToolBarsDialog::display(c->hasSwitch('t',"toplevel"));
 	return true;
 }
 
@@ -69,12 +69,12 @@ static bool toolbareditor_module_init(KviModule * m)
 
 static bool toolbareditor_module_can_unload(KviModule *)
 {
-	return (!KviCustomizeToolBarsDialog::instance());
+	return (!CustomizeToolBarsDialog::instance());
 }
 
 static bool toolbareditor_module_cleanup(KviModule *m)
 {
-	KviCustomizeToolBarsDialog::cleanup();
+	CustomizeToolBarsDialog::cleanup();
 
 	QString szBuf;
 	m->getDefaultConfigFileName(szBuf);
diff --git a/src/modules/torrent/CMakeLists.txt b/src/modules/torrent/CMakeLists.txt
index 9a7df3f3e..4082656c5 100644
--- a/src/modules/torrent/CMakeLists.txt
+++ b/src/modules/torrent/CMakeLists.txt
@@ -1,15 +1,15 @@
 # CMakeLists for src/modules/torrent
 
 SET(kvitorrent_MOC_HDRS
-	tc_ktorrentdbusinterface.h
-	tc_statusbarapplet.h
+	KTorrentDbusInterface.h
+	StatusBarApplet.h
 )
 
 SET(kvitorrent_SRCS
 	libkvitorrent.cpp
-	tc_statusbarapplet.cpp
-	tc_ktorrentdbusinterface.cpp
-	tc_interface.cpp
+	StatusBarApplet.cpp
+	KTorrentDbusInterface.cpp
+	TorrentInterface.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/torrent/tc_ktorrentdbusinterface.cpp b/src/modules/torrent/KTorrentDbusInterface.cpp
index 9dabb12b9..71a20e822 100644
--- a/src/modules/torrent/tc_ktorrentdbusinterface.cpp
+++ b/src/modules/torrent/KTorrentDbusInterface.cpp
@@ -2,7 +2,7 @@
 //
 //   DBus interface for KTorrent client.
 //
-//   File : tc_ktorrentdbusinterface.h
+//   File : KTorrentDbusInterface.h
 //   Creation date : Mod Nov 17 13:46:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //
 //=============================================================================
 
-#include "tc_ktorrentdbusinterface.h"
+#include "KTorrentDbusInterface.h"
 
 #ifdef COMPILE_KDE_SUPPORT
 
@@ -34,7 +34,7 @@
 	#include <QTimer>
 
 	TORR_IMPLEMENT_DESCRIPTOR(
-		KviKTorrentDBusInterface,
+		KTorrentDbusInterface,
 		"ktorrentdbus",
 		__tr2qs_ctx(
 			"An interface to KDE's excellent KTorrent client.\n" \
@@ -43,9 +43,9 @@
 		)
 	)
 
-	KviKTorrentDBusInterface::KviKTorrentDBusInterface()
+	KTorrentDbusInterface::KTorrentDbusInterface()
 	{
-// 		printf("KviKTorrentDBusInterface\n");
+// 		printf("KTorrentDbusInterface\n");
 
 // 		QTimer *timer = new QTimer(this);
 // 		connect(timer, SIGNAL(timeout()), this, SLOT(slotTimer()));
@@ -58,12 +58,12 @@
 
 	}
 
-	KviKTorrentDBusInterface::~KviKTorrentDBusInterface()
+	KTorrentDbusInterface::~KTorrentDbusInterface()
 	{
-// 		printf("~KviKTorrentDBusInterface\n");
+// 		printf("~KTorrentDbusInterface\n");
 	}
 
-	bool KviKTorrentDBusInterface::findRunningApp()
+	bool KTorrentDbusInterface::findRunningApp()
 	{
 		QDBusReply<QStringList> reply = QDBusConnection::sessionBus().interface()->registeredServiceNames();
 		if (!reply.isValid())		/* something fishy with dbus, it won't work */
@@ -76,7 +76,7 @@
 		return false;	/* dbus works, ktorrent may be closed */
 	}
 
-	int KviKTorrentDBusInterface::detect()
+	int KTorrentDbusInterface::detect()
 	{
 		QDBusReply<QStringList> reply = QDBusConnection::sessionBus().interface()->registeredServiceNames();
 		if (!reply.isValid())		/* something fishy with dbus, it won't work */
@@ -100,20 +100,20 @@
 	} \
 	return TRUE;
 
-	bool KviKTorrentDBusInterface::startAll()
+	bool KTorrentDbusInterface::startAll()
 	{
 		KTDBUS_SIMPLE_CALL("startAll");
 		return true;
 	}
 
-	bool KviKTorrentDBusInterface::stopAll()
+	bool KTorrentDbusInterface::stopAll()
 	{
 		KTDBUS_SIMPLE_CALL("stopAll");
 		return true;
 	}
 
 /*
-	void KviKTorrentDBusInterface::slotTimer()
+	void KTorrentDbusInterface::slotTimer()
 	{
 		if (!findRunningApp())
 			return;
@@ -168,7 +168,7 @@
 		return true;
 	}
 */
-	bool KviKTorrentDBusInterface::start(int )
+	bool KTorrentDbusInterface::start(int )
 	{
 /*
 		CHECK_RANGE_BOOL(i, m_ti.size())
@@ -180,7 +180,7 @@
 		return true;
 	}
 
-	bool KviKTorrentDBusInterface::stop(int )
+	bool KTorrentDbusInterface::stop(int )
 	{
 /*
 		CHECK_RANGE_BOOL(i, m_ti.size())
@@ -192,7 +192,7 @@
 		return true;
 	}
 
-	bool KviKTorrentDBusInterface::announce(int )
+	bool KTorrentDbusInterface::announce(int )
 	{
 /*
 		CHECK_RANGE_BOOL(i, m_ti.size())
@@ -204,7 +204,7 @@
 		return true;
 	}
 
-	QString KviKTorrentDBusInterface::state(int )
+	QString KTorrentDbusInterface::state(int )
 	{
 /*
 		CHECK_RANGE_STRING(i, m_ti.size())
@@ -214,7 +214,7 @@
 	return QString();
 	}
 
-	QString KviKTorrentDBusInterface::name(int )
+	QString KTorrentDbusInterface::name(int )
 	{
 	/*
 		CHECK_RANGE_STRING(i, m_ti.size())
@@ -224,7 +224,7 @@
 	return QString();
 	}
 
-	int KviKTorrentDBusInterface::fileCount(int )
+	int KTorrentDbusInterface::fileCount(int )
 	{
 	/*
 		CHECK_RANGE_INT(i, m_ti.size())
@@ -238,7 +238,7 @@
 	return 0;
 	}
 
-	QString KviKTorrentDBusInterface::fileName(int, int )
+	QString KTorrentDbusInterface::fileName(int, int )
 	{
 	/*
 		CHECK_RANGE_STRING(i, m_ti.size())
@@ -254,7 +254,7 @@
 	return QString();
 	}
 
-	QString KviKTorrentDBusInterface::filePriority(int, int )
+	QString KTorrentDbusInterface::filePriority(int, int )
 	{
 	/*
 		CHECK_RANGE_STRING(i, m_ti.size())
@@ -278,7 +278,7 @@
 	return QString();
 	}
 
-	bool KviKTorrentDBusInterface::setFilePriority(int, int, const QString &)
+	bool KTorrentDbusInterface::setFilePriority(int, int, const QString &)
 	{
 	/*
 		CHECK_RANGE_BOOL(i, m_ti.size())
@@ -301,13 +301,13 @@
 		return true;
 	}
 
-	int KviKTorrentDBusInterface::count()
+	int KTorrentDbusInterface::count()
 	{
 		return 0;
 // 		return m_ti.size();
 	}
 
-	float KviKTorrentDBusInterface::speedUp()
+	float KTorrentDbusInterface::speedUp()
 	{
 	/*
 		KviQCStringList ret;
@@ -328,7 +328,7 @@
 	return 0.0;
 	}
 
-	float KviKTorrentDBusInterface::speedDown()
+	float KTorrentDbusInterface::speedDown()
 	{
 	/*
 		KviQCStringList ret;
@@ -349,7 +349,7 @@
 	return 0.0;
 	}
 
-	float KviKTorrentDBusInterface::trafficUp()
+	float KTorrentDbusInterface::trafficUp()
 	{
 	/*
 		KviQCStringList ret;
@@ -369,7 +369,7 @@
 	return 0.0;
 	}
 
-	float KviKTorrentDBusInterface::trafficDown()
+	float KTorrentDbusInterface::trafficDown()
 	{
 	/*
 		KviQCStringList ret;
@@ -389,7 +389,7 @@
 	return 0.0;
 	}
 /*
-	bool KviKTorrentDBusInterface::makeTorrentInfo(TorrentInfo &ti, const KviQCStringList &ret)
+	bool KTorrentDbusInterface::makeTorrentInfo(TorrentInfo &ti, const KviQCStringList &ret)
 	{
 		if (ret.size() != 10)
 			ERROR_RET_BOOL
@@ -452,7 +452,7 @@
 		return true;
 	}
 */
-	int KviKTorrentDBusInterface::maxUploadSpeed()
+	int KTorrentDbusInterface::maxUploadSpeed()
 	{
 	/*
 		int ret;
@@ -466,7 +466,7 @@
 	return -1;
 	}
 
-	int KviKTorrentDBusInterface::maxDownloadSpeed()
+	int KTorrentDbusInterface::maxDownloadSpeed()
 	{
 	/*
 		int ret;
@@ -480,7 +480,7 @@
 	return -1;
 	}
 
-	bool KviKTorrentDBusInterface::setMaxUploadSpeed(int )
+	bool KTorrentDbusInterface::setMaxUploadSpeed(int )
 	{
 	/*
 		if (!voidRetIntDCOPCall("KTorrent", "setMaxUploadSpeed(int)", kbytes_per_sec))
@@ -489,7 +489,7 @@
 		return true;
 	}
 
-	bool KviKTorrentDBusInterface::setMaxDownloadSpeed(int )
+	bool KTorrentDbusInterface::setMaxDownloadSpeed(int )
 	{
 	/*
 		if (!voidRetIntDCOPCall("KTorrent", "setMaxDownloadSpeed(int)", kbytes_per_sec))
@@ -499,7 +499,7 @@
 	}
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "tc_ktorrentdbusinterface.moc"
+#include "KTorrentDbusInterface.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif //	COMPILE_KDE_SUPPORT
diff --git a/src/modules/torrent/tc_ktorrentdbusinterface.h b/src/modules/torrent/KTorrentDbusInterface.h
index ace1b2417..cda4d3640 100644
--- a/src/modules/torrent/tc_ktorrentdbusinterface.h
+++ b/src/modules/torrent/KTorrentDbusInterface.h
@@ -5,7 +5,7 @@
 //
 //   DBus interface for KTorrent client.
 //
-//   File : tc_ktorrentdbusinterface.h
+//   File : KTorrentDbusInterface.h
 //   Creation date : Mod Nov 17 13:46:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -28,19 +28,19 @@
 //=============================================================================
 
 
-#include "tc_interface.h"
+#include "TorrentInterface.h"
 
 #ifdef COMPILE_KDE_SUPPORT
 
 	#include <QtDBus/QtDBus>
 
-	class KviKTorrentDBusInterface : public KviTorrentInterface
+	class KTorrentDbusInterface : public TorrentInterface
 	{
 		Q_OBJECT
 
 	public:
-		KviKTorrentDBusInterface();
-		virtual ~KviKTorrentDBusInterface();
+		KTorrentDbusInterface();
+		virtual ~KTorrentDbusInterface();
 
 		virtual int detect();
 
@@ -113,7 +113,7 @@
 		bool findRunningApp();
 	};
 
-	TORR_DECLARE_DESCRIPTOR(KviKTorrentDBusInterface)
+	TORR_DECLARE_DESCRIPTOR(KTorrentDbusInterface)
 
 #endif // COMPILE_KDE_SUPPORT
 
diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/StatusBarApplet.cpp
index 77527dece..a464cd8be 100644
--- a/src/modules/torrent/tc_statusbarapplet.cpp
+++ b/src/modules/torrent/StatusBarApplet.cpp
@@ -2,7 +2,7 @@
 //
 //   StatuBar for Torrent client.
 //
-//   File : tc_statusbarapplet.cpp
+//   File : StatusBarApplet.cpp
 //   Creation date : Fri Jan 1 15:42:25 2007 GMT by Alexander Stillich
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,15 +24,15 @@
 //
 //=============================================================================
 
-#include "tc_interface.h"
-#include "tc_statusbarapplet.h"
+#include "TorrentInterface.h"
+#include "StatusBarApplet.h"
 
 #include "KviLocale.h"
 #include "KviIconManager.h"
 
 #include "QTimer"
 
-KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *parent, KviStatusBarAppletDescriptor *desc)
+StatusBarApplet::StatusBarApplet(KviStatusBar *parent, KviStatusBarAppletDescriptor *desc)
 	: KviStatusBarApplet(parent, desc)
 {
 	QTimer *timer = new QTimer(this);
@@ -44,18 +44,18 @@ KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *parent, KviSt
 	setText(__tr2qs_ctx("Torrent Client","torrent"));
 }
 
-KviTorrentStatusBarApplet::~KviTorrentStatusBarApplet()
+StatusBarApplet::~StatusBarApplet()
 {
 }
 
 static KviStatusBarApplet *CreateTorrentClientApplet(KviStatusBar *bar, KviStatusBarAppletDescriptor *desc)
 {
-	KviStatusBarApplet * pApplet = new KviTorrentStatusBarApplet(bar, desc);
+	KviStatusBarApplet * pApplet = new StatusBarApplet(bar, desc);
 	pApplet->setIndex(bar->insertPermanentWidgetAtTheEnd(pApplet));
 	return pApplet;
 }
 
-void KviTorrentStatusBarApplet::selfRegister(KviStatusBar *bar)
+void StatusBarApplet::selfRegister(KviStatusBar *bar)
 {
 	KviStatusBarAppletDescriptor *d = new KviStatusBarAppletDescriptor(
 		__tr2qs_ctx("Torrent Client","torrent"),
@@ -77,15 +77,15 @@ QString formatSize(float sz)
 	return QString("%1 B").arg(sz, 2, 'f', 2);
 }
 
-void KviTorrentStatusBarApplet::update()
+void StatusBarApplet::update()
 {
-	if (KviTorrentInterface::selected())
+	if (TorrentInterface::selected())
 	{
 		QString msg = QString("up: %1 K/s (%2), dn: %3 K/s (%4)")
-					.arg(KviTorrentInterface::selected()->speedUp(), 2)
-					.arg(formatSize(KviTorrentInterface::selected()->trafficUp()))
-					.arg(KviTorrentInterface::selected()->speedDown(), 2)
-					.arg(formatSize(KviTorrentInterface::selected()->trafficDown()));
+					.arg(TorrentInterface::selected()->speedUp(), 2)
+					.arg(formatSize(TorrentInterface::selected()->trafficUp()))
+					.arg(TorrentInterface::selected()->speedDown(), 2)
+					.arg(formatSize(TorrentInterface::selected()->trafficDown()));
 
 		setText(msg);
 	} else {
@@ -94,5 +94,5 @@ void KviTorrentStatusBarApplet::update()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "tc_statusbarapplet.moc"
+#include "StatusBarApplet.moc"
 #endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/torrent/tc_statusbarapplet.h b/src/modules/torrent/StatusBarApplet.h
index 18f0abcbf..1a1e61c9c 100644
--- a/src/modules/torrent/tc_statusbarapplet.h
+++ b/src/modules/torrent/StatusBarApplet.h
@@ -4,7 +4,7 @@
 //
 //   StatusBar for Torrent client.
 //
-//   File : tc_statusbarapplet.h
+//   File : StatusBarApplet.h
 //   Creation date : Fri Jan 1 15:42:25 2007 GMT by Alexander Stillich
 //
 //   This file is part of the KVIrc irc client distribution
@@ -31,12 +31,12 @@
 
 // TODO: check if it gets destroyed
 // TODO: proper icon!
-class KviTorrentStatusBarApplet : public KviStatusBarApplet
+class StatusBarApplet : public KviStatusBarApplet
 {
 	Q_OBJECT
 public:
-	KviTorrentStatusBarApplet(KviStatusBar *parent, KviStatusBarAppletDescriptor *desc);
-	virtual ~KviTorrentStatusBarApplet();
+	StatusBarApplet(KviStatusBar *parent, KviStatusBarAppletDescriptor *desc);
+	virtual ~StatusBarApplet();
 	static void selfRegister(KviStatusBar *bar);
 private slots:
 	void update();
diff --git a/src/modules/torrent/tc_interface.cpp b/src/modules/torrent/TorrentInterface.cpp
index e9f050dfa..29f838823 100644
--- a/src/modules/torrent/tc_interface.cpp
+++ b/src/modules/torrent/TorrentInterface.cpp
@@ -2,7 +2,7 @@
 //
 //   Common interface for BitTorrent clients.
 //
-//   File : tc_interface.cpp
+//   File : TorrentInterface.cpp
 //   Creation date : Fri Jan 1 15:42:25 2007 GMT by Alexander Stillich
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,8 +24,8 @@
 //
 //=============================================================================
 
-#include "tc_interface.h"
+#include "TorrentInterface.h"
 
 #include "KviLocale.h"
 
-KviTorrentInterface *KviTorrentInterface::m_selected = 0;
+TorrentInterface *TorrentInterface::m_selected = 0;
diff --git a/src/modules/torrent/tc_interface.h b/src/modules/torrent/TorrentInterface.h
index 3135edce0..5d093cd8e 100644
--- a/src/modules/torrent/tc_interface.h
+++ b/src/modules/torrent/TorrentInterface.h
@@ -5,7 +5,7 @@
 //
 //   Common interface for BitTorrent clients.
 //
-//   File : tc_interface.h
+//   File : TorrentInterface.h
 //   Creation date : Fri Jan 1 15:42:25 2007 GMT by Alexander Stillich
 //
 //   This file is part of the KVIrc irc client distribution
@@ -32,11 +32,11 @@
 
 #include <QObject>
 
-class KviTorrentInterface : public QObject
+class TorrentInterface : public QObject
 {
 public:
-	KviTorrentInterface() {}
-	virtual ~KviTorrentInterface() {}
+	TorrentInterface() {}
+	virtual ~TorrentInterface() {}
 
 	virtual int detect() = 0;
 
@@ -95,27 +95,27 @@ public:
 
 	QString lastError() { return m_lastError; }
 
-	static void select(KviTorrentInterface *i) { m_selected = i; }
-	static KviTorrentInterface *selected() { return m_selected; }
+	static void select(TorrentInterface *i) { m_selected = i; }
+	static TorrentInterface *selected() { return m_selected; }
 
 protected:
 	QString	m_lastError;
-	static KviTorrentInterface *m_selected;
+	static TorrentInterface *m_selected;
 };
 
-class KviTorrentInterfaceDescriptor
+class TorrentInterfaceDescriptor
 {
 public:
-	KviTorrentInterfaceDescriptor() {};
-	virtual ~KviTorrentInterfaceDescriptor() {};
+	TorrentInterfaceDescriptor() {};
+	virtual ~TorrentInterfaceDescriptor() {};
 public:
 	virtual const QString & name() = 0;
 	virtual const QString & description() = 0;
-	virtual KviTorrentInterface * instance() = 0;
+	virtual TorrentInterface * instance() = 0;
 };
 
 #define TORR_DECLARE_DESCRIPTOR(_interfaceclass) \
-	class _interfaceclass ## Descriptor : public KviTorrentInterfaceDescriptor \
+	class _interfaceclass ## Descriptor : public TorrentInterfaceDescriptor \
 	{ \
 	public: \
 		_interfaceclass ## Descriptor(); \
@@ -127,12 +127,12 @@ public:
 	public: \
 		virtual const QString & name(); \
 		virtual const QString & description(); \
-		virtual KviTorrentInterface * instance(); \
+		virtual TorrentInterface * instance(); \
 	};
 
 #define TORR_IMPLEMENT_DESCRIPTOR(_interfaceclass,_name,_description) \
 	_interfaceclass ## Descriptor::_interfaceclass ## Descriptor() \
-	: KviTorrentInterfaceDescriptor() \
+	: TorrentInterfaceDescriptor() \
 	{ \
 		m_pInstance = 0; \
 		m_szName = _name; \
@@ -150,7 +150,7 @@ public:
 	{ \
 		return m_szDescription; \
 	} \
-	KviTorrentInterface * _interfaceclass ## Descriptor::instance() \
+	TorrentInterface * _interfaceclass ## Descriptor::instance() \
 	{ \
 		if (!m_pInstance) m_pInstance = new _interfaceclass(); \
 		return m_pInstance; \
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index 08dfa2651..60e71993d 100644
--- a/src/modules/torrent/libkvitorrent.cpp
+++ b/src/modules/torrent/libkvitorrent.cpp
@@ -23,9 +23,9 @@
 //=============================================================================
 
 
-#include "tc_interface.h"
-#include "tc_ktorrentdbusinterface.h"
-#include "tc_statusbarapplet.h"
+#include "TorrentInterface.h"
+#include "KTorrentDbusInterface.h"
+#include "StatusBarApplet.h"
 
 #include "KviModule.h"
 #include "KviOptions.h"
@@ -33,19 +33,19 @@
 #include "KviLocale.h"
 #include "kvi_out.h"
 
-static KviPointerList<KviTorrentInterfaceDescriptor> * g_pDescriptorList = 0;
+static KviPointerList<TorrentInterfaceDescriptor> * g_pDescriptorList = 0;
 
-static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
+static TorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 {
 	int iBest = 0;
-	KviTorrentInterface * pBest = 0;
-	KviTorrentInterfaceDescriptor * d;
-	KviTorrentInterfaceDescriptor * pDBest = 0;
+	TorrentInterface * pBest = 0;
+	TorrentInterfaceDescriptor * d;
+	TorrentInterfaceDescriptor * pDBest = 0;
 
 	for (d=g_pDescriptorList->first(); d!=0; d=g_pDescriptorList->next())
 	{
 		// instance gets deleted by descriptor later
-		KviTorrentInterface *i = d->instance();
+		TorrentInterface *i = d->instance();
 		if (i)
 		{
 			int iScore = i->detect();
@@ -73,7 +73,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 		// no sure player found... try again with a destructive test
 		for(d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
 		{
-			KviMediaPlayerInterface * i = d->instance();
+			MpInterface * i = d->instance();
 			if(i)
 			{
 				int iScore = i->detect(true);
@@ -113,7 +113,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 }
 
 #define TC_KVS_FAIL_ON_NO_INTERFACE \
-	if (!KviTorrentInterface::selected()) \
+	if (!TorrentInterface::selected()) \
 	{ \
 		c->warning(__tr2qs_ctx("No torrent client interface selected. Try /torrent.detect", "torrent")); \
 		return true; \
@@ -127,7 +127,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 			{ \
 				c->warning(__tr2qs_ctx("The selected torrent client interface failed to execute the requested function", "torrent")); \
 				QString tmp = __tr2qs_ctx("Last interface error: ", "torrent"); \
-				tmp += KviTorrentInterface::selected()->lastError(); \
+				tmp += TorrentInterface::selected()->lastError(); \
 				c->warning(tmp); \
 			} \
 
@@ -139,7 +139,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 		\
 		TC_KVS_FAIL_ON_NO_INTERFACE \
 		\
-		if (!KviTorrentInterface::selected()->__ifacecommand()) \
+		if (!TorrentInterface::selected()->__ifacecommand()) \
 		{ \
 			TC_KVS_COMMAND_ERROR \
 		} \
@@ -156,7 +156,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 		\
 		TC_KVS_FAIL_ON_NO_INTERFACE \
 		\
-		if (!KviTorrentInterface::selected()->__ifacecommand(arg)) \
+		if (!TorrentInterface::selected()->__ifacecommand(arg)) \
 		{ \
 			TC_KVS_COMMAND_ERROR \
 		} \
@@ -177,7 +177,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 		\
 		TC_KVS_FAIL_ON_NO_INTERFACE \
 		\
-		if (!KviTorrentInterface::selected()->__ifacecommand(arg1, arg2, arg3)) \
+		if (!TorrentInterface::selected()->__ifacecommand(arg1, arg2, arg3)) \
 		{ \
 			TC_KVS_COMMAND_ERROR \
 		} \
@@ -190,7 +190,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 	TC_KVS_FUNCTION(__name) \
 	{ \
 		TC_KVS_FAIL_ON_NO_INTERFACE \
-		QString szRet = KviTorrentInterface::selected()->__ifacecommand(); \
+		QString szRet = TorrentInterface::selected()->__ifacecommand(); \
 		c->returnValue()->setString(szRet); \
 		return true; \
 	}
@@ -199,7 +199,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 	TC_KVS_FUNCTION(__name) \
 	{ \
 		TC_KVS_FAIL_ON_NO_INTERFACE \
-		kvs_int_t ret = KviTorrentInterface::selected()->__ifacecommand(); \
+		kvs_int_t ret = TorrentInterface::selected()->__ifacecommand(); \
 		c->returnValue()->setInteger(ret); \
 		return true; \
 	}
@@ -208,7 +208,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 	TC_KVS_FUNCTION(__name) \
 	{ \
 		TC_KVS_FAIL_ON_NO_INTERFACE \
-		kvs_real_t ret = KviTorrentInterface::selected()->__ifacecommand(); \
+		kvs_real_t ret = TorrentInterface::selected()->__ifacecommand(); \
 		c->returnValue()->setReal(ret); \
 		return true; \
 	}
@@ -221,7 +221,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 			KVSM_PARAMETER(__argname, KVS_PT_INT, 0, arg) \
 		KVSM_PARAMETERS_END(c) \
 		TC_KVS_FAIL_ON_NO_INTERFACE \
-		kvs_int_t ret = KviTorrentInterface::selected()->__ifacecommand(arg); \
+		kvs_int_t ret = TorrentInterface::selected()->__ifacecommand(arg); \
 		c->returnValue()->setInteger(ret); \
 		return true; \
 	}
@@ -234,7 +234,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 			KVSM_PARAMETER(__argname, KVS_PT_INT, 0, arg) \
 		KVSM_PARAMETERS_END(c) \
 		TC_KVS_FAIL_ON_NO_INTERFACE \
-		QString szRet = KviTorrentInterface::selected()->__ifacecommand(arg); \
+		QString szRet = TorrentInterface::selected()->__ifacecommand(arg); \
 		c->returnValue()->setString(szRet); \
 		return true; \
 	}
@@ -249,7 +249,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 			KVSM_PARAMETER(__argname2, KVS_PT_INT, 0, arg2) \
 		KVSM_PARAMETERS_END(c) \
 		TC_KVS_FAIL_ON_NO_INTERFACE \
-		QString szRet = KviTorrentInterface::selected()->__ifacecommand(arg1, arg2); \
+		QString szRet = TorrentInterface::selected()->__ifacecommand(arg1, arg2); \
 		c->returnValue()->setString(szRet); \
 		return true; \
 	}
@@ -264,7 +264,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 			KVSM_PARAMETER(__argname2, KVS_PT_INT, 0, arg2) \
 		KVSM_PARAMETERS_END(c) \
 		TC_KVS_FAIL_ON_NO_INTERFACE \
-		kvs_int_t ret = KviTorrentInterface::selected()->__ifacecommand(arg1, arg2); \
+		kvs_int_t ret = TorrentInterface::selected()->__ifacecommand(arg1, arg2); \
 		c->returnValue()->setInteger(ret); \
 		return true; \
 	}
@@ -297,7 +297,7 @@ static KviTorrentInterface *auto_detect_torrent_client(KviWindow * pOut = 0)
 
 TC_KVS_COMMAND(detect)
 {
-	KviTorrentInterface::select(auto_detect_torrent_client(c->hasSwitch('q',"quiet") ? 0 : c->window()));
+	TorrentInterface::select(auto_detect_torrent_client(c->hasSwitch('q',"quiet") ? 0 : c->window()));
 	return true;
 }
 
@@ -702,11 +702,11 @@ TC_KVS_COMMAND(setClient)
 		KVSM_PARAMETER("client", KVS_PT_STRING, 0, client)
 	KVSM_PARAMETERS_END(c)
 
-	for (KviTorrentInterfaceDescriptor *d = g_pDescriptorList->first(); d; d=g_pDescriptorList->next())
+	for (TorrentInterfaceDescriptor *d = g_pDescriptorList->first(); d; d=g_pDescriptorList->next())
 	{
 		if (d->name() == client)
 		{
-			KviTorrentInterface::select(d->instance());
+			TorrentInterface::select(d->instance());
 			KVI_OPTION_STRING(KviOption_stringPreferredTorrentClient) = client;
 
 			if (!c->hasSwitch('q',"quiet"))
@@ -774,7 +774,7 @@ TC_KVS_FUNCTION(clientList)
 	KviKvsArray *pArray = new KviKvsArray();
 	int id=0;
 
-	for (KviTorrentInterfaceDescriptor *d=g_pDescriptorList->first(); d; d=g_pDescriptorList->next())
+	for (TorrentInterfaceDescriptor *d=g_pDescriptorList->first(); d; d=g_pDescriptorList->next())
 		pArray->set(id++, new KviKvsVariant(d->name()));
 
 	c->returnValue()->setArray(pArray);
@@ -869,29 +869,29 @@ static bool torrent_module_init(KviModule *m)
 	TC_KVS_REGFNC(fileName, "fileName")
 	TC_KVS_REGFNC(filePriority, "filePriority")
 
-	g_pDescriptorList = new KviPointerList<KviTorrentInterfaceDescriptor>;
+	g_pDescriptorList = new KviPointerList<TorrentInterfaceDescriptor>;
 	g_pDescriptorList->setAutoDelete(true);
 
 #ifdef COMPILE_KDE_SUPPORT
-	g_pDescriptorList->append(new KviKTorrentDBusInterfaceDescriptor);
+	g_pDescriptorList->append(new KTorrentDbusInterfaceDescriptor);
 #endif // COMPILE_KDE_SUPPORT
 
-	KviTorrentInterface::select(0);
+	TorrentInterface::select(0);
 
 	if (g_pFrame->mainStatusBar())
-		KviTorrentStatusBarApplet::selfRegister(g_pFrame->mainStatusBar());
+		StatusBarApplet::selfRegister(g_pFrame->mainStatusBar());
 
 
 	if(KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer) == "auto")
 	{
-		KviTorrentInterface::select(auto_detect_torrent_client());
+		TorrentInterface::select(auto_detect_torrent_client());
 
 	} else
 	{
-		for (KviTorrentInterfaceDescriptor *d=g_pDescriptorList->first(); d; d=g_pDescriptorList->next())
+		for (TorrentInterfaceDescriptor *d=g_pDescriptorList->first(); d; d=g_pDescriptorList->next())
 		{
 			if (d->name() == KVI_OPTION_STRING(KviOption_stringPreferredTorrentClient))
-				KviTorrentInterface::select(d->instance());
+				TorrentInterface::select(d->instance());
 		}
 	}
 
@@ -915,7 +915,7 @@ static bool torrent_module_ctrl(KviModule *,const char *,void *) // KviModule *
 	{
 		// we expect param to be a pointer to QStringList
 		QStringList * l = (QStringList *)param;
-		for(KviMediaPlayerInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
+		for(MpInterfaceDescriptor * d = g_pDescriptorList->first();d;d = g_pDescriptorList->next())
 		{
 			l->append(d->name());
 		}
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index 5caec1ff2..bc3ee7d78 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -59,13 +59,13 @@
 #endif
 
 extern KVIRC_API KviPointerHashTable<QString,KviWindow> * g_pGlobalWindowDict;
-static KviPointerList<KviTrayIcon> * g_pTrayIconList = 0;
+static KviPointerList<TrayIcon> * g_pTrayIconList = 0;
 
 static QPixmap * g_pDock1 = 0;
 static QPixmap * g_pDock2 = 0;
 static QPixmap * g_pDock3 = 0;
 
-KviTrayIcon::KviTrayIcon(KviMainWindow * frm)
+TrayIcon::TrayIcon(KviMainWindow * frm)
 : QSystemTrayIcon(frm), m_CurrentPixmap(ICON_SIZE,ICON_SIZE)
 {
 	m_pContextPopup = new KviTalPopupMenu(0);
@@ -120,7 +120,7 @@ KviTrayIcon::KviTrayIcon(KviMainWindow * frm)
 }
 
 
-KviTrayIcon::~KviTrayIcon()
+TrayIcon::~TrayIcon()
 {
 	m_pFrm->setDockExtension(0);
 	g_pTrayIconList->removeRef(this);
@@ -132,7 +132,7 @@ KviTrayIcon::~KviTrayIcon()
 }
 
 
-void KviTrayIcon::executeInternalCommand(bool)
+void TrayIcon::executeInternalCommand(bool)
 {
 	int iCmd;
 	bool bOk;
@@ -140,12 +140,12 @@ void KviTrayIcon::executeInternalCommand(bool)
 	if(m_pFrm && bOk)
 		m_pFrm->executeInternalCommand(iCmd);
 }
-void KviTrayIcon::die()
+void TrayIcon::die()
 {
 	delete this;
 }
 
-void KviTrayIcon::flashingTimerShot()
+void TrayIcon::flashingTimerShot()
 {
 	m_bFlashed=!m_bFlashed;
 	refresh();
@@ -175,7 +175,7 @@ static const char * idlemsgs[NIDLEMSGS]=
 	__tr("idle idle idle idle!")
 };
 
-bool KviTrayIcon::event(QEvent *e)
+bool TrayIcon::event(QEvent *e)
 {
 	if(e->type()==QEvent::ToolTip)
 	{
@@ -222,14 +222,14 @@ bool KviTrayIcon::event(QEvent *e)
 	return false;
 }
 
-//int KviTrayIcon::message(int,void *)
+//int TrayIcon::message(int,void *)
 //{
 //	qDebug("Message");
 //	update();
 //	return 0;
 //}
 
-void KviTrayIcon::doAway(bool)
+void TrayIcon::doAway(bool)
 {
 	int id;
 	bool ok;
@@ -285,7 +285,7 @@ void KviTrayIcon::doAway(bool)
 	}
 }
 
-void KviTrayIcon::fillContextPopup()
+void TrayIcon::fillContextPopup()
 {
 	m_pToggleFrame->setText(m_pFrm->isVisible() ? __tr2qs("Hide Window") : __tr2qs("Show Window"));
 	if(g_pApp->topmostConnectedConsole())
@@ -343,9 +343,9 @@ void KviTrayIcon::fillContextPopup()
 	}
 }
 
-void KviTrayIcon::toggleParentFrame()
+void TrayIcon::toggleParentFrame()
 {
-	qDebug("KviTrayIcon::toggleParentFrame()");
+	qDebug("TrayIcon::toggleParentFrame()");
 	if(m_pFrm->isMinimized())
 	{
 		qDebug("- frame is minimized");
@@ -378,7 +378,7 @@ void KviTrayIcon::toggleParentFrame()
 	}
 }
 
-void KviTrayIcon::refresh()
+void TrayIcon::refresh()
 {
 	grabActivityInfo();
 
@@ -425,7 +425,7 @@ void KviTrayIcon::refresh()
 	updateIcon();
 }
 
-void KviTrayIcon::activatedSlot( QSystemTrayIcon::ActivationReason reason )
+void TrayIcon::activatedSlot( QSystemTrayIcon::ActivationReason reason )
 {
 	switch(reason)
 	{
@@ -448,7 +448,7 @@ void KviTrayIcon::activatedSlot( QSystemTrayIcon::ActivationReason reason )
 	}
 }
 
-void KviTrayIcon::grabActivityInfo()
+void TrayIcon::grabActivityInfo()
 {
 	KviWindowListBase * t = m_pFrm->windowListWidget();
 
@@ -540,15 +540,15 @@ void KviTrayIcon::grabActivityInfo()
 	}
 }
 
-void KviTrayIcon::updateIcon()
+void TrayIcon::updateIcon()
 {
 	setIcon(QIcon(m_CurrentPixmap));
 }
 
-static KviTrayIcon * trayicon_find(KviMainWindow *f)
+static TrayIcon * trayicon_find(KviMainWindow *f)
 {
 	if(!g_pTrayIconList)return 0;
-	for(KviTrayIcon * w = g_pTrayIconList->first();w;w = g_pTrayIconList->next())
+	for(TrayIcon * w = g_pTrayIconList->first();w;w = g_pTrayIconList->next())
 	{
 		if(w->frame() == f)return w;
 	}
@@ -593,7 +593,7 @@ static bool trayicon_kvs_cmd_show(KviKvsModuleCommandCall * c)
 {
 	if(!(trayicon_find(c->window()->frame())))
 	{
-		KviTrayIcon * w = new KviTrayIcon(c->window()->frame());
+		TrayIcon * w = new TrayIcon(c->window()->frame());
 		w->show();
 	}
 	return true;
@@ -617,7 +617,7 @@ static bool trayicon_kvs_cmd_show(KviKvsModuleCommandCall * c)
 
 static bool trayicon_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 {
-	KviTrayIcon * w= trayicon_find(c->window()->frame());
+	TrayIcon * w= trayicon_find(c->window()->frame());
 	if(w)delete w;
 	// show the parent frame.. otherwise there will be no way to get it back
 	if(!c->window()->frame()->isVisible())
@@ -645,7 +645,7 @@ static bool trayicon_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 
 static bool trayicon_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c)
 {
-	KviTrayIcon * w= trayicon_find(c->window()->frame());
+	TrayIcon * w= trayicon_find(c->window()->frame());
 	if(w)
 	{
 		c->window()->frame()->hide();
@@ -702,7 +702,7 @@ static bool trayicon_module_init(KviModule * m)
 #endif
 	g_pDock3 = new QPixmap(buffer);
 
-	g_pTrayIconList = new KviPointerList<KviTrayIcon>;
+	g_pTrayIconList = new KviPointerList<TrayIcon>;
 	g_pTrayIconList->setAutoDelete(false);
 
 
diff --git a/src/modules/trayicon/libkvitrayicon.h b/src/modules/trayicon/libkvitrayicon.h
index 5cd1e326d..aecbfb99d 100644
--- a/src/modules/trayicon/libkvitrayicon.h
+++ b/src/modules/trayicon/libkvitrayicon.h
@@ -38,12 +38,12 @@ class KviTalPopupMenu;
 class KviDynamicToolTip;
 //class KviMainWindow;
 
-class KviTrayIcon : public QSystemTrayIcon, public KviDockExtension
+class TrayIcon : public QSystemTrayIcon, public KviDockExtension
 {
 	Q_OBJECT
 public:
-	KviTrayIcon(KviMainWindow * win);
-	~KviTrayIcon();
+	TrayIcon(KviMainWindow * win);
+	~TrayIcon();
 protected:
 	KviMainWindow               * m_pFrm;
 	KviDynamicToolTip      * m_pTip;
diff --git a/src/modules/upnp/CMakeLists.txt b/src/modules/upnp/CMakeLists.txt
index 94274cf22..77f3ad4a7 100644
--- a/src/modules/upnp/CMakeLists.txt
+++ b/src/modules/upnp/CMakeLists.txt
@@ -3,19 +3,19 @@
 SET(kviupnp_SRCS
 	igdcontrolpoint.cpp
 	libkviupnp.cpp
-	manager.cpp
-	rootservice.cpp
-	service.cpp
-	ssdpconnection.cpp
-	wanconnectionservice.cpp
-	xmlfunctions.cpp
+	Manager.cpp
+	RootService.cpp
+	Service.cpp
+	SsdpConnection.cpp
+	WanConnectionService.cpp
+	XmlFunctions.cpp
 )
 
 SET(kviupnp_MOC_HDRS
 	igdcontrolpoint.h
-	manager.h
-	service.h
-	ssdpconnection.h
+	Manager.h
+	Service.h
+	SsdpConnection.h
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/upnp/manager.cpp b/src/modules/upnp/Manager.cpp
index 842ed5686..ebb4d09ab 100644
--- a/src/modules/upnp/manager.cpp
+++ b/src/modules/upnp/Manager.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : manager.cpp
+//   File : Manager.cpp
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,17 +24,17 @@
 //=============================================================================
 
 /***************************************************************************
-                          manager.cpp -  description
+                          Manager.cpp -  description
                              -------------------
     begin                : Fri Aug 05 2005
     copyright            : (C) 2005 by Diederik van der Boor
     email                : vdboor --at-- codingdomain.com
  ***************************************************************************/
 
-#include "manager.h"
+#include "Manager.h"
 
 #include "igdcontrolpoint.h"
-#include "ssdpconnection.h"
+#include "SsdpConnection.h"
 
 #include <QDebug>
 #include <QTimer>
diff --git a/src/modules/upnp/manager.h b/src/modules/upnp/Manager.h
index 3cc6d7b4e..af6ce7569 100644
--- a/src/modules/upnp/manager.h
+++ b/src/modules/upnp/Manager.h
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : manager.h
+//   File : Manager.h
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //=============================================================================
 
 /***************************************************************************
-                          manager.h -  description
+                          Manager.h -  description
                              -------------------
     begin                : Fri Aug 05 2005
     copyright            : (C) 2005 by Diederik van der Boor
@@ -39,7 +39,7 @@
 
 #include "KviPointerList.h"
 #include "igdcontrolpoint.h"
-#include "ssdpconnection.h"
+#include "SsdpConnection.h"
 
 namespace UPnP
 {
diff --git a/src/modules/upnp/rootservice.cpp b/src/modules/upnp/RootService.cpp
index 3911a7cbc..3deb04341 100644
--- a/src/modules/upnp/rootservice.cpp
+++ b/src/modules/upnp/RootService.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : rootservice.cpp
+//   File : RootService.cpp
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,15 +24,15 @@
 //=============================================================================
 
 /***************************************************************************
-                          rootservice.cpp -  description
+                          RootService.cpp -  description
                              -------------------
     begin                : Mon Jul 25 2005
     copyright            : (C) 2005 by Diederik van der Boor
     email                : vdboor --at-- codingdomain.com
  ***************************************************************************/
 
-#include "rootservice.h"
-#include "xmlfunctions.h"
+#include "RootService.h"
+#include "XmlFunctions.h"
 #include "KviLocale.h"
 #include "kvi_out.h"
 #include "KviApplication.h"
diff --git a/src/modules/upnp/rootservice.h b/src/modules/upnp/RootService.h
index d75bb581b..204bfda33 100644
--- a/src/modules/upnp/rootservice.h
+++ b/src/modules/upnp/RootService.h
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : rootservice.h
+//   File : RootService.h
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //=============================================================================
 
 /***************************************************************************
-                          rootservice.h -  description
+                          RootService.h -  description
                              -------------------
     begin                : Mon Jul 25 2005
     copyright            : (C) 2005 by Diederik van der Boor
@@ -34,7 +34,7 @@
 #ifndef UPNP_ROOTSERVICE_H
 #define UPNP_ROOTSERVICE_H
 
-#include "service.h"
+#include "Service.h"
 
 
 namespace UPnP
diff --git a/src/modules/upnp/service.cpp b/src/modules/upnp/Service.cpp
index dd1b99998..b29255e16 100644
--- a/src/modules/upnp/service.cpp
+++ b/src/modules/upnp/Service.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : service.cpp
+//   File : Service.cpp
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,15 +24,15 @@
 //=============================================================================
 
 /***************************************************************************
-                          service.cpp  -  description
+                          Service.cpp  -  description
                              -------------------
     begin                : Sun Jul 24 2005
     copyright            : (C) 2005 by Diederik van der Boor
     email                : vdboor --at-- codingdomain.com
  ***************************************************************************/
 
-#include "service.h"
-#include "xmlfunctions.h"
+#include "Service.h"
+#include "XmlFunctions.h"
 
 #include <QDebug>
 #include <QHttp>
diff --git a/src/modules/upnp/service.h b/src/modules/upnp/Service.h
index 66e0d4f79..b06758b90 100644
--- a/src/modules/upnp/service.h
+++ b/src/modules/upnp/Service.h
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : service.h
+//   File : Service.h
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //=============================================================================
 
 /***************************************************************************
-                          service.h  -  description
+                          Service.h  -  description
                              -------------------
     begin                : Sun Jul 24 2005
     copyright            : (C) 2005 by Diederik van der Boor
diff --git a/src/modules/upnp/ssdpconnection.cpp b/src/modules/upnp/SsdpConnection.cpp
index 821530e06..d1b612445 100644
--- a/src/modules/upnp/ssdpconnection.cpp
+++ b/src/modules/upnp/SsdpConnection.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : ssdpconnection.cpp
+//   File : SsdpConnection.cpp
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,14 +24,14 @@
 //=============================================================================
 
 /***************************************************************************
-                          ssdpconnection.cpp -  description
+                          SsdpConnection.cpp -  description
                              -------------------
     begin                : Fri Jul 29 2005
     copyright            : (C) 2005 by Diederik van der Boor
     email                : vdboor --at-- codingdomain.com
  ***************************************************************************/
 
-#include "ssdpconnection.h"
+#include "SsdpConnection.h"
 
 #include <QHostAddress>
 #include <QUdpSocket>
diff --git a/src/modules/upnp/ssdpconnection.h b/src/modules/upnp/SsdpConnection.h
index a73414fd9..bd81d4b75 100644
--- a/src/modules/upnp/ssdpconnection.h
+++ b/src/modules/upnp/SsdpConnection.h
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : ssdpconnection.h
+//   File : SsdpConnection.h
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //=============================================================================
 
 /***************************************************************************
-                          ssdpconnection.h -  description
+                          SsdpConnection.h -  description
                              -------------------
     begin                : Fri Jul 29 2005
     copyright            : (C) 2005 by Diederik van der Boor
diff --git a/src/modules/upnp/wanconnectionservice.cpp b/src/modules/upnp/WanConnectionService.cpp
index ddeb17e47..0396244ba 100644
--- a/src/modules/upnp/wanconnectionservice.cpp
+++ b/src/modules/upnp/WanConnectionService.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : wanconnectionservice.cpp
+//   File : WanConnectionService.cpp
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,14 +24,14 @@
 //=============================================================================
 
 /***************************************************************************
-                          wanconnectionservice.cpp -  description
+                          WanConnectionService.cpp -  description
                              -------------------
     begin                : Mon Jul 25 2005
     copyright            : (C) 2005 by Diederik van der Boor
     email                : vdboor --at-- codingdomain.com
  ***************************************************************************/
 
-#include "wanconnectionservice.h"
+#include "WanConnectionService.h"
 #include <QDebug>
 
 namespace UPnP
diff --git a/src/modules/upnp/wanconnectionservice.h b/src/modules/upnp/WanConnectionService.h
index 3dd88407f..5128464ea 100644
--- a/src/modules/upnp/wanconnectionservice.h
+++ b/src/modules/upnp/WanConnectionService.h
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : wanconnectionservice.h
+//   File : WanConnectionService.h
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //=============================================================================
 
 /***************************************************************************
-                          wanconnectionservice.h -  description
+                          WanConnectionService.h -  description
                              -------------------
     begin                : Mon Jul 25 2005
     copyright            : (C) 2005 by Diederik van der Boor
@@ -34,7 +34,7 @@
 #ifndef UPNP_WANCONNECTIONSERVICE_H
 #define UPNP_WANCONNECTIONSERVICE_H
 
-#include "service.h"
+#include "Service.h"
 #include "KviPointerList.h"
 
 namespace UPnP
diff --git a/src/modules/upnp/xmlfunctions.cpp b/src/modules/upnp/XmlFunctions.cpp
index 563aaec4a..59d79e3fc 100644
--- a/src/modules/upnp/xmlfunctions.cpp
+++ b/src/modules/upnp/XmlFunctions.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : xmlfunctions.cpp
+//   File : XmlFunctions.cpp
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,14 +24,14 @@
 //=============================================================================
 
 /***************************************************************************
-                          xmlfunctions.cpp -  description
+                          XmlFunctions.cpp -  description
                              -------------------
     begin                : Sun Jul 24 2005
     copyright            : (C) 2005 by Diederik van der Boor
     email                : vdboor --at-- codingdomain.com
  ***************************************************************************/
 
-#include "xmlfunctions.h"
+#include "XmlFunctions.h"
 
 #include <QStringList>
 
diff --git a/src/modules/upnp/xmlfunctions.h b/src/modules/upnp/XmlFunctions.h
index 751b06554..9161b2222 100644
--- a/src/modules/upnp/xmlfunctions.h
+++ b/src/modules/upnp/XmlFunctions.h
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : xmlfunctions.h
+//   File : XmlFunctions.h
 //   Creation date : Fri Aug 08 18:00:00 2008 GMT by Fabio Bas
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,7 +24,7 @@
 //=============================================================================
 
 /***************************************************************************
-                          xmlfunctions.cpp -  description
+                          XmlFunctions.cpp -  description
                              -------------------
     begin                : Sun Jul 24 2005
     copyright            : (C) 2005 by Diederik van der Boor
diff --git a/src/modules/upnp/igdcontrolpoint.cpp b/src/modules/upnp/igdcontrolpoint.cpp
index e9eeaf8d0..8642a3a3d 100644
--- a/src/modules/upnp/igdcontrolpoint.cpp
+++ b/src/modules/upnp/igdcontrolpoint.cpp
@@ -35,8 +35,8 @@
 
 #include "igdcontrolpoint.h"
 
-#include "rootservice.h"
-#include "wanconnectionservice.h"
+#include "RootService.h"
+#include "WanConnectionService.h"
 
 namespace UPnP
 {
diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp
index a66605041..703325300 100644
--- a/src/modules/upnp/libkviupnp.cpp
+++ b/src/modules/upnp/libkviupnp.cpp
@@ -27,7 +27,7 @@
 #include "KviCString.h"
 #include "KviNetUtils.h"
 
-#include "manager.h"
+#include "Manager.h"
 
 // Please use our common variable naming conventions and coding style :)
 // Let's be so:)
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 759a03e90..a0c61e557 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -90,12 +90,12 @@ static KviModuleExtension * url_extension_alloc(KviModuleExtensionAllocStruct *)
 	return 0;
 }
 
-KviUrlDialogTreeWidget::KviUrlDialogTreeWidget(QWidget * par)
+UrlDialogTreeWidget::UrlDialogTreeWidget(QWidget * par)
 : QTreeWidget(par)
 {
 }
 
-void KviUrlDialogTreeWidget::mousePressEvent (QMouseEvent *e)
+void UrlDialogTreeWidget::mousePressEvent (QMouseEvent *e)
 {
 	if (e->button() == Qt::RightButton)
 	{
@@ -106,7 +106,7 @@ void KviUrlDialogTreeWidget::mousePressEvent (QMouseEvent *e)
 	QTreeWidget::mousePressEvent(e);
 }
 
-void KviUrlDialogTreeWidget::paintEvent(QPaintEvent * event)
+void UrlDialogTreeWidget::paintEvent(QPaintEvent * event)
 {
 	QPainter *p = new QPainter(viewport());
 	QStyleOptionViewItem option = viewOptions();
@@ -164,7 +164,7 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *)
 {
 	setAutoFillBackground(false);
 	
-	m_pUrlList = new KviUrlDialogTreeWidget(this);
+	m_pUrlList = new UrlDialogTreeWidget(this);
 
 	m_pMenuBar = new KviTalMenuBar(this,"url menu");
 	//m_pUrlList = new KviListView(this,"list");
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index 3e9c2e00b..90622ab4e 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -53,12 +53,12 @@ typedef struct _KviUrl
 	QString timestamp;
 } KviUrl;
 
-class KviUrlDialogTreeWidget : public QTreeWidget
+class UrlDialogTreeWidget : public QTreeWidget
 {
 	Q_OBJECT
 public:
-	KviUrlDialogTreeWidget(QWidget*);
-	~KviUrlDialogTreeWidget(){};
+	UrlDialogTreeWidget(QWidget*);
+	~UrlDialogTreeWidget(){};
 protected:
 	void mousePressEvent (QMouseEvent *e);
 	void paintEvent(QPaintEvent * event);
@@ -81,7 +81,7 @@ protected:
 	QPixmap *myIconPtr();
 	void resizeEvent(QResizeEvent *);
 public:
-	KviUrlDialogTreeWidget *m_pUrlList;
+	UrlDialogTreeWidget *m_pUrlList;
 	void addUrl(QString url, QString window, QString count, QString timestamp);
 //	void saveProperties();
 protected slots:
diff --git a/src/modules/window/CMakeLists.txt b/src/modules/window/CMakeLists.txt
index 6bb949398..682fae253 100644
--- a/src/modules/window/CMakeLists.txt
+++ b/src/modules/window/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/window
 
 SET(kviwindow_MOC_HDRS
-	userwindow.h
+	UserWindow.h
 )
 
 SET(kviwindow_SRCS
 	libkviwindow.cpp
-	userwindow.cpp
+	UserWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/UserWindow.cpp
index 74cade69a..72962304e 100644
--- a/src/modules/window/userwindow.cpp
+++ b/src/modules/window/UserWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : userwindow.cpp
+//   File : UserWindow.cpp
 //   Created on Mon 30 Aug 2004 15:00:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "userwindow.h"
+#include "UserWindow.h"
 
 #include "KviIconManager.h"
 #include "KviInput.h"
@@ -30,10 +30,10 @@
 #include "KviMainWindow.h"
 #include "KviConsoleWindow.h"
 
-extern KviPointerList<KviUserWindow> * g_pUserWindowList;
+extern KviPointerList<UserWindow> * g_pUserWindowList;
 
 
-KviUserWindow::KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole,int iCreationFlags)
+UserWindow::UserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole,int iCreationFlags)
 : KviWindow(KVI_WINDOW_TYPE_USERWINDOW,pFrm,name,pConsole)
 {
 	g_pUserWindowList->append(this);
@@ -66,18 +66,18 @@ KviUserWindow::KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,Kv
 	if(context())context()->registerContextWindow(this);
 }
 
-KviUserWindow::~KviUserWindow()
+UserWindow::~UserWindow()
 {
 	if(context())context()->unregisterContextWindow(this);
 	g_pUserWindowList->removeRef(this);
 }
 
-QPixmap * KviUserWindow::myIconPtr()
+QPixmap * UserWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(m_iIcon);
 }
 
-void KviUserWindow::resizeEvent(QResizeEvent *)
+void UserWindow::resizeEvent(QResizeEvent *)
 {
 	if(m_pInput)
 	{
@@ -89,12 +89,12 @@ void KviUserWindow::resizeEvent(QResizeEvent *)
 	}
 }
 
-void KviUserWindow::fillCaptionBuffers()
+void UserWindow::fillCaptionBuffers()
 {
 	// nothing here
 }
 
-void KviUserWindow::setWindowTitleStrings(const QString &szPlainText)
+void UserWindow::setWindowTitleStrings(const QString &szPlainText)
 {
 	m_szPlainTextCaption = szPlainText;
 	updateCaption();
diff --git a/src/modules/window/userwindow.h b/src/modules/window/UserWindow.h
index 06664bcc1..6e0e0e392 100644
--- a/src/modules/window/userwindow.h
+++ b/src/modules/window/UserWindow.h
@@ -2,7 +2,7 @@
 #define _USERWINDOW_H_
 //=============================================================================
 //
-//   File : userwindow.h
+//   File : UserWindow.h
 //   Created on Mon 30 Aug 2004 15:00:52 by Szymon Stefanek
 //
 //   This file is part of the KVIrc IRC client distribution
@@ -27,14 +27,14 @@
 #include "kvi_settings.h"
 #include "KviWindow.h"
 
-class KviUserWindow : public KviWindow
+class UserWindow : public KviWindow
 {
 	Q_OBJECT
 public:
 	enum CreationFlags { HasInput = 1 };
 public:
-	KviUserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole = 0,int iCreationFlags = 0);
-	~KviUserWindow();
+	UserWindow(KviMainWindow * pFrm,const char * name,int iIcon,KviConsoleWindow * pConsole = 0,int iCreationFlags = 0);
+	~UserWindow();
 protected:
 	int m_iIcon;
 protected:
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 690a6db3f..edb12774a 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "userwindow.h"
+#include "UserWindow.h"
 
 #include "KviModule.h"
 #include "KviConsoleWindow.h"
@@ -55,7 +55,7 @@
 
 // KviApplication.cpp
 extern KVIRC_API KviPointerHashTable<QString,KviWindow> * g_pGlobalWindowDict;
-KviPointerList<KviUserWindow> * g_pUserWindowList = 0;
+KviPointerList<UserWindow> * g_pUserWindowList = 0;
 
 // $window.caption $window.x $window.y $window.width $window.height $window.isActive $window.type
 // $window.input.text $window.input.cursorpos $window.input.textlen
@@ -1154,7 +1154,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	iIcon = iIcon % KVI_NUM_SMALL_ICONS;
 
 	int iFlags = 0;
-	if(szFlags.contains('i'))iFlags |= KviUserWindow::HasInput;
+	if(szFlags.contains('i'))iFlags |= UserWindow::HasInput;
 
 	KviConsoleWindow * pConsole = 0;
 	if(c->parameterList()->count() >= 3)
@@ -1166,7 +1166,7 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 		}
 	}
 
-	KviUserWindow * wnd = new KviUserWindow(
+	UserWindow * wnd = new UserWindow(
 		c->window()->frame(),
 		szCaption.toUtf8().data(),
 		iIcon,
@@ -1220,7 +1220,7 @@ static bool window_kvs_cmd_setWindowTitle(KviKvsModuleCommandCall * c)
 
 	if(pWnd->type() == KVI_WINDOW_TYPE_USERWINDOW)
 	{
-		((KviUserWindow *)pWnd)->setWindowTitleStrings(szPlain);
+		((UserWindow *)pWnd)->setWindowTitleStrings(szPlain);
 	} else {
 		//store the window title (needed for functions that search windows by their captions)
 		((KviWindow *)pWnd)->setFixedCaption(szPlain);
@@ -1599,7 +1599,7 @@ static bool window_kvs_cmd_setCryptEngine(KviKvsModuleCommandCall * c)
 
 static bool window_module_init(KviModule *m)
 {
-	g_pUserWindowList = new KviPointerList<KviUserWindow>();
+	g_pUserWindowList = new KviPointerList<UserWindow>();
 	g_pUserWindowList->setAutoDelete(false);
 
 	KVSM_REGISTER_FUNCTION(m,"activityTemperature",window_kvs_fnc_activityTemperature);
@@ -1665,7 +1665,7 @@ static bool window_module_init(KviModule *m)
 
 static bool window_module_cleanup(KviModule *)
 {
-	while(KviUserWindow * w = g_pUserWindowList->first())
+	while(UserWindow * w = g_pUserWindowList->first())
 		w->close();
 	delete g_pUserWindowList;
 	return true;