diff --git a/acinclude.m4 b/acinclude.m4
index df6df60..5c22d71 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -299,7 +299,7 @@ dnl Find the meta object compiler and the ui compiler in the PATH,
 dnl in $QTDIR/bin, and some more usual places
 dnl ------------------------------------------------------------------------
 dnl
-AC_DEFUN([AC_PATH_QT_MOC_UIC],
+AC_DEFUN([AC_PATH_TQT_MOC_UIC],
 [
    AC_REQUIRE([KDE_CHECK_PERL])
    qt_bindirs=""
@@ -1273,7 +1273,7 @@ dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
 dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
-AC_DEFUN([AC_PATH_QT_1_3],
+AC_DEFUN([AC_PATH_TQT_1_3],
 [
 AC_REQUIRE([K_PATH_X])
 AC_REQUIRE([KDE_USE_QT])
@@ -1556,7 +1556,7 @@ test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
 AC_SUBST(QT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
-AC_PATH_QT_MOC_UIC
+AC_PATH_TQT_MOC_UIC
 
 KDE_CHECK_QT_JPEG
 
@@ -1579,14 +1579,14 @@ AC_SUBST(LIB_QPE)
 AC_SUBST(kde_qtver)
 ])
 
-AC_DEFUN([AC_PATH_QT],
+AC_DEFUN([AC_PATH_TQT],
 [
-AC_PATH_QT_1_3
+AC_PATH_TQT_1_3
 ])
 
 AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
 [
-AC_REQUIRE([AC_PATH_QT_MOC_UIC])
+AC_REQUIRE([AC_PATH_TQT_MOC_UIC])
 
 if test x$ac_uic_supports_libpath = xyes; then
 
@@ -1713,7 +1713,7 @@ dnl
 AC_DEFUN([AC_BASE_PATH_KDE],
 [
 AC_REQUIRE([KDE_CHECK_STL])
-AC_REQUIRE([AC_PATH_QT])dnl
+AC_REQUIRE([AC_PATH_TQT])dnl
 AC_REQUIRE([KDE_CHECK_LIB64])
 
 AC_CHECK_RPATH
@@ -5007,7 +5007,7 @@ fi
 AC_SUBST(LEXLIB)
 ])
 
-AC_DEFUN([AC_PATH_QTOPIA],
+AC_DEFUN([AC_PATH_TQTOPIA],
 [
   dnl TODO: use AC_CACHE_VAL
 
@@ -5024,7 +5024,7 @@ AC_DEFUN([AC_PATH_QTOPIA],
   qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
   qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
 
-  AC_REQUIRE([AC_PATH_QT])
+  AC_REQUIRE([AC_PATH_TQT])
 
   AC_MSG_CHECKING([for Qtopia])
 
diff --git a/aclocal.m4 b/aclocal.m4
index 83817b9..adade5c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -311,7 +311,7 @@ dnl Find the meta object compiler and the ui compiler in the PATH,
 dnl in $QTDIR/bin, and some more usual places
 dnl ------------------------------------------------------------------------
 dnl
-AC_DEFUN([AC_PATH_QT_MOC_UIC],
+AC_DEFUN([AC_PATH_TQT_MOC_UIC],
 [
    AC_REQUIRE([KDE_CHECK_PERL])
    qt_bindirs=""
@@ -1285,7 +1285,7 @@ dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
 dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
 dnl ------------------------------------------------------------------------
 dnl
-AC_DEFUN([AC_PATH_QT_1_3],
+AC_DEFUN([AC_PATH_TQT_1_3],
 [
 AC_REQUIRE([K_PATH_X])
 AC_REQUIRE([KDE_USE_QT])
@@ -1568,7 +1568,7 @@ test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
 
 AC_SUBST(QT_INCLUDES)
 AC_SUBST(QT_LDFLAGS)
-AC_PATH_QT_MOC_UIC
+AC_PATH_TQT_MOC_UIC
 
 KDE_CHECK_QT_JPEG
 
@@ -1591,14 +1591,14 @@ AC_SUBST(LIB_QPE)
 AC_SUBST(kde_qtver)
 ])
 
-AC_DEFUN([AC_PATH_QT],
+AC_DEFUN([AC_PATH_TQT],
 [
-AC_PATH_QT_1_3
+AC_PATH_TQT_1_3
 ])
 
 AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
 [
-AC_REQUIRE([AC_PATH_QT_MOC_UIC])
+AC_REQUIRE([AC_PATH_TQT_MOC_UIC])
 
 if test x$ac_uic_supports_libpath = xyes; then
 
@@ -1725,7 +1725,7 @@ dnl
 AC_DEFUN([AC_BASE_PATH_KDE],
 [
 AC_REQUIRE([KDE_CHECK_STL])
-AC_REQUIRE([AC_PATH_QT])dnl
+AC_REQUIRE([AC_PATH_TQT])dnl
 AC_REQUIRE([KDE_CHECK_LIB64])
 
 AC_CHECK_RPATH
@@ -5019,7 +5019,7 @@ fi
 AC_SUBST(LEXLIB)
 ])
 
-AC_DEFUN([AC_PATH_QTOPIA],
+AC_DEFUN([AC_PATH_TQTOPIA],
 [
   dnl TODO: use AC_CACHE_VAL
 
@@ -5036,7 +5036,7 @@ AC_DEFUN([AC_PATH_QTOPIA],
   qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
   qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
 
-  AC_REQUIRE([AC_PATH_QT])
+  AC_REQUIRE([AC_PATH_TQT])
 
   AC_MSG_CHECKING([for Qtopia])