diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index a3cd69d8..7d57f377 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -145,18 +145,18 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'TTQ_INT16' => 'short',
-   'TTQ_INT32' => 'int',
-   'TTQ_INT64' => 'long',
-   'TTQ_INT8' => 'char',
-   'TTQ_LONG' => 'long',
-   'TTQ_LLONG' => 'long',
+   'TQ_INT16' => 'short',
+   'TQ_INT32' => 'int',
+   'TQ_INT64' => 'long',
+   'TQ_INT8' => 'char',
+   'TQ_LONG' => 'long',
+   'TQ_LLONG' => 'long',
    'TQ_ULLONG' => 'long',
-   'TTQ_UINT16' => 'ushort',
-   'TTQ_UINT32' => 'uint',
-   'TTQ_UINT64' => 'long',
-   'TTQ_UINT8' => 'uchar',
-   'TTQ_ULONG' => 'long',
+   'TQ_UINT16' => 'ushort',
+   'TQ_UINT32' => 'uint',
+   'TQ_UINT64' => 'long',
+   'TQ_UINT8' => 'uchar',
+   'TQ_ULONG' => 'long',
    'pid_t' => 'int',
    'size_t' => 'int',
    'pid_t' => 'int',
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index 41e33ef6..59a5444d 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -143,18 +143,18 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'TTQ_INT16' => 'short',
-   'TTQ_INT32' => 'int',
-   'TTQ_INT64' => 'long',
-   'TTQ_INT8' => 'char',
-   'TTQ_LONG' => 'long',
-   'TTQ_LLONG' => 'long',
+   'TQ_INT16' => 'short',
+   'TQ_INT32' => 'int',
+   'TQ_INT64' => 'long',
+   'TQ_INT8' => 'char',
+   'TQ_LONG' => 'long',
+   'TQ_LLONG' => 'long',
    'TQ_ULLONG' => 'long',
-   'TTQ_UINT16' => 'ushort',
-   'TTQ_UINT32' => 'uint',
-   'TTQ_UINT64' => 'long',
-   'TTQ_UINT8' => 'uchar',
-   'TTQ_ULONG' => 'long',
+   'TQ_UINT16' => 'ushort',
+   'TQ_UINT32' => 'uint',
+   'TQ_UINT64' => 'long',
+   'TQ_UINT8' => 'uchar',
+   'TQ_ULONG' => 'long',
    'pid_t' => 'int',
    'size_t' => 'int',
    'pid_t' => 'int',
diff --git a/qtjava/javalib/org/trinitydesktop/qt/TQVariant.java b/qtjava/javalib/org/trinitydesktop/qt/TQVariant.java
index c2a24616..2e9e7994 100644
--- a/qtjava/javalib/org/trinitydesktop/qt/TQVariant.java
+++ b/qtjava/javalib/org/trinitydesktop/qt/TQVariant.java
@@ -252,7 +252,7 @@ public class TQVariant implements QtSupport {
 	public native TQPen asPen();
 	public native int asInt();
 	public native int asUInt();
-	// TTQ_LLONG& asLongLong(); >>>> NOT CONVERTED
+	// TQ_LLONG& asLongLong(); >>>> NOT CONVERTED
 	// TQ_ULLONG& asULongLong(); >>>> NOT CONVERTED
 	public native boolean asBool();
 	public native double asDouble();
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index f56884ad..fa789e9e 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -1904,16 +1904,16 @@ TypeHandler Qt_handlers[] = {
     { "TQStrList*", marshall_TQStrList },
     { "long long int", marshall_longlong },
     { "long long int&", marshall_longlong },
-    { "TTQ_INT64", marshall_longlong },
-    { "TTQ_INT64&", marshall_longlong },
-    { "TTQ_LLONG", marshall_longlong },
-    { "TTQ_LLONG&", marshall_longlong },
+    { "TQ_INT64", marshall_longlong },
+    { "TQ_INT64&", marshall_longlong },
+    { "TQ_LLONG", marshall_longlong },
+    { "TQ_LLONG&", marshall_longlong },
     { "TDEIO::filesize_t", marshall_longlong },
     { "DOM::DOMTimeStamp", marshall_ulonglong },
     { "unsigned long long int", marshall_ulonglong },
     { "unsigned long long int&", marshall_ulonglong },
-    { "TTQ_UINT64", marshall_ulonglong },
-    { "TTQ_UINT64&", marshall_ulonglong },
+    { "TQ_UINT64", marshall_ulonglong },
+    { "TQ_UINT64&", marshall_ulonglong },
     { "TQ_ULLONG", marshall_ulonglong },
     { "TQ_ULLONG&", marshall_ulonglong },
     { "signed int&", marshall_intR },