diff --git a/acinclude.m4 b/acinclude.m4
index 6bf662b..009312d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -288,7 +288,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,
 [
    qt_bindirs=""
    for dir in $kde_qt_dirs; do
@@ -1226,7 +1226,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])
@@ -1509,7 +1509,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
 
@@ -1532,14 +1532,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
 
@@ -1648,7 +1648,7 @@ dnl
 AC_DEFUN(AC_BASE_PATH_KDE,
 [
 AC_PREREQ([2.13])
-AC_REQUIRE([AC_PATH_QT])dnl
+AC_REQUIRE([AC_PATH_TQT])dnl
 AC_REQUIRE([KDE_CHECK_LIB64])
 
 AC_CHECK_RPATH
@@ -5025,7 +5025,7 @@ fi
 AC_SUBST(LEXLIB)
 ])
 
-AC_DEFUN(AC_PATH_QTOPIA,
+AC_DEFUN(AC_PATH_TQTOPIA,
 [
   dnl TODO: use AC_CACHE_VAL
 
@@ -5042,7 +5042,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 6e79440..3060976 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -300,7 +300,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,
 [
    qt_bindirs=""
    for dir in $kde_qt_dirs; do
@@ -1238,7 +1238,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])
@@ -1521,7 +1521,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
 
@@ -1544,14 +1544,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
 
@@ -1660,7 +1660,7 @@ dnl
 AC_DEFUN(AC_BASE_PATH_KDE,
 [
 AC_PREREQ([2.13])
-AC_REQUIRE([AC_PATH_QT])dnl
+AC_REQUIRE([AC_PATH_TQT])dnl
 AC_REQUIRE([KDE_CHECK_LIB64])
 
 AC_CHECK_RPATH
@@ -5037,7 +5037,7 @@ fi
 AC_SUBST(LEXLIB)
 ])
 
-AC_DEFUN(AC_PATH_QTOPIA,
+AC_DEFUN(AC_PATH_TQTOPIA,
 [
   dnl TODO: use AC_CACHE_VAL
 
@@ -5054,7 +5054,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])