diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index 3add83ae..4b59f93b 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -214,7 +214,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
     if ( !imageCollection.isNull() )
 	widgetFactory->loadImageCollection( imageCollection );
 
-    widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", "TQWidget") );
+    widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) );
     TQWidget *w = widgetFactory->toplevel;
     if ( !w ) {
 	delete widgetFactory;
@@ -263,7 +263,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
 	}
 
 	for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin(); it != widgetFactory->dbTables.end(); ++it ) {
-	    TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), "TQDataTable" );
+	    TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), TQDATATABLE_OBJECT_NAME_STRING );
 	    if ( !table )
 		continue;
 	    if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() )
@@ -289,8 +289,8 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
     }
 
     for ( TQMap<TQString, TQString>::Iterator it = widgetFactory->buddies.begin(); it != widgetFactory->buddies.end(); ++it ) {
-	TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), "TQLabel" );
-	TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, "TQWidget" );
+	TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), TQLABEL_OBJECT_NAME_STRING );
+	TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, TQWIDGET_OBJECT_NAME_STRING );
 	if ( label && buddy )
 	    label->setBuddy( buddy );
     }
@@ -312,7 +312,7 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi
   TQString className = literalClassName;
 
   // create widgets we know
-  if (className == "TQPushButton")
+  if (className == TQPUSHBUTTON_OBJECT_NAME_STRING)
     return new TQPushButton(parent, name);
   else if (className == "TQToolButton")
     return new TQToolButton(parent, name);