The big rename for modules. Still some details remaining.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5284 17fca916-40b9-46aa-a4ea-0a15b648b75c

97 files changed, 2055 insertions, 2054 deletions

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) \