diff --git a/kbarcode/kbarcode.cpp b/kbarcode/kbarcode.cpp
index 32f3559..d624812 100644
--- a/kbarcode/kbarcode.cpp
+++ b/kbarcode/kbarcode.cpp
@@ -268,7 +268,7 @@ void KBarcode::importCSV()
     new CSVImportDlg( this, "csvimportdlg" );
 }
 
-bool KBarcode::isSTQLConnected() const
+bool KBarcode::isSQLConnected() const
 {
     return SqlTables::isConnected();
 }
diff --git a/kbarcode/kbarcode.h b/kbarcode/kbarcode.h
index 255e4a4..50ee1e2 100644
--- a/kbarcode/kbarcode.h
+++ b/kbarcode/kbarcode.h
@@ -75,7 +75,7 @@ class KBarcode: public DSMainWindow, public KBarcodeIface {
         /** allow the DCOP interface
           * to check for an SQL connection.
           */
-        bool isSTQLConnected() const;
+        bool isSQLConnected() const;
         /** allow the DCOP interface
           * to connect to the databases.
           */
diff --git a/kbarcode/kbarcodeiface.h b/kbarcode/kbarcodeiface.h
index 8e13403..b53f260 100644
--- a/kbarcode/kbarcodeiface.h
+++ b/kbarcode/kbarcodeiface.h
@@ -37,7 +37,7 @@ class KBarcodeIface : virtual public DCOPObject
 
         virtual void importCSV() = 0;
 
-        virtual bool isSTQLConnected() const = 0;
+        virtual bool isSQLConnected() const = 0;
         virtual bool connectSQL() = 0;
         virtual void showWizard() = 0;
         virtual void showConfigure() = 0;
diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp
index 4423e65..8db24b3 100644
--- a/kbarcode/sqltables.cpp
+++ b/kbarcode/sqltables.cpp
@@ -47,7 +47,7 @@ class MySqlDescription : public SqlDescription {
         virtual const TQString showColumns( const TQString & table ) const { return "SHOW COLUMNS FROM " + table; }
 };
 
-class PostgreSTQLDescription : public SqlDescription {
+class PostgreSQLDescription : public SqlDescription {
     public:
         virtual const TQString initdb( TQString ) const { return "template1"; }
         virtual const TQString autoIncrement() const { return "serial NOT NULL"; }
@@ -63,7 +63,7 @@ class PostgreSTQLDescription : public SqlDescription {
 };
 
 /** should work for ODBC, too */
-class STQLiteDescription : public SqlDescription {
+class SQLiteDescription : public SqlDescription {
     public:
         virtual const TQString initdb( TQString db = TQString() ) const { return db; }
         virtual const TQString autoIncrement() const { return "serial NOT NULL"; }
@@ -74,10 +74,10 @@ SqlTables::SqlTables( TQObject* parent )
     : TQObject( parent, "sqltables" )
 {
     drivers.insert( "TQMYSQL3", new MySqlDescription() );
-    drivers.insert( "TQPSQL7", new PostgreSTQLDescription() );
-    /* The same driver plugin is used for TQDBC and STQLite */
-    drivers.insert( "TQSQLITE", new STQLiteDescription() );
-    drivers.insert( "TQODBC3", new STQLiteDescription() );
+    drivers.insert( "TQPSQL7", new PostgreSQLDescription() );
+    /* The same driver plugin is used for TQDBC and SQLite */
+    drivers.insert( "TQSQLITE", new SQLiteDescription() );
+    drivers.insert( "TQODBC3", new SQLiteDescription() );
 
     db = NULL;
     connected = false;
diff --git a/kbarcode/sqltables.h b/kbarcode/sqltables.h
index def102b..3931a6d 100644
--- a/kbarcode/sqltables.h
+++ b/kbarcode/sqltables.h
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef STQLTABLES_H
-#define STQLTABLES_H
+#ifndef SQLTABLES_H
+#define SQLTABLES_H
 
 #include <tqobject.h>
 #include <tqwidget.h>
diff --git a/kbarcode/tokendialog.cpp b/kbarcode/tokendialog.cpp
index dcda408..83a6575 100644
--- a/kbarcode/tokendialog.cpp
+++ b/kbarcode/tokendialog.cpp
@@ -109,13 +109,13 @@ void TokenDialog::setupStackPage2()
     TQVButtonGroup* group = new TQVButtonGroup( i18n("What do you want to insert?"), stackPage2 );
 
     radioVariable = new TQRadioButton( i18n("Insert a custom &variable"), group );
-    radioSTQLQuery = new TQRadioButton( i18n("Insert a &SQL query"), group );
+    radioSQLQuery = new TQRadioButton( i18n("Insert a &SQL query"), group );
     radioJavaScript = new TQRadioButton( i18n("Insert a &JavaScript function"), group );
 
     radioVariable->setChecked( true );
 
     connect( radioVariable, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioSTQLQuery, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+    connect( radioSQLQuery, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
     connect( radioJavaScript, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
 
     page2->addWidget( stackPage2 );
@@ -265,7 +265,7 @@ void TokenDialog::accept()
             else if( radioVariableExisting->isChecked() )
                 m_result = listVariable->currentText();
         }
-        else if( radioSTQLQuery->isChecked() )
+        else if( radioSQLQuery->isChecked() )
             m_result = TQString( "sqlquery:%2").tqarg( editQuery->text() );
         else if( radioJavaScript->isChecked() )
             m_result = TQString( "js:%2").tqarg( editJavaScript->text() );
@@ -301,7 +301,7 @@ void TokenDialog::showPage( TQWidget* w )
         {
             if( radioVariable->isChecked() )
                 page3->raiseWidget( stack2Page3 );
-            else if( radioSTQLQuery->isChecked() )
+            else if( radioSQLQuery->isChecked() )
                 page3->raiseWidget( stack2Page4 );
             else if( radioJavaScript->isChecked() ) 
             {
@@ -448,8 +448,8 @@ void TokenDialog::enableControls()
         listVariable->isEnabled() && listVariable->currentItem() != -1 ) 
         setFinishEnabled( page3, true );
 
-    buttonQuery->setEnabled( radioSTQLQuery->isChecked() && !editQuery->text().isEmpty() && SqlTables::isConnected() );
-    if( radioSTQLQuery->isChecked() && !editQuery->text().isEmpty() ) 
+    buttonQuery->setEnabled( radioSQLQuery->isChecked() && !editQuery->text().isEmpty() && SqlTables::isConnected() );
+    if( radioSQLQuery->isChecked() && !editQuery->text().isEmpty() ) 
         setFinishEnabled( page3, true );
 
     if( radioJavaScript->isChecked() && !editJavaScript->text().isEmpty() )
diff --git a/kbarcode/tokendialog.h b/kbarcode/tokendialog.h
index 017004c..8b02235 100644
--- a/kbarcode/tokendialog.h
+++ b/kbarcode/tokendialog.h
@@ -87,7 +87,7 @@ class TokenDialog : public KWizard {
     TQRadioButton* radioCustom;
     TQRadioButton* radioAddress;
 
-    TQRadioButton* radioSTQLQuery;
+    TQRadioButton* radioSQLQuery;
     TQRadioButton* radioVariable;
     TQRadioButton* radioJavaScript;