Rename library from telepathy-qt4 to telepathy-qt.

32 files changed, 124 insertions, 124 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c55b63d7..77da3f11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ else (${TP_QT_NANO_VERSION} EQUAL 0)
     set(TP_QT_LIBRARY_VERSION ${TP_QT_ABI_VERSION}.${TP_QT_MAJOR_VERSION}.${TP_QT_MINOR_VERSION}.${TP_QT_MICRO_VERSION}.${TP_QT_NANO_VERSION})
 endif (${TP_QT_NANO_VERSION} EQUAL 0)
 
-set(PACKAGE_NAME telepathy-qt4)
+set(PACKAGE_NAME telepathy-qt)
 
 if (${TP_QT_NANO_VERSION} EQUAL 0)
     set(PACKAGE_VERSION ${TP_QT_MAJOR_VERSION}.${TP_QT_MINOR_VERSION}.${TP_QT_MICRO_VERSION})
@@ -164,13 +164,13 @@ find_package(TelepathyFarsight)
 macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
                   "A Framework for dealing with audio/video conferencing protocols"
                   "http://farsight.freedesktop.org/wiki/" FALSE "0.0.4"
-                  "Needed, together with GStreamer, to build telepathy-qt4-farsight and some additional examples")
+                  "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
 
 # Find GStreamer
 find_package(GStreamer)
 macro_log_feature(GSTREAMER_FOUND "GStreamer"
                   "An open source multimedia framework"
-                  "Needed, together with Tp-Farsight, to build telepathy-qt4-farsight and some additional examples"
+                  "Needed, together with Tp-Farsight, to build telepathy-qt-farsight and some additional examples"
                   "http://www.gstreamer.net/" FALSE)
 
 # Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found
diff --git a/HACKING b/HACKING
index 1a682cbd..0b7cd156 100644
--- a/HACKING
+++ b/HACKING
@@ -11,15 +11,15 @@ Contents:
 Version control
 ===============================================================================
 
-The current development version of telepathy-qt4 is available from the
+The current development version of telepathy-qt is available from the
 'master' branch in the git repository:
 
-  <git://anongit.freedesktop.org/telepathy/telepathy-qt4>
-  <ssh://git.freedesktop.org/git/telepathy/telepathy-qt4> (for committers)
-  <http://cgit.freedesktop.org/telepathy/telepathy-qt4/> (cgit)
+  <git://anongit.freedesktop.org/telepathy/telepathy-qt>
+  <ssh://git.freedesktop.org/git/telepathy/telepathy-qt> (for committers)
+  <http://cgit.freedesktop.org/telepathy/telepathy-qt/> (cgit)
 
 Stable branches are available from branches with names like
-'telepathy-qt4-0.2' in the same repository.
+'telepathy-qt-0.2' in the same repository.
 
 
 ===============================================================================
@@ -97,14 +97,14 @@ Submitting patches
 Patches should be made as (preferably) git branches or (last resort) -uNr diffs
 against upstream git master, as found at:
 
-  git://anongit.freedesktop.org/telepathy/telepathy-qt4
-  ssh://git.freedesktop.org/git/telepathy/telepathy-qt4 (for committers)
-  http://cgit.freedesktop.org/telepathy/telepathy-qt4/ (cgit)
+  git://anongit.freedesktop.org/telepathy/telepathy-qt
+  ssh://git.freedesktop.org/git/telepathy/telepathy-qt (for committers)
+  http://cgit.freedesktop.org/telepathy/telepathy-qt/ (cgit)
 
 Patches can be announced at the freedesktop.org bugzilla, using the product
-"Telepathy" and component "tp-qt4":
+"Telepathy" and component "tp-qt":
 
-  https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-qt4
+  https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-qt
 
 If submitting a Git branch, please set the URL field of the bug to point to
 your Git branch. Regardless of whether you are referring to a Git branch or
diff --git a/README b/README
index 91adc334..50c5fa52 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 =============
-telepathy-qt4
+telepathy-qt
 =============
 
 This is a library for Qt-based Telepathy clients.
@@ -22,7 +22,7 @@ the specification that this library claims to implement. The HTML documentation
 Requirements
 ============
 
-Building telepathy-qt4 requires:
+Building telepathy-qt requires:
   Qt, including QtDBus <http://www.qtsoftware.com/>
 
   GNU make <http://www.gnu.org/software/make/>
@@ -47,7 +47,7 @@ Bugs, feature requests and to-do list
 =====================================
 
 Report all bugs, feature requests and "to-do" items here:
-  <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-qt4>
+  <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-qt>
 
 Running "make check" will produce FIXME.out, which lists all the mentions of
 FIXME, TODO or XXX in the source code. Ideally, all of these should be in
diff --git a/TelepathyQt/dbus-proxy-factory-internal.h b/TelepathyQt/dbus-proxy-factory-internal.h
index d5fbdbb8..72af03a0 100644
--- a/TelepathyQt/dbus-proxy-factory-internal.h
+++ b/TelepathyQt/dbus-proxy-factory-internal.h
@@ -21,7 +21,7 @@
  */
 
 #ifndef BUILDING_TP_QT
-#error "This file is a TpQt4 internal header not to be included by applications"
+#error "This file is a TpQt internal header not to be included by applications"
 #endif
 
 #include <QObject>
diff --git a/TelepathyQt/debug.cpp b/TelepathyQt/debug.cpp
index 783b41d9..51e4e356 100644
--- a/TelepathyQt/debug.cpp
+++ b/TelepathyQt/debug.cpp
@@ -30,7 +30,7 @@
  * \defgroup debug Common debug support
  *
  * TelepathyQt has an internal mechanism for displaying debugging output. It
- * uses the Qt4 debugging subsystem, so if you want to redirect the messages,
+ * uses the Qt debugging subsystem, so if you want to redirect the messages,
  * use qInstallMsgHandler() from &lt;QtGlobal&gt;.
  *
  * Debugging output is divided into two categories: normal debug output and
@@ -139,14 +139,14 @@ Debug enabledWarning()
 void Debug::invokeDebugCallback()
 {
     if (debugCallback) {
-        debugCallback(QLatin1String("tp-qt4"), QLatin1String(PACKAGE_VERSION), type, msg);
+        debugCallback(QLatin1String("tp-qt"), QLatin1String(PACKAGE_VERSION), type, msg);
     } else {
         switch (type) {
         case QtDebugMsg:
-            qDebug() << "tp-qt4 " PACKAGE_VERSION " DEBUG:" << qPrintable(msg);
+            qDebug() << "tp-qt " PACKAGE_VERSION " DEBUG:" << qPrintable(msg);
             break;
         case QtWarningMsg:
-            qWarning() << "tp-qt4 " PACKAGE_VERSION " WARN:" << qPrintable(msg);
+            qWarning() << "tp-qt " PACKAGE_VERSION " WARN:" << qPrintable(msg);
             break;
         default:
             break;
diff --git a/TelepathyQt/global.h b/TelepathyQt/global.h
index eb2111ec..1ce393bc 100644
--- a/TelepathyQt/global.h
+++ b/TelepathyQt/global.h
@@ -45,7 +45,7 @@
 
 /**
  * @def TP_QT_DEPRECATED
- * @ingroup TELEPATHY_QT4_MACROS
+ * @ingroup TELEPATHY_QT_MACROS
  *
  * The TP_QT_DEPRECATED macro can be used to trigger compile-time
  * warnings with newer compilers when deprecated functions are used.
diff --git a/TelepathyQt/outgoing-stream-tube-channel.cpp b/TelepathyQt/outgoing-stream-tube-channel.cpp
index 22af7b8f..d570cb79 100644
--- a/TelepathyQt/outgoing-stream-tube-channel.cpp
+++ b/TelepathyQt/outgoing-stream-tube-channel.cpp
@@ -141,7 +141,7 @@ void QueuedContactFactory::processNextRequest()
     // TODO: pass id hints to ContactManager if we ever gain support to retrieve contact ids
     //       from NewRemoteConnection.
     PendingContacts *pc = m_manager->contactsForHandles(entry.handles);
-    pc->setProperty("__TpQt4__QueuedContactFactoryUuid", entry.uuid.toString());
+    pc->setProperty("__TpQt__QueuedContactFactoryUuid", entry.uuid.toString());
     connect(pc, SIGNAL(finished(Tp::PendingOperation*)),
             this, SLOT(onPendingContactsFinished(Tp::PendingOperation*)));
 }
@@ -165,7 +165,7 @@ void QueuedContactFactory::onPendingContactsFinished(PendingOperation *op)
 {
     PendingContacts *pc = qobject_cast<PendingContacts*>(op);
 
-    QUuid uuid = QUuid(pc->property("__TpQt4__QueuedContactFactoryUuid").toString());
+    QUuid uuid = QUuid(pc->property("__TpQt__QueuedContactFactoryUuid").toString());
 
     emit contactsRetrieved(uuid, pc->contacts());
 
diff --git a/TelepathyQt/pending-channel.cpp b/TelepathyQt/pending-channel.cpp
index 3207700b..7b1e1133 100644
--- a/TelepathyQt/pending-channel.cpp
+++ b/TelepathyQt/pending-channel.cpp
@@ -190,7 +190,7 @@ PendingChannel::PendingChannel(const AccountPtr &account,
     mPriv->notifier = 0;
     mPriv->create = create;
 
-    QString handlerName = QString(QLatin1String("TpQt4RaH_%1_%2"))
+    QString handlerName = QString(QLatin1String("TpQtRaH_%1_%2"))
         .arg(account->dbusConnection().baseService()
             .replace(QLatin1String(":"), QLatin1String("_"))
             .replace(QLatin1String("."), QLatin1String("_")))
diff --git a/TelepathyQt/simple-observer.cpp b/TelepathyQt/simple-observer.cpp
index 44bfff19..b12e3879 100644
--- a/TelepathyQt/simple-observer.cpp
+++ b/TelepathyQt/simple-observer.cpp
@@ -70,7 +70,7 @@ SimpleObserver::Private::Private(SimpleObserver *parent,
                 account->channelFactory(),
                 account->contactFactory());
 
-        QString observerName = QString(QLatin1String("TpQt4SO_%1_%2"))
+        QString observerName = QString(QLatin1String("TpQtSO_%1_%2"))
             .arg(account->dbusConnection().baseService()
                 .replace(QLatin1String(":"), QLatin1String("_"))
                 .replace(QLatin1String("."), QLatin1String("_")))
diff --git a/TelepathyQt/stream-tube-client.cpp b/TelepathyQt/stream-tube-client.cpp
index 85ee2001..bb572c34 100644
--- a/TelepathyQt/stream-tube-client.cpp
+++ b/TelepathyQt/stream-tube-client.cpp
@@ -206,7 +206,7 @@ struct TP_QT_NO_EXPORT StreamTubeClient::Private
           tcpGenerator(0), requireCredentials(false)
     {
         if (clientName.isEmpty()) {
-            clientName = QString::fromLatin1("TpQt4STubeClient_%1_%2")
+            clientName = QString::fromLatin1("TpQtSTubeClient_%1_%2")
                 .arg(registrar->dbusConnection().baseService()
                         .replace(QLatin1Char(':'), QLatin1Char('_'))
                         .replace(QLatin1Char('.'), QLatin1Char('_')))
diff --git a/TelepathyQt/stream-tube-server.cpp b/TelepathyQt/stream-tube-server.cpp
index 56e0afe2..ffd471e8 100644
--- a/TelepathyQt/stream-tube-server.cpp
+++ b/TelepathyQt/stream-tube-server.cpp
@@ -303,7 +303,7 @@ struct StreamTubeServer::Private
           generator(0)
     {
         if (clientName.isEmpty()) {
-            clientName = QString::fromLatin1("TpQt4STubeServer_%1_%2")
+            clientName = QString::fromLatin1("TpQtSTubeServer_%1_%2")
                 .arg(registrar->dbusConnection().baseService()
                         .replace(QLatin1Char(':'), QLatin1Char('_'))
                         .replace(QLatin1Char('.'), QLatin1Char('_')))
diff --git a/cmake/modules/TpQtMacros.cmake b/cmake/modules/TpQtMacros.cmake
index efbeb4ad..d2d93e87 100644
--- a/cmake/modules/TpQtMacros.cmake
+++ b/cmake/modules/TpQtMacros.cmake
@@ -19,7 +19,7 @@
 #          Internal macro used to extract arguments from ARGN
 #
 # function TPQT_CREATE_MOC_COMMAND_TARGET_DEPS(inputfile outputfile moc_flags moc_options target_dependencies ...)
-#          This function behaves exactly like qt4_create_moc_command, but creates a custom target for the
+#          This function behaves exactly like qt_create_moc_command, but creates a custom target for the
 #          moc file generation, allowing to specify a list of targets the generated moc target will depend on.
 #          Just like qt4_create_moc_command, it is an internal macro and it's not meant to be used explicitely.
 #
@@ -38,12 +38,12 @@
 #          target's sources.
 #
 # function TPQT_CLIENT_GENERATOR(spec group pretty_include namespace [arguments] [DEPENDS dependencies ...])
-#          This function takes care of invoking qt4-client-gen.py with the correct arguments, which generates
+#          This function takes care of invoking qt-client-gen.py with the correct arguments, which generates
 #          headers out of specs. spec is the name of the spec headers will be generated from, group represents
 #          the spec's group, pretty_include is the name of the capitalized header (for example ClientGenerator),
 #          namespace is the C++ namespace the generated header will belong to. This function also accepts
 #          as an optional last argument a list of additional command line arguments which will be passed to
-#          qt4-client-gen.py upon execution. After issuing DEPENDS in the last argument you can pass a list of targets
+#          qt-client-gen.py upon execution. After issuing DEPENDS in the last argument you can pass a list of targets
 #          the generated target will depend on.
 #
 # function TPQT_FUTURE_CLIENT_GENERATOR(spec namespace [arguments] [DEPENDS dependencies ...])
@@ -62,22 +62,22 @@
 #          After issuing DEPENDS in the last argument you can pass a list of targets the generated target will depend on.
 #
 # function TPQT_CONSTANTS_GEN (TARGET_NAME SPEC_XML OUTPUT_FILE [additional_arguments ...] [DEPENDS dependencies ...])
-#          This function takes care of invoking qt4-constants-gen.py with the correct arguments. TARGET_NAME is the name of
+#          This function takes care of invoking qt-constants-gen.py with the correct arguments. TARGET_NAME is the name of
 #          the generated target (see preamble), SPEC_XML is the spec input file, OUTPUT_FILE is the filename
 #          the generated file will be saved to. This function also accepts as an optional last argument a list of
-#          additional command line arguments which will be passed to qt4-constants-gen.py upon execution.
+#          additional command line arguments which will be passed to qt-constants-gen.py upon execution.
 #          After issuing DEPENDS in the last argument you can pass a list of targets the generated target will depend on.
 #
 # function TPQT_TYPES_GEN (TARGET_NAME SPEC_XML OUTFILE_DECL OUTFILE_IMPL NAMESPACE
 #                           REAL_INCLUDE PRETTY_INCLUDE [additional_arguments ...] [DEPENDS dependencies ...])
-#          This function takes care of invoking qt4-types-gen.py with the correct arguments. TARGET_NAME is the name of
+#          This function takes care of invoking qt-types-gen.py with the correct arguments. TARGET_NAME is the name of
 #          the generated target (see preamble), SPEC_XML is the input spec file, OUTFILE_DECL is the filename
 #          the header of the generated file will be saved to, OUTFILE_IMPL is the filename the implementation of the
 #          generated file will be saved to, NAMESPACE is the C++ namespace the generated header will belong to,
 #          REAL_INCLUDE is the real include file you want to use, PRETTY_INCLUDE is the name of the capitalized header
 #          (for example ClientGenerator).
 #          This function also accepts as an optional last argument a list of additional command line arguments
-#          which will be passed to qt4-constants-gen.py upon execution.
+#          which will be passed to qt-constants-gen.py upon execution.
 #          After issuing DEPENDS in the last argument you can pass a list of targets the generated target will depend on.
 #
 # macro TPQT_ADD_GENERIC_UNIT_TEST (fancyName name [libraries ...])
@@ -187,7 +187,7 @@ endfunction(tpqt_generate_mocs)
 function(tpqt_client_generator spec group pretty_include namespace)
     tpqt_extract_depends(client_generator_args client_generator_depends ${ARGN})
     set(ARGS
-        ${CMAKE_SOURCE_DIR}/tools/qt4-client-gen.py
+        ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py
             --group=${group}
             --namespace=${namespace}
             --typesnamespace=Tp
@@ -206,8 +206,8 @@ function(tpqt_client_generator spec group pretty_include namespace)
         ARGS ${ARGS}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 
-        DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqt4codegen.py
-                ${CMAKE_SOURCE_DIR}/tools/qt4-client-gen.py)
+        DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
+                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
     add_custom_target(generate_cli-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp)
     add_dependencies(all-generated-sources generate_cli-${spec}-body)
 
@@ -218,13 +218,13 @@ function(tpqt_client_generator spec group pretty_include namespace)
     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h
                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.moc.hpp
                        "generate_cli-${spec}-body")
-    list(APPEND telepathy_qt4_SRCS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.moc.hpp)
+    list(APPEND telepathy_qt_SRCS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.moc.hpp)
 endfunction(tpqt_client_generator spec group pretty_include namespace)
 
 function(tpqt_future_client_generator spec namespace)
     tpqt_extract_depends(future_client_generator_args future_client_generator_depends ${ARGN})
     set(ARGS
-        ${CMAKE_SOURCE_DIR}/tools/qt4-client-gen.py
+        ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py
             --namespace=${namespace}
             --typesnamespace=TpFuture
             --headerfile=${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h
@@ -243,8 +243,8 @@ function(tpqt_future_client_generator spec namespace)
         ARGS ${ARGS}
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 
-        DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqt4codegen.py
-                ${CMAKE_SOURCE_DIR}/tools/qt4-client-gen.py)
+        DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
+                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
     add_custom_target(generate_future-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp)
     add_dependencies(all-generated-sources generate_future-${spec}-body)
 
@@ -308,13 +308,13 @@ function(tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE)
 
                        COMMAND ${PYTHON_EXECUTABLE}
 
-                       ARGS    ${CMAKE_SOURCE_DIR}/tools/qt4-constants-gen.py
+                       ARGS    ${CMAKE_SOURCE_DIR}/tools/qt-constants-gen.py
                                ${constants_gen_args}
                                --specxml=${_SPEC_XML}
                                > ${_OUTFILE}
 
-                       DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqt4codegen.py
-                               ${CMAKE_SOURCE_DIR}/tools/qt4-constants-gen.py
+                       DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
+                               ${CMAKE_SOURCE_DIR}/tools/qt-constants-gen.py
                                ${_SPEC_XML} ${depends_xml_files})
     add_custom_target(${_TARGET_NAME} DEPENDS ${_OUTFILE})
     add_dependencies(all-generated-sources ${_TARGET_NAME})
@@ -331,7 +331,7 @@ function(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAME
 
     add_custom_command(OUTPUT ${_OUTFILE_DECL} ${_OUTFILE_IMPL}
                        COMMAND ${PYTHON_EXECUTABLE}
-                       ARGS ${CMAKE_SOURCE_DIR}/tools/qt4-types-gen.py
+                       ARGS ${CMAKE_SOURCE_DIR}/tools/qt-types-gen.py
                             --namespace=${_NAMESPACE}
                             --declfile=${_OUTFILE_DECL}
                             --implfile=${_OUTFILE_IMPL}
@@ -340,8 +340,8 @@ function(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAME
                             ${types_gen_args}
                             --specxml=${_SPEC_XML}
 
-                       DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqt4codegen.py
-                               ${CMAKE_SOURCE_DIR}/tools/qt4-types-gen.py
+                       DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
+                               ${CMAKE_SOURCE_DIR}/tools/qt-types-gen.py
                                ${_SPEC_XML} ${depends_xml_files})
     add_custom_target(${_TARGET_NAME} DEPENDS ${_OUTFILE_IMPL})
     add_dependencies(all-generated-sources ${_TARGET_NAME})
@@ -354,9 +354,9 @@ endfunction(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _N
 macro(tpqt_add_generic_unit_test _fancyName _name)
     tpqt_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
     add_executable(test-${_name} ${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
-    target_link_libraries(test-${_name} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} telepathy-qt4 tp-qt4-tests ${ARGN})
+    target_link_libraries(test-${_name} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} telepathy-qt tp-qt-tests ${ARGN})
     add_test(${_fancyName} ${SH} ${CMAKE_CURRENT_BINARY_DIR}/runGenericTest.sh ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
-    list(APPEND _telepathy_qt4_test_cases test-${_name})
+    list(APPEND _telepathy_qt_test_cases test-${_name})
 
     # Valgrind and Callgrind targets
     _tpqt_add_check_targets(${_fancyName} ${_name} ${CMAKE_CURRENT_BINARY_DIR}/runGenericTest.sh ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
@@ -365,10 +365,10 @@ endmacro(tpqt_add_generic_unit_test _fancyName _name)
 macro(tpqt_add_dbus_unit_test _fancyName _name)
     tpqt_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
     add_executable(test-${_name} ${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
-    target_link_libraries(test-${_name} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} telepathy-qt4 tp-qt4-tests ${ARGN})
+    target_link_libraries(test-${_name} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} telepathy-qt tp-qt-tests ${ARGN})
     set(with_session_bus ${CMAKE_CURRENT_BINARY_DIR}/runDbusTest.sh)
     add_test(${_fancyName} ${SH} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
-    list(APPEND _telepathy_qt4_test_cases test-${_name})
+    list(APPEND _telepathy_qt_test_cases test-${_name})
 
     # Valgrind and Callgrind targets
     _tpqt_add_check_targets(${_fancyName} ${_name} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
@@ -400,7 +400,7 @@ macro(_tpqt_add_check_targets _fancyName _name _runnerScript)
                 --num-callers=20
                 --gen-suppressions=all
                 --log-file=${CMAKE_CURRENT_BINARY_DIR}/test-${_fancyName}.memcheck.log
-                --suppressions=${CMAKE_SOURCE_DIR}/tools/tp-qt4-tests.supp
+                --suppressions=${CMAKE_SOURCE_DIR}/tools/tp-qt-tests.supp
                 --suppressions=${CMAKE_SOURCE_DIR}/tools/telepathy-glib.supp
                 ${ARGN}
         WORKING_DIRECTORY
diff --git a/examples/accounts/CMakeLists.txt b/examples/accounts/CMakeLists.txt
index 055a7bc4..715c03d1 100644
--- a/examples/accounts/CMakeLists.txt
+++ b/examples/accounts/CMakeLists.txt
@@ -17,4 +17,4 @@ target_link_libraries(accounts
     ${QT_QTGUI_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    telepathy-qt4)
+    telepathy-qt)
diff --git a/examples/contact-messenger/CMakeLists.txt b/examples/contact-messenger/CMakeLists.txt
index ba7896fc..bc0e2a2f 100644
--- a/examples/contact-messenger/CMakeLists.txt
+++ b/examples/contact-messenger/CMakeLists.txt
@@ -11,4 +11,4 @@ target_link_libraries(messenger-sender
     ${QT_QTDBUS_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    telepathy-qt4)
+    telepathy-qt)
diff --git a/examples/extensions/CMakeLists.txt b/examples/extensions/CMakeLists.txt
index d3b244b4..2f3c3226 100644
--- a/examples/extensions/CMakeLists.txt
+++ b/examples/extensions/CMakeLists.txt
@@ -52,7 +52,7 @@ endif(MSVC)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-connection-body.hpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-connection.h
     COMMAND ${PYTHON_EXECUTABLE}
-    ARGS ${CMAKE_SOURCE_DIR}/tools/qt4-client-gen.py
+    ARGS ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py
          --namespace=Example::Client
          --typesnamespace=Example
          --headerfile=${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-connection.h
@@ -73,4 +73,4 @@ add_dependencies(example_extensions example-extensions-connection-generation)
 target_link_libraries(example_extensions
     ${QT_QTDBUS_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    telepathy-qt4)
+    telepathy-qt)
diff --git a/examples/file-transfer/CMakeLists.txt b/examples/file-transfer/CMakeLists.txt
index 8cc3e8d3..629bf232 100644
--- a/examples/file-transfer/CMakeLists.txt
+++ b/examples/file-transfer/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(ft-receiver
     ${QT_QTDBUS_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    telepathy-qt4)
+    telepathy-qt)
 
 set(ft-sender_SRCS
     file-sender.cpp
@@ -36,4 +36,4 @@ target_link_libraries(ft-sender
     ${QT_QTDBUS_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    telepathy-qt4)
+    telepathy-qt)
diff --git a/examples/file-transfer/file-receiver.cpp b/examples/file-transfer/file-receiver.cpp
index 00eb6d62..d8a03dba 100644
--- a/examples/file-transfer/file-receiver.cpp
+++ b/examples/file-transfer/file-receiver.cpp
@@ -48,7 +48,7 @@ FileReceiver::FileReceiver(QObject *parent)
 
     qDebug() << "Registering incoming file transfer handler";
     mHandler = FileReceiverHandler::create();
-    QString handlerName(QLatin1String("TpQt4ExampleFileReceiverHandler"));
+    QString handlerName(QLatin1String("TpQtExampleFileReceiverHandler"));
     if (!mCR->registerClient(AbstractClientPtr::dynamicCast(mHandler), handlerName)) {
         qWarning() << "Unable to register incoming file transfer handler, aborting";
         QCoreApplication::exit(1);
diff --git a/examples/file-transfer/pending-file-receive.cpp b/examples/file-transfer/pending-file-receive.cpp
index fd30aa91..dbbe3a65 100644
--- a/examples/file-transfer/pending-file-receive.cpp
+++ b/examples/file-transfer/pending-file-receive.cpp
@@ -60,7 +60,7 @@ void PendingFileReceive::onTransferStateChanged(FileTransferState state,
             IncomingFileTransferChannelPtr::qObjectCast(channel());
         Q_ASSERT(chan);
 
-        QString fileName(QLatin1String("TpQt4ExampleFTReceiver_") + chan->fileName());
+        QString fileName(QLatin1String("TpQtExampleFTReceiver_") + chan->fileName());
         fileName.replace(QLatin1String("/"), QLatin1String("_"));
         mFile.setFileName(fileName);
 
diff --git a/examples/protocols/CMakeLists.txt b/examples/protocols/CMakeLists.txt
index 2125f973..c226bbb9 100644
--- a/examples/protocols/CMakeLists.txt
+++ b/examples/protocols/CMakeLists.txt
@@ -15,4 +15,4 @@ target_link_libraries(protocols
     ${QT_QTGUI_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    telepathy-qt4)
+    telepathy-qt)
diff --git a/examples/roster/CMakeLists.txt b/examples/roster/CMakeLists.txt
index 1cfdf3ad..a8443203 100644
--- a/examples/roster/CMakeLists.txt
+++ b/examples/roster/CMakeLists.txt
@@ -17,18 +17,18 @@ target_link_libraries(roster
     ${QT_QTGUI_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    telepathy-qt4)
+    telepathy-qt)
 
-set(telepathy_qt4_examples_roster_SRCS
+set(telepathy_qt_examples_roster_SRCS
     roster-item.cpp
     roster-widget.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/_gen/roster-item.moc.hpp
     ${CMAKE_CURRENT_BINARY_DIR}/_gen/roster-widget.moc.hpp)
 
-add_library(telepathy-qt4-examples-roster ${telepathy_qt4_examples_roster_SRCS})
-target_link_libraries(telepathy-qt4-examples-roster
+add_library(telepathy-qt-examples-roster ${telepathy_qt_examples_roster_SRCS})
+target_link_libraries(telepathy-qt-examples-roster
     ${QT_QTDBUS_LIBRARY}
     ${QT_QTGUI_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    telepathy-qt4)
+    telepathy-qt)
diff --git a/examples/stream-tubes/CMakeLists.txt b/examples/stream-tubes/CMakeLists.txt
index 65a69321..c286de49 100644
--- a/examples/stream-tubes/CMakeLists.txt
+++ b/examples/stream-tubes/CMakeLists.txt
@@ -11,7 +11,7 @@ target_link_libraries(tubereceiver
     ${QT_QTDBUS_LIBRARY}
     ${QT_QTGUI_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    telepathy-qt4)
+    telepathy-qt)
 
 set(tubeinitiator_SRCS
     tube-initiator.cpp)
@@ -26,4 +26,4 @@ target_link_libraries(tubeinitiator
     ${QT_QTDBUS_LIBRARY}
     ${QT_QTGUI_LIBRARY}
     ${QT_QTCORE_LIBRARY}
-    telepathy-qt4)
+    telepathy-qt)
diff --git a/tests/dbus/CMakeLists.txt b/tests/dbus/CMakeLists.txt
index f38afdd3..2f8e6917 100644
--- a/tests/dbus/CMakeLists.txt
+++ b/tests/dbus/CMakeLists.txt
@@ -14,46 +14,46 @@ if(ENABLE_TP_GLIB_TESTS)
     add_definitions(-DQT_NO_KEYWORDS)
 
     if(HAVE_TEST_PYTHON)
-        tpqt_add_dbus_unit_test(AccountBasics account-basics tp-glib-tests tp-qt4-tests-glib-helpers)
-        tpqt_add_dbus_unit_test(AccountSet account-set tp-glib-tests tp-qt4-tests-glib-helpers)
-        tpqt_add_dbus_unit_test(AccountChannelDispatcher account-channel-dispatcher tp-glib-tests tp-qt4-tests-glib-helpers)
-        tpqt_add_dbus_unit_test(Client client tp-glib-tests tp-qt4-tests-glib-helpers)
+        tpqt_add_dbus_unit_test(AccountBasics account-basics tp-glib-tests tp-qt-tests-glib-helpers)
+        tpqt_add_dbus_unit_test(AccountSet account-set tp-glib-tests tp-qt-tests-glib-helpers)
+        tpqt_add_dbus_unit_test(AccountChannelDispatcher account-channel-dispatcher tp-glib-tests tp-qt-tests-glib-helpers)
+        tpqt_add_dbus_unit_test(Client client tp-glib-tests tp-qt-tests-glib-helpers)
         tpqt_add_dbus_unit_test(ClientFactories client-factories tp-glib-tests)
     endif(HAVE_TEST_PYTHON)
 
-    tpqt_add_dbus_unit_test(AccountConnectionFactory account-connection-factory tp-glib-tests tp-qt4-tests-glib-helpers)
-    tpqt_add_dbus_unit_test(ChannelBasics chan-basics tp-glib-tests tp-qt4-tests-glib-helpers)
-    tpqt_add_dbus_unit_test(ChannelConference chan-conference tp-glib-tests tp-qt4-tests-glib-helpers)
-    tpqt_add_dbus_unit_test(ChannelGroup chan-group tp-glib-tests tp-qt4-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(AccountConnectionFactory account-connection-factory tp-glib-tests tp-qt-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ChannelBasics chan-basics tp-glib-tests tp-qt-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ChannelConference chan-conference tp-glib-tests tp-qt-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ChannelGroup chan-group tp-glib-tests tp-qt-tests-glib-helpers)
     tpqt_add_dbus_unit_test(ConnectionManagerBasics cm-basics tp-glib-tests)
     tpqt_add_dbus_unit_test(ConnectionBasics conn-basics tp-glib-tests)
-    tpqt_add_dbus_unit_test(ConnectionCapabilities conn-capabilities tp-glib-tests tp-qt4-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ConnectionCapabilities conn-capabilities tp-glib-tests tp-qt-tests-glib-helpers)
     tpqt_add_dbus_unit_test(ConnectionIntrospectCornercases conn-introspect-cornercases tp-glib-tests)
-    tpqt_add_dbus_unit_test(ConnectionRequests conn-requests tp-glib-tests tp-qt4-tests-glib-helpers)
-    tpqt_add_dbus_unit_test(ConnectionRosterLegacy conn-roster-legacy tp-glib-tests tp-qt4-tests-glib-helpers)
-    tpqt_add_dbus_unit_test(ConnectionRoster conn-roster example-cm-contactlist2 tp-qt4-tests-glib-helpers
+    tpqt_add_dbus_unit_test(ConnectionRequests conn-requests tp-glib-tests tp-qt-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ConnectionRosterLegacy conn-roster-legacy tp-glib-tests tp-qt-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ConnectionRoster conn-roster example-cm-contactlist2 tp-qt-tests-glib-helpers
         ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${DBUS_GLIB_LIBRARIES} ${TELEPATHY_GLIB_LIBRARIES})
     tpqt_add_dbus_unit_test(ConnectionRosterGroupsLegacy conn-roster-groups-legacy tp-glib-tests)
     tpqt_add_dbus_unit_test(ConnectionRosterGroups conn-roster-groups example-cm-contactlist2
         ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${DBUS_GLIB_LIBRARIES} ${TELEPATHY_GLIB_LIBRARIES})
-    tpqt_add_dbus_unit_test(ContactFactory contact-factory tp-glib-tests tp-qt4-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ContactFactory contact-factory tp-glib-tests tp-qt-tests-glib-helpers)
     tpqt_add_dbus_unit_test(ContactMessenger contact-messenger tp-glib-tests)
-    tpqt_add_dbus_unit_test(ContactSearchChannel contact-search-chan tp-glib-tests tp-qt4-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ContactSearchChannel contact-search-chan tp-glib-tests tp-qt-tests-glib-helpers)
     tpqt_add_dbus_unit_test(Contacts contacts tp-glib-tests)
-    tpqt_add_dbus_unit_test(ContactsAvatar contacts-avatar tp-glib-tests tp-qt4-tests-glib-helpers)
-    tpqt_add_dbus_unit_test(ContactsCapabilities contacts-capabilities tp-glib-tests tp-qt4-tests-glib-helpers)
-    tpqt_add_dbus_unit_test(ContactsInfo contacts-info tp-glib-tests tp-qt4-tests-glib-helpers)
-    tpqt_add_dbus_unit_test(ContactsLocation contacts-location tp-glib-tests tp-qt4-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ContactsAvatar contacts-avatar tp-glib-tests tp-qt-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ContactsCapabilities contacts-capabilities tp-glib-tests tp-qt-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ContactsInfo contacts-info tp-glib-tests tp-qt-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(ContactsLocation contacts-location tp-glib-tests tp-qt-tests-glib-helpers)
     tpqt_add_dbus_unit_test(DBusProxyFactory dbus-proxy-factory tp-glib-tests)
-    tpqt_add_dbus_unit_test(Handles handles tp-glib-tests tp-qt4-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(Handles handles tp-glib-tests tp-qt-tests-glib-helpers)
     tpqt_add_dbus_unit_test(SimpleObserver simple-observer tp-glib-tests)
     tpqt_add_dbus_unit_test(StatefulProxy stateful-proxy tp-glib-tests)
-    tpqt_add_dbus_unit_test(StreamedMediaChannel streamed-media-chan tp-glib-tests tp-qt4-tests-glib-helpers)
-    tpqt_add_dbus_unit_test(StreamTubeHandlers stream-tube-handlers tp-glib-tests tp-qt4-tests-glib-helpers)
-    tpqt_add_dbus_unit_test(TextChannel text-chan tp-glib-tests tp-qt4-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(StreamedMediaChannel streamed-media-chan tp-glib-tests tp-qt-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(StreamTubeHandlers stream-tube-handlers tp-glib-tests tp-qt-tests-glib-helpers)
+    tpqt_add_dbus_unit_test(TextChannel text-chan tp-glib-tests tp-qt-tests-glib-helpers)
 
     if(ENABLE_TP_GLIB_GIO_TESTS)
-        tpqt_add_dbus_unit_test(StreamTubeChannel stream-tube-chan tp-glib-tests tp-qt4-tests-glib-helpers)
+        tpqt_add_dbus_unit_test(StreamTubeChannel stream-tube-chan tp-glib-tests tp-qt-tests-glib-helpers)
     endif(ENABLE_TP_GLIB_GIO_TESTS)
 endif(ENABLE_TP_GLIB_TESTS)
 
@@ -64,4 +64,4 @@ tpqt_add_dbus_unit_test(Types types)
 # This target has to stay here for catching all of the tests
 add_custom_target(check ctest --output-on-failure -O test.log
                   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tests)
-add_dependencies(check check-local ${_telepathy_qt4_test_cases})
+add_dependencies(check check-local ${_telepathy_qt_test_cases})
diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp
index 82d4ffd8..fc8dfad2 100644
--- a/tests/dbus/chan-group.cpp
+++ b/tests/dbus/chan-group.cpp
@@ -246,7 +246,7 @@ void TestChanGroup::testPropertylessGroup()
 
 void TestChanGroup::commonTest(gboolean properties)
 {
-    mChanObjectPath = QString(QLatin1String("%1/ChannelForTpQt4MCDTest%2"))
+    mChanObjectPath = QString(QLatin1String("%1/ChannelForTpQtMCDTest%2"))
         .arg(mConn->objectPath())
         .arg(QLatin1String(properties ? "props" : ""));
     QByteArray chanPathLatin1(mChanObjectPath.toLatin1());
@@ -391,7 +391,7 @@ void TestChanGroup::testLeave()
 
 void TestChanGroup::testLeaveWithFallback()
 {
-    mChanObjectPath = QString(QLatin1String("%1/ChannelForTpQt4LeaveTestFallback"))
+    mChanObjectPath = QString(QLatin1String("%1/ChannelForTpQtLeaveTestFallback"))
         .arg(mConn->objectPath());
     QByteArray chanPathLatin1(mChanObjectPath.toLatin1());
 
diff --git a/tests/dbus/simple-observer.cpp b/tests/dbus/simple-observer.cpp
index 876a138d..9455a2fd 100644
--- a/tests/dbus/simple-observer.cpp
+++ b/tests/dbus/simple-observer.cpp
@@ -713,7 +713,7 @@ QMap<QString, QString> TestSimpleObserver::ourObservers()
     QMap<QString, QString> observers;
 
     Q_FOREACH (QString name, registeredNames) {
-        if (!name.startsWith(QLatin1String("org.freedesktop.Telepathy.Client.TpQt4SO"))) {
+        if (!name.startsWith(QLatin1String("org.freedesktop.Telepathy.Client.TpQtSO"))) {
             continue;
         }
 
diff --git a/tests/lib/CMakeLists.txt b/tests/lib/CMakeLists.txt
index 7e3a0708..68271f78 100644
--- a/tests/lib/CMakeLists.txt
+++ b/tests/lib/CMakeLists.txt
@@ -3,8 +3,8 @@ include_directories(
 
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/_gen")
 tpqt_generate_moc_i(test.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/test.h.moc.hpp)
-add_library(tp-qt4-tests test.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/test.h.moc.hpp)
-target_link_libraries(tp-qt4-tests ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} telepathy-qt4)
+add_library(tp-qt-tests test.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/test.h.moc.hpp)
+target_link_libraries(tp-qt-tests ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} telepathy-qt)
 
 if(ENABLE_TP_GLIB_TESTS)
     add_subdirectory(glib)
diff --git a/tests/lib/glib-helpers/CMakeLists.txt b/tests/lib/glib-helpers/CMakeLists.txt
index 0e9856d6..a5a770a1 100644
--- a/tests/lib/glib-helpers/CMakeLists.txt
+++ b/tests/lib/glib-helpers/CMakeLists.txt
@@ -10,13 +10,13 @@ add_definitions(-DQT_NO_KEYWORDS)
 if(ENABLE_TP_GLIB_TESTS)
     file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/_gen")
     tpqt_generate_moc_i(test-conn-helper.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/test-conn-helper.moc.hpp)
-    add_library(tp-qt4-tests-glib-helpers test-conn-helper.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/test-conn-helper.moc.hpp)
-    target_link_libraries(tp-qt4-tests-glib-helpers
+    add_library(tp-qt-tests-glib-helpers test-conn-helper.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/test-conn-helper.moc.hpp)
+    target_link_libraries(tp-qt-tests-glib-helpers
         ${TELEPATHY_GLIB_LIBRARIES}
         ${GOBJECT_LIBRARIES}
         ${GLIB2_LIBRARIES}
         ${DBUS_GLIB_LIBRARIES}
         ${QT_QTCORE_LIBRARY}
         ${QT_QTDBUS_LIBRARY}
-        telepathy-qt4)
+        telepathy-qt)
 endif(ENABLE_TP_GLIB_TESTS)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 0caf9666..e5f3c41c 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -18,7 +18,7 @@ if (GIT_BRANCH_CURRENT)
     if (HAVE_GIT_BRANCH)
         string(REPLACE "\n" "" GIT_BRANCH_CURRENT ${GIT_BRANCH_CURRENT})
 
-        set(UPLOAD_BRANCH_TO people.freedesktop.org:public_html/telepathy-qt4)
+        set(UPLOAD_BRANCH_TO people.freedesktop.org:public_html/telepathy-qt)
 
         add_custom_target(upload-branch-docs rsync -rtzvPp --chmod=a+rX doc/html/ ${UPLOAD_BRANCH_TO}-${GIT_BRANCH_CURRENT}
                                             WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
@@ -35,7 +35,7 @@ if (PERL_FOUND)
 endif (PERL_FOUND)
 
 add_custom_target(maintainer-upload-release-docs
-        rsync -rtOvzPp --chmod=Dg+s,ug+rwX,o=rX doc/html/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-qt4/
+        rsync -rtOvzPp --chmod=Dg+s,ug+rwX,o=rX doc/html/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-qt/
 
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
@@ -84,10 +84,10 @@ set(toolchain_files
     glib-signals-marshal-gen.py
     libtpcodegen.py
     libglibcodegen.py
-    libqt4codegen.py
-    qt4-client-gen.py
-    qt4-constants-gen.py
-    qt4-types-gen.py
+    libqtcodegen.py
+    qt-client-gen.py
+    qt-constants-gen.py
+    qt-types-gen.py
     manager-file.py
     with-session-bus.sh
     xincludator.py
diff --git a/tools/libqt4codegen.py b/tools/libqtcodegen.py
index dd223789..30fe170f 100644
--- a/tools/libqt4codegen.py
+++ b/tools/libqtcodegen.py
@@ -1,6 +1,6 @@
-"""Library code for Qt4 D-Bus-related code generation.
+"""Library code for Qt D-Bus-related code generation.
 
-The master copy of this library is in the telepathy-qt4 repository -
+The master copy of this library is in the telepathy-qt repository -
 please make any changes there.
 """
 
@@ -40,7 +40,7 @@ class Xzibit(Exception):
         """ % (self.parent.nodeName, self.parent.toxml()[:100],
                self.child.toxml()[:100])
 
-class _Qt4TypeBinding:
+class _QtTypeBinding:
     def __init__(self, val, inarg, outarg, array_val, custom_type, array_of,
             array_depth=None):
         self.val = val
@@ -203,7 +203,7 @@ def binding_from_usage(sig, tptype, custom_lists, external=False, explicit_own_n
         assert False, 'Don\'t know how to map type (%s, %s)' % (sig, tptype)
 
     outarg = val + '&'
-    return _Qt4TypeBinding(val, inarg, outarg, None, custom_type, array_of)
+    return _QtTypeBinding(val, inarg, outarg, None, custom_type, array_of)
 
 def binding_from_decl(name, array_name, array_depth=None, external=False, explicit_own_ns=''):
     val = name.replace('_', '')
@@ -213,7 +213,7 @@ def binding_from_decl(name, array_name, array_depth=None, external=False, explic
         val = explicit_own_ns + '::' + val
     inarg = 'const %s&' % val
     outarg = '%s&' % val
-    return _Qt4TypeBinding(val, inarg, outarg, array_name.replace('_', ''), True, None, array_depth)
+    return _QtTypeBinding(val, inarg, outarg, array_name.replace('_', ''), True, None, array_depth)
 
 def extract_arg_or_member_info(els, custom_lists, externals, typesns, refs, docstring_indent=' * ', docstring_brackets=None, docstring_maxwidth=80):
     names = []
@@ -221,7 +221,7 @@ def extract_arg_or_member_info(els, custom_lists, externals, typesns, refs, docs
     bindings = []
 
     for el in els:
-        names.append(get_qt4_name(el))
+        names.append(get_qt_name(el))
         docstrings.append(format_docstring(el, refs, docstring_indent, docstring_brackets, docstring_maxwidth))
 
         sig = el.getAttribute('type')
@@ -316,7 +316,7 @@ def format_docstring(el, refs, indent=' * ', brackets=None, maxwidth=80):
             output.append(brackets[0])
         else:
             output.append(indent)
- 
+
         output.append('\n')
 
     for line in lines:
@@ -374,7 +374,7 @@ def get_headerfile_cmd(realinclude, prettyinclude, indent=' * '):
     else:
         return ''
 
-def get_qt4_name(el):
+def get_qt_name(el):
     name = el.getAttribute('name')
 
     if el.localName in ('method', 'signal', 'property'):
@@ -389,9 +389,9 @@ def get_qt4_name(el):
     if name[0].isupper() and name[1].islower():
         name = name[0].lower() + name[1:]
 
-    return qt4_identifier_escape(name.replace('_', ''))
+    return qt_identifier_escape(name.replace('_', ''))
 
-def qt4_identifier_escape(str):
+def qt_identifier_escape(str):
     built = (str[0].isdigit() and ['_']) or []
 
     for c in str:
diff --git a/tools/qt4-client-gen.py b/tools/qt-client-gen.py
index bd1f775f..6a14a203 100644
--- a/tools/qt4-client-gen.py
+++ b/tools/qt-client-gen.py
@@ -23,7 +23,7 @@ import codecs
 from getopt import gnu_getopt
 
 from libtpcodegen import NS_TP, get_descendant_text, get_by_path
-from libqt4codegen import binding_from_usage, extract_arg_or_member_info, format_docstring, gather_externals, gather_custom_lists, get_headerfile_cmd, get_qt4_name, qt4_identifier_escape, RefRegistry
+from libqtcodegen import binding_from_usage, extract_arg_or_member_info, format_docstring, gather_externals, gather_custom_lists, get_headerfile_cmd, get_qt_name, qt_identifier_escape, RefRegistry
 
 class Generator(object):
     def __init__(self, opts):
@@ -58,7 +58,7 @@ class Generator(object):
         # Output info header and includes
         self.h("""\
 /*
- * This file contains D-Bus client proxy classes generated by qt4-client-gen.py.
+ * This file contains D-Bus client proxy classes generated by qt-client-gen.py.
  *
  * This file can be distributed under the same terms as the specification from
  * which it was generated.
diff --git a/tools/qt4-constants-gen.py b/tools/qt-constants-gen.py
index a28050a7..48fdc434 100644
--- a/tools/qt4-constants-gen.py
+++ b/tools/qt-constants-gen.py
@@ -23,7 +23,7 @@ import xml.dom.minidom
 from getopt import gnu_getopt
 
 from libtpcodegen import NS_TP, get_descendant_text, get_by_path
-from libqt4codegen import format_docstring, RefRegistry
+from libqtcodegen import format_docstring, RefRegistry
 
 class Generator(object):
     def __init__(self, opts):
diff --git a/tools/qt4-types-gen.py b/tools/qt-types-gen.py
index 24cd4228..119cf9cc 100644
--- a/tools/qt4-types-gen.py
+++ b/tools/qt-types-gen.py
@@ -22,7 +22,7 @@ import xml.dom.minidom
 from getopt import gnu_getopt
 
 from libtpcodegen import NS_TP, get_descendant_text, get_by_path
-from libqt4codegen import binding_from_usage, binding_from_decl, extract_arg_or_member_info, format_docstring, gather_externals, gather_custom_lists, get_qt4_name, get_headerfile_cmd, RefRegistry
+from libqtcodegen import binding_from_usage, binding_from_decl, extract_arg_or_member_info, format_docstring, gather_externals, gather_custom_lists, get_qt_name, get_headerfile_cmd, RefRegistry
 
 class BrokenSpecException(Exception):
     pass
@@ -238,7 +238,7 @@ TP_QT_NO_EXPORT void _registerTypes()
 
 """)
 
-        # Emit Qt4 metatype declarations
+        # Emit Qt metatype declarations
 
         self.to_declare.sort()
 
@@ -296,7 +296,7 @@ TP_QT_NO_EXPORT void _registerTypes()
 %s\
  *
  * Generic list type with %s elements. Convertible with
- * %s, but needed to have a discrete type in the Qt4 type system.
+ * %s, but needed to have a discrete type in the Qt type system.
  */
 """ % (val, get_headerfile_cmd(self.realinclude, self.prettyinclude), array_of, real))
             self.decl(self.faketype(val, real))
@@ -482,7 +482,7 @@ struct %(visibility)s %(name)s
 %s\
  *
  * Mapping type generated from the specification. Convertible with
- * %s, but needed to have a discrete type in the Qt4 type system.
+ * %s, but needed to have a discrete type in the Qt type system.
 %s\
  */
 """ % (depinfo.binding.val, get_headerfile_cmd(self.realinclude, self.prettyinclude), realtype, format_docstring(depinfo.el, self.refs)))
diff --git a/tools/tp-qt4-tests.supp b/tools/tp-qt-tests.supp
index 2c0f1201..2c0f1201 100644
--- a/tools/tp-qt4-tests.supp
+++ b/tools/tp-qt-tests.supp