--- a/cmake/modules/FindTelepathyQt4.cmake	2011-12-15 12:27:40.770560940 +0100
+++ b/cmake/modules/FindTelepathyQt4.cmake	1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-# Try to find the Qt4 binding of the Telepathy library
-# TELEPATHY_QT4_FOUND - system has TelepathyQt4
-# TELEPATHY_QT4_INCLUDE_DIR - the TelepathyQt4 include directory
-# TELEPATHY_QT4_LIBRARIES - Link these to use TelepathyQt4
-
-# Copyright (c) 2008, Allen Winter <winter@kde.org>
-# Copyright (c) 2009, Andre Moreira Magalhaes <andrunko@gmail.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-set(TELEPATHY_QT4_FIND_REQUIRED ${TelepathyQt4_FIND_REQUIRED})
-if(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
-  # Already in cache, be silent
-  set(TELEPATHY_QT4_FIND_QUIETLY TRUE)
-endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
-
-find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
-    if (TelepathyQt4_FIND_VERSION_EXACT)
-        pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4=${TelepathyQt4_FIND_VERSION})
-    else (TelepathyQt4_FIND_VERSION_EXACT)
-        pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=${TelepathyQt4_FIND_VERSION})
-    endif (TelepathyQt4_FIND_VERSION_EXACT)
-endif(PKG_CONFIG_FOUND)
-
-find_path(TELEPATHY_QT4_INCLUDE_DIR
-          NAMES TelepathyQt4/Types
-          HINTS
-          ${PC_TELEPATHY_QT4_INCLUDEDIR}
-          ${PC_TELEPATHY_QT4_INCLUDE_DIRS}
-)
-
-find_library(TELEPATHY_QT4_LIBRARIES
-             NAMES telepathy-qt4
-             HINTS
-             ${PC_TELEPATHY_QT4_LIBDIR}
-             ${PC_TELEPATHY_QT4_LIBRARY_DIRS}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(TELEPATHY_QT4 DEFAULT_MSG
-                                  TELEPATHY_QT4_LIBRARIES TELEPATHY_QT4_INCLUDE_DIR)
--- a/cmake/modules/TelepathyDefaults.cmake	2011-12-15 12:27:40.769560941 +0100
+++ b/cmake/modules/TelepathyDefaults.cmake	2011-12-15 12:27:44.430561115 +0100
@@ -49,11 +49,11 @@
         set(DEPRECATED_DECLARATIONS_FLAGS)
     endif (CXX_DEPRECATED_DECLARATIONS)
 
-    if(${TP_QT4_YELL_NANO_VERSION} EQUAL 0)
+    if(${TP_QT_YELL_NANO_VERSION} EQUAL 0)
         set(NOT_RELEASE 0)
-    else(${TP_QT4_YELL_NANO_VERSION} EQUAL 0)
+    else(${TP_QT_YELL_NANO_VERSION} EQUAL 0)
         set(NOT_RELEASE 1)
-    endif(${TP_QT4_YELL_NANO_VERSION} EQUAL 0)
+    endif(${TP_QT_YELL_NANO_VERSION} EQUAL 0)
 
     set(desired
         all
--- a/CMakeLists.txt	2011-12-15 12:27:40.761560957 +0100
+++ b/CMakeLists.txt	2011-12-15 12:27:44.420561115 +0100
@@ -38,29 +38,29 @@
 #   set nano_version to 0
 #   make the release, tag it
 #   set nano_version to 1
-set(TP_QT4_YELL_MAJOR_VERSION 0)
-set(TP_QT4_YELL_MINOR_VERSION 1)
-set(TP_QT4_YELL_MICRO_VERSION 6)
-set(TP_QT4_YELL_NANO_VERSION  1)
+set(TP_QT_YELL_MAJOR_VERSION 0)
+set(TP_QT_YELL_MINOR_VERSION 1)
+set(TP_QT_YELL_MICRO_VERSION 6)
+set(TP_QT_YELL_NANO_VERSION  1)
 
 # This value contains the library's SOVERSION. This value is to be increased everytime an API/ABI break
 # occurs, and will be used for the SOVERSION of the generated shared libraries.
-set(TP_QT4_YELL_ABI_VERSION 0)
+set(TP_QT_YELL_ABI_VERSION 0)
 # This variable is used for the library's long version. It is generated dynamically, so don't change its
-# value! Change TP_QT4_YELL_ABI_VERSION and TP_QT4_YELL_*_VERSION instead.
-if (${TP_QT4_YELL_NANO_VERSION} EQUAL 0)
-    set(TP_QT4_YELL_LIBRARY_VERSION ${TP_QT4_YELL_ABI_VERSION}.${TP_QT4_YELL_MAJOR_VERSION}.${TP_QT4_YELL_MINOR_VERSION}.${TP_QT4_YELL_MICRO_VERSION})
-else (${TP_QT4_YELL_NANO_VERSION} EQUAL 0)
-    set(TP_QT4_YELL_LIBRARY_VERSION ${TP_QT4_YELL_ABI_VERSION}.${TP_QT4_YELL_MAJOR_VERSION}.${TP_QT4_YELL_MINOR_VERSION}.${TP_QT4_YELL_MICRO_VERSION}.${TP_QT4_NANO_VERSION})
-endif (${TP_QT4_YELL_NANO_VERSION} EQUAL 0)
+# value! Change TP_QT_YELL_ABI_VERSION and TP_QT_YELL_*_VERSION instead.
+if (${TP_QT_YELL_NANO_VERSION} EQUAL 0)
+    set(TP_QT_YELL_LIBRARY_VERSION ${TP_QT_YELL_ABI_VERSION}.${TP_QT_YELL_MAJOR_VERSION}.${TP_QT_YELL_MINOR_VERSION}.${TP_QT_YELL_MICRO_VERSION})
+else (${TP_QT_YELL_NANO_VERSION} EQUAL 0)
+    set(TP_QT_YELL_LIBRARY_VERSION ${TP_QT_YELL_ABI_VERSION}.${TP_QT_YELL_MAJOR_VERSION}.${TP_QT_YELL_MINOR_VERSION}.${TP_QT_YELL_MICRO_VERSION}.${TP_QT_NANO_VERSION})
+endif (${TP_QT_YELL_NANO_VERSION} EQUAL 0)
 
 set(PACKAGE_NAME telepathy-qt4-yell)
 
-if (${TP_QT4_YELL_NANO_VERSION} EQUAL 0)
-    set(PACKAGE_VERSION ${TP_QT4_YELL_MAJOR_VERSION}.${TP_QT4_YELL_MINOR_VERSION}.${TP_QT4_YELL_MICRO_VERSION})
-else (${TP_QT4_YELL_NANO_VERSION} EQUAL 0)
-    set(PACKAGE_VERSION ${TP_QT4_YELL_MAJOR_VERSION}.${TP_QT4_YELL_MINOR_VERSION}.${TP_QT4_YELL_MICRO_VERSION}.${TP_QT4_YELL_NANO_VERSION})
-endif (${TP_QT4_YELL_NANO_VERSION} EQUAL 0)
+if (${TP_QT_YELL_NANO_VERSION} EQUAL 0)
+    set(PACKAGE_VERSION ${TP_QT_YELL_MAJOR_VERSION}.${TP_QT_YELL_MINOR_VERSION}.${TP_QT_YELL_MICRO_VERSION})
+else (${TP_QT_YELL_NANO_VERSION} EQUAL 0)
+    set(PACKAGE_VERSION ${TP_QT_YELL_MAJOR_VERSION}.${TP_QT_YELL_MINOR_VERSION}.${TP_QT_YELL_MICRO_VERSION}.${TP_QT_YELL_NANO_VERSION})
+endif (${TP_QT_YELL_NANO_VERSION} EQUAL 0)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is
 # checked
@@ -69,11 +69,11 @@
 # Default build type is RelWithDebInfo for release versions and Debug for developement
 # versions
 if(NOT CMAKE_BUILD_TYPE)
-    if(TP_QT4_YELL_NANO_VERSION EQUAL 0)
+    if(TP_QT_YELL_NANO_VERSION EQUAL 0)
         set(CMAKE_BUILD_TYPE RelWithDebInfo)
-    else(TP_QT4_YELL_NANO_VERSION EQUAL 0)
+    else(TP_QT_YELL_NANO_VERSION EQUAL 0)
         set(CMAKE_BUILD_TYPE Debug)
-    endif(TP_QT4_YELL_NANO_VERSION EQUAL 0)
+    endif(TP_QT_YELL_NANO_VERSION EQUAL 0)
 endif(NOT CMAKE_BUILD_TYPE)
 
 # This file contains all the needed initialization macros
--- a/examples/accounts-model/accountwindow.cpp	2011-12-15 12:27:40.772560937 +0100
+++ b/examples/accounts-model/accountwindow.cpp	2011-12-15 12:27:44.470561121 +0100
@@ -22,11 +22,11 @@
 
 #include "examples/accounts-model/_gen/accountwindow.moc.hpp"
 
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/PendingReady>
 
-#include <TelepathyQt4/Models/FlatModelProxy>
-#include <TelepathyQt4/Models/AvatarImageProvider>
+#include <TelepathyQt/Models/FlatModelProxy>
+#include <TelepathyQt/Models/AvatarImageProvider>
 
 #include <QAbstractItemModel>
 #include <QDeclarativeContext>
--- a/examples/accounts-model/accountwindow.h	2011-12-15 12:27:40.772560937 +0100
+++ b/examples/accounts-model/accountwindow.h	2011-12-15 12:27:44.471561119 +0100
@@ -22,9 +22,9 @@
 #define _TelepathyQt4_mainwindow_h_HEADER_GUARD_
 
 #include <QWidget>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
 
-#include <TelepathyQt4/Models/AccountsModel>
+#include <TelepathyQt/Models/AccountsModel>
 
 class TelepathyInitializer;
 class QDeclarativeView;
--- a/examples/accounts-model/telepathy-initializer.cpp	2011-12-15 12:27:40.772560937 +0100
+++ b/examples/accounts-model/telepathy-initializer.cpp	2011-12-15 12:27:44.471561119 +0100
@@ -22,10 +22,10 @@
 
 #include "examples/accounts-model/_gen/telepathy-initializer.moc.hpp"
 
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingContacts>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingContacts>
+#include <TelepathyQt/PendingReady>
 
 TelepathyInitializer::TelepathyInitializer(const Tp::AccountManagerPtr &am)
     : QObject(0),
--- a/examples/accounts-model/telepathy-initializer.h	2011-12-15 12:27:40.772560937 +0100
+++ b/examples/accounts-model/telepathy-initializer.h	2011-12-15 12:27:44.470561121 +0100
@@ -21,8 +21,8 @@
 #ifndef _TelepathyQt4_telepathy_initializer_h_HEADER_GUARD_
 #define _TelepathyQt4_telepathy_initializer_h_HEADER_GUARD_
 
-#include <TelepathyQt4/Models/AccountsModel>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Models/AccountsModel>
+#include <TelepathyQt/Types>
 
 class TelepathyInitializer : public QObject
 {
--- a/examples/accounts-model/tree-view.cpp	2011-12-15 12:27:40.772560937 +0100
+++ b/examples/accounts-model/tree-view.cpp	2011-12-15 12:27:44.470561121 +0100
@@ -22,11 +22,11 @@
 
 #include "examples/accounts-model/_gen/tree-view.moc.hpp"
 
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/PendingContacts>
-#include <TelepathyQt4/ContactManager>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/PendingContacts>
+#include <TelepathyQt/ContactManager>
 
-#include <TelepathyQt4/Models/AccountsModel>
+#include <TelepathyQt/Models/AccountsModel>
 
 #include <QTreeView>
 #include <QVBoxLayout>
--- a/examples/accounts-model/tree-view.h	2011-12-15 12:27:40.772560937 +0100
+++ b/examples/accounts-model/tree-view.h	2011-12-15 12:27:44.470561121 +0100
@@ -24,8 +24,8 @@
 #include <QTreeView>
 #include <QWidget>
 
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Models/AccountsModel>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Models/AccountsModel>
 
 class TelepathyInitializer;
 
--- a/examples/conversation-model/chatwindow.cpp	2011-12-15 12:27:40.773560936 +0100
+++ b/examples/conversation-model/chatwindow.cpp	2011-12-15 12:27:44.471561119 +0100
@@ -21,12 +21,12 @@
 #include "chatwindow.h"
 #include "examples/conversation-model/_gen/chatwindow.moc.hpp"
 
-#include <TelepathyQt4/ChannelClassSpecList>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/PendingContacts>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/ChannelClassSpecList>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/PendingContacts>
+#include <TelepathyQt/PendingReady>
 
 #include <QDeclarativeContext>
 #include <QDeclarativeView>
--- a/examples/conversation-model/chatwindow.h	2011-12-15 12:27:40.773560936 +0100
+++ b/examples/conversation-model/chatwindow.h	2011-12-15 12:27:44.471561119 +0100
@@ -24,10 +24,10 @@
 #include <QScopedPointer>
 #include <QWidget>
 
-#include <TelepathyQt4/AbstractClientHandler>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/AbstractClientHandler>
+#include <TelepathyQt/Types>
 
-#include <TelepathyQt4/Models/ConversationModel>
+#include <TelepathyQt/Models/ConversationModel>
 
 class QDeclarativeView;
 class QLineEdit;
--- a/examples/conversation-model/conversation.cpp	2011-12-15 12:27:40.773560936 +0100
+++ b/examples/conversation-model/conversation.cpp	2011-12-15 12:27:44.471561119 +0100
@@ -20,10 +20,10 @@
 
 #include <QApplication>
 
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/ClientRegistrar>
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/ConnectionFactory>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/ClientRegistrar>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/ConnectionFactory>
 
 #include "chatwindow.h"
 
--- a/TelepathyQt4Yell/call-channel.cpp	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/call-channel.cpp	2011-12-15 12:27:44.431561115 +0100
@@ -24,12 +24,12 @@
 #include "TelepathyQt4Yell/_gen/call-channel.moc.hpp"
 #include "TelepathyQt4Yell/_gen/call-channel-internal.moc.hpp"
 
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingComposite>
-#include <TelepathyQt4/PendingContacts>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/PendingVoid>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingComposite>
+#include <TelepathyQt/PendingContacts>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/PendingVoid>
 
 #include <QHash>
 
@@ -74,7 +74,7 @@
 
     QDBusPendingCallWatcher *watcher =
         new QDBusPendingCallWatcher(
-                self->properties->GetAll(TP_QT4_YELL_IFACE_CALL_STREAM),
+                self->properties->GetAll(TP_QT_YELL_IFACE_CALL_STREAM),
                 parent);
     parent->connect(watcher,
             SIGNAL(finished(QDBusPendingCallWatcher*)),
@@ -250,7 +250,7 @@
 Tp::PendingOperation *CallStream::requestReceiving(const Tp::ContactPtr &contact, bool receive)
 {
     if (!contact) {
-        return new Tp::PendingFailure(TP_QT4_YELL_ERROR_INVALID_ARGUMENT,
+        return new Tp::PendingFailure(TP_QT_YELL_ERROR_INVALID_ARGUMENT,
                 QLatin1String("Invalid contact"), CallStreamPtr(this));
     }
 
@@ -487,7 +487,7 @@
 
     if (mPriv->content == content) {
         // the content was removed before becoming ready
-        setFinishedWithError(TP_QT4_YELL_ERROR_CANCELLED,
+        setFinishedWithError(TP_QT_YELL_ERROR_CANCELLED,
                 QLatin1String("Content removed before ready"));
     }
 }
@@ -529,7 +529,7 @@
     QDBusPendingCallWatcher *watcher =
         new QDBusPendingCallWatcher(
                 self->properties->GetAll(
-                    QLatin1String(TP_QT4_YELL_IFACE_CALL_CONTENT)),
+                    QLatin1String(TP_QT_YELL_IFACE_CALL_CONTENT)),
                 parent);
     parent->connect(watcher,
             SIGNAL(finished(QDBusPendingCallWatcher*)),
@@ -812,7 +812,7 @@
     Tp::ReadinessHelper::Introspectable introspectableLocalHoldState(
         QSet<uint>() << 0,                                                         // makesSenseForStatuses
         Tp::Features() << Channel::FeatureCore,                                    // dependsOnFeatures (core)
-        QStringList() << TP_QT4_IFACE_CHANNEL_INTERFACE_HOLD,                      // dependsOnInterfaces
+        QStringList() << TP_QT_IFACE_CHANNEL_INTERFACE_HOLD,                      // dependsOnInterfaces
         (Tp::ReadinessHelper::IntrospectFunc) &Private::introspectLocalHoldState,
         this);
     introspectables[FeatureLocalHoldState] = introspectableLocalHoldState;
@@ -842,7 +842,7 @@
     QDBusPendingCallWatcher *watcher =
         new QDBusPendingCallWatcher(
                 self->properties->GetAll(
-                    QLatin1String(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL)),
+                    QLatin1String(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL)),
                 parent);
     parent->connect(watcher,
             SIGNAL(finished(QDBusPendingCallWatcher*)),
@@ -1209,7 +1209,7 @@
 {
     if (!isReady(FeatureLocalHoldState)) {
         qWarning() << "CallChannel::localHoldState() used with FeatureLocalHoldState not ready";
-    } else if (!hasInterface(TP_QT4_IFACE_CHANNEL_INTERFACE_HOLD)) {
+    } else if (!hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_HOLD)) {
         qWarning() << "CallChannel::localHoldStateReason() used with no hold interface";
     }
 
@@ -1228,7 +1228,7 @@
 {
     if (!isReady(FeatureLocalHoldState)) {
         qWarning() << "CallChannel::localHoldStateReason() used with FeatureLocalHoldState not ready";
-    } else if (!hasInterface(TP_QT4_IFACE_CHANNEL_INTERFACE_HOLD)) {
+    } else if (!hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_HOLD)) {
         qWarning() << "CallChannel::localHoldStateReason() used with no hold interface";
     }
 
@@ -1241,7 +1241,7 @@
  *
  * If the connection manager can immediately tell that the requested state
  * change could not possibly succeed, the resulting PendingOperation will fail
- * with error code #TP_QT4_YELL_ERROR_NOT_AVAILABLE.
+ * with error code #TP_QT_YELL_ERROR_NOT_AVAILABLE.
  * If the requested state is the same as the current state, the resulting
  * PendingOperation will finish successfully.
  *
@@ -1258,9 +1258,9 @@
  * another, it will attempt to revert all streams to their previous hold
  * states.
  *
- * If the channel does not support the #TP_QT4_IFACE_CHANNEL_INTERFACE_HOLD
+ * If the channel does not support the #TP_QT_IFACE_CHANNEL_INTERFACE_HOLD
  * interface, the PendingOperation will fail with error code
- * #TP_QT4_YELL_ERROR_NOT_IMPLEMENTED.
+ * #TP_QT_YELL_ERROR_NOT_IMPLEMENTED.
  *
  * \param hold A boolean indicating whether or not the channel should be on hold
  * \return A %PendingOperation, which will emit PendingOperation::finished
@@ -1269,9 +1269,9 @@
  */
 Tp::PendingOperation *CallChannel::requestHold(bool hold)
 {
-    if (!hasInterface(TP_QT4_IFACE_CHANNEL_INTERFACE_HOLD)) {
+    if (!hasInterface(TP_QT_IFACE_CHANNEL_INTERFACE_HOLD)) {
         qWarning() << "CallChannel::requestHold() used with no hold interface";
-        return new Tp::PendingFailure(TP_QT4_YELL_ERROR_NOT_IMPLEMENTED,
+        return new Tp::PendingFailure(TP_QT_YELL_ERROR_NOT_IMPLEMENTED,
                 QLatin1String("CallChannel does not support hold interface"),
                 CallChannelPtr(this));
     }
--- a/TelepathyQt4Yell/call-channel.h	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/call-channel.h	2011-12-15 12:27:44.431561115 +0100
@@ -29,12 +29,12 @@
 #include <TelepathyQt4Yell/Constants>
 #include <TelepathyQt4Yell/Types>
 
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/ChannelClassSpec>
-#include <TelepathyQt4/ChannelFactory>
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/SharedPtr>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/ChannelClassSpec>
+#include <TelepathyQt/ChannelFactory>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/SharedPtr>
 
 namespace Tpy
 {
--- a/TelepathyQt4Yell/call-channel-internal.h	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/call-channel-internal.h	2011-12-15 12:27:44.431561115 +0100
@@ -35,7 +35,7 @@
     // Public object
     CallStream *parent;
 
-    QWeakPointer<CallContent> content;
+    Tp::WeakPtr<CallContent> content;
 
     // Mandatory proxies
     Client::CallStreamInterface *streamInterface;
@@ -92,7 +92,7 @@
     // Public object
     CallContent *parent;
 
-    QWeakPointer<CallChannel> channel;
+    Tp::WeakPtr<CallChannel> channel;
 
     // Mandatory proxies
     Client::CallContentInterface *contentInterface;
--- a/TelepathyQt4Yell/channel-class-spec.cpp	2011-12-15 12:27:40.770560940 +0100
+++ b/TelepathyQt4Yell/channel-class-spec.cpp	2011-12-15 12:27:44.430561115 +0100
@@ -66,7 +66,7 @@
     static ChannelClassSpec spec;
 
     if (!spec.isValid()) {
-        spec = ChannelClassSpec(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact);
+        spec = ChannelClassSpec(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact);
     }
 
     if (additionalProperties.isEmpty()) {
@@ -81,7 +81,7 @@
     static ChannelClassSpec spec;
 
     if (!spec.isValid()) {
-        spec = ChannelClassSpec(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact);
+        spec = ChannelClassSpec(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact);
         spec.setMediaCallInitialAudioFlag();
     }
 
@@ -97,7 +97,7 @@
     static ChannelClassSpec spec;
 
     if (!spec.isValid()) {
-        spec = ChannelClassSpec(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact);
+        spec = ChannelClassSpec(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact);
         spec.setMediaCallInitialVideoFlag();
     }
 
@@ -113,7 +113,7 @@
     static ChannelClassSpec spec;
 
     if (!spec.isValid()) {
-        spec = ChannelClassSpec(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact);
+        spec = ChannelClassSpec(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact);
         spec.setMediaCallInitialAudioFlag();
         spec.setMediaCallInitialVideoFlag();
     }
--- a/TelepathyQt4Yell/channel-class-spec.h	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/channel-class-spec.h	2011-12-15 12:27:44.431561115 +0100
@@ -28,7 +28,7 @@
 #include <TelepathyQt4Yell/Constants>
 #include <TelepathyQt4Yell/Global>
 
-#include <TelepathyQt4/ChannelClassSpec>
+#include <TelepathyQt/ChannelClassSpec>
 
 namespace Tpy
 {
@@ -50,35 +50,35 @@
     bool hasMediaCallInitialAudioFlag() const
     {
         return qdbus_cast<bool>(
-                property(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio")));
+                property(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio")));
     }
 
     void setMediaCallInitialAudioFlag()
     {
-        setProperty(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
+        setProperty(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
                 QVariant::fromValue(true));
     }
 
     void unsetMediaCallInitialAudioFlag()
     {
-        unsetProperty(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"));
+        unsetProperty(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"));
     }
 
     bool hasMediaCallInitialVideoFlag() const
     {
         return qdbus_cast<bool>(
-                property(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo")));
+                property(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo")));
     }
 
     void setMediaCallInitialVideoFlag()
     {
-        setProperty(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"),
+        setProperty(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"),
                 QVariant::fromValue(true));
     }
 
     void unsetMediaCallInitialVideoFlag()
     {
-        unsetProperty(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"));
+        unsetProperty(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"));
     }
 
     static ChannelClassSpec mediaCall(const QVariantMap &additionalProperties = QVariantMap());
--- a/TelepathyQt4Yell/channel-factory.h	2011-12-15 12:27:40.770560940 +0100
+++ b/TelepathyQt4Yell/channel-factory.h	2011-12-15 12:27:44.431561115 +0100
@@ -28,7 +28,7 @@
 #include <TelepathyQt4Yell/Global>
 #include <TelepathyQt4Yell/Types>
 
-#include <TelepathyQt4/ChannelFactory>
+#include <TelepathyQt/ChannelFactory>
 
 class QDBusConnection;
 
--- a/TelepathyQt4Yell/CMakeLists.txt	2011-12-15 12:27:40.770560940 +0100
+++ b/TelepathyQt4Yell/CMakeLists.txt	2011-12-15 12:27:44.430561115 +0100
@@ -62,11 +62,11 @@
 if(MSVC)
     set(TYPES_INCLUDE ^<TelepathyQt4Yell/Types^> )
     set(GLOBAL_INCLUDE ^<TelepathyQt4Yell/Global^> )
-    set(CHANNEL_EXTRA_INCLUDES '^<TelepathyQt4Yell/Types^>,^<TelepathyQt4/Channel^>' )
+    set(CHANNEL_EXTRA_INCLUDES '^<TelepathyQt4Yell/Types^>,^<TelepathyQt/Channel^>' )
 else(MSVC)
     set(TYPES_INCLUDE '<TelepathyQt4Yell/Types>' )
     set(GLOBAL_INCLUDE '<TelepathyQt4Yell/Global>' )
-    set(CHANNEL_EXTRA_INCLUDES '<TelepathyQt4Yell/Types>,<TelepathyQt4/Channel>' )
+    set(CHANNEL_EXTRA_INCLUDES '<TelepathyQt4Yell/Types>,<TelepathyQt/Channel>' )
 endif(MSVC)
 
 # Generate the spec files
@@ -76,7 +76,7 @@
 
 tpqt4_constants_gen(stable-constants ${gen_stable_spec_xml} ${CMAKE_CURRENT_BINARY_DIR}/_gen/constants.h
                     --namespace=Tpy
-                    --define-prefix=TP_QT4_YELL_
+                    --define-prefix=TP_QT_YELL_
                     --must-define=IN_TELEPATHY_QT4_YELL_HEADER
                     DEPENDS stable-ifaces-includator)
 
@@ -135,8 +135,8 @@
 
 # Set the correct version number
 set_target_properties(telepathy-qt4-yell PROPERTIES
-                      SOVERSION ${TP_QT4_YELL_ABI_VERSION}
-                      VERSION ${TP_QT4_YELL_LIBRARY_VERSION})
+                      SOVERSION ${TP_QT_YELL_ABI_VERSION}
+                      VERSION ${TP_QT_YELL_LIBRARY_VERSION})
 
 # Install header files
 install(FILES ${telepathy_qt4_yell_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-1.0/TelepathyQt4Yell COMPONENT headers)
--- a/TelepathyQt4Yell/connection-capabilities.cpp	2011-12-15 12:27:40.772560937 +0100
+++ b/TelepathyQt4Yell/connection-capabilities.cpp	2011-12-15 12:27:44.470561121 +0100
@@ -131,8 +131,8 @@
 bool ConnectionCapabilities::upgradingCalls() const
 {
     foreach (const Tp::RequestableChannelClassSpec &rccSpec, allClassSpecs()) {
-        if (rccSpec.channelType() == TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL &&
-            rccSpec.allowsProperty(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".MutableContents"))) {
+        if (rccSpec.channelType() == TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL &&
+            rccSpec.allowsProperty(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".MutableContents"))) {
             return true;
         }
     }
--- a/TelepathyQt4Yell/connection-capabilities.h	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/connection-capabilities.h	2011-12-15 12:27:44.431561115 +0100
@@ -26,8 +26,8 @@
 #error IN_TELEPATHY_QT4_YELL_HEADER
 #endif
 
-#include <TelepathyQt4/ConnectionCapabilities>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/ConnectionCapabilities>
+#include <TelepathyQt/Types>
 #include <TelepathyQt4Yell/Types>
 
 namespace Tpy
--- a/TelepathyQt4Yell/contact-capabilities.cpp	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/contact-capabilities.cpp	2011-12-15 12:27:44.431561115 +0100
@@ -141,8 +141,8 @@
 bool ContactCapabilities::upgradingCalls() const
 {
     foreach (const Tp::RequestableChannelClassSpec &rccSpec, allClassSpecs()) {
-        if (rccSpec.channelType() == TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL &&
-            rccSpec.allowsProperty(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".MutableContents"))) {
+        if (rccSpec.channelType() == TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL &&
+            rccSpec.allowsProperty(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".MutableContents"))) {
             return true;
         }
     }
--- a/TelepathyQt4Yell/contact-capabilities.h	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/contact-capabilities.h	2011-12-15 12:27:44.431561115 +0100
@@ -26,8 +26,8 @@
 #error IN_TELEPATHY_QT4_YELL_HEADER
 #endif
 
-#include <TelepathyQt4/ContactCapabilities>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/ContactCapabilities>
+#include <TelepathyQt/Types>
 #include <TelepathyQt4Yell/Types>
 
 namespace Tpy
--- a/TelepathyQt4Yell/Farstream/channel.cpp	2011-12-15 12:27:40.770560940 +0100
+++ b/TelepathyQt4Yell/Farstream/channel.cpp	2011-12-15 12:27:44.430561115 +0100
@@ -23,8 +23,8 @@
 
 #include "TelepathyQt4Yell/Farstream/_gen/channel.moc.hpp"
 
-#include <TelepathyQt4/Channel>
-#include <TelepathyQt4/Connection>
+#include <TelepathyQt/Channel>
+#include <TelepathyQt/Connection>
 
 #include <TelepathyQt4Yell/CallChannel>
 #include <TelepathyQt4Yell/Farstream/global.h>
@@ -58,21 +58,21 @@
       mPriv(new PendingTfChannel::Private(channel))
 {
     if (!mPriv->mChannel->handlerStreamingRequired()) {
-        setFinishedWithError(TP_QT4_ERROR_NOT_AVAILABLE,
+        setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE,
                 QLatin1String("Handler streaming not required"));
         return;
     }
 
     TpDBusDaemon *dbus = tp_dbus_daemon_dup(0);
     if (!dbus) {
-        setFinishedWithError(TP_QT4_ERROR_NOT_AVAILABLE,
+        setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE,
                 QLatin1String("Unable to connect to D-Bus"));
         return;
     }
 
     Tp::ConnectionPtr connection = mPriv->mChannel->connection();
     if (connection.isNull()) {
-        setFinishedWithError(TP_QT4_ERROR_NOT_AVAILABLE,
+        setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE,
                 QLatin1String("Connection not available"));
         g_object_unref(dbus);
         return;
@@ -85,21 +85,21 @@
     g_object_unref(dbus);
     dbus = 0;
     if (!gconnection) {
-        setFinishedWithError(TP_QT4_ERROR_NOT_AVAILABLE,
+        setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE,
                 QLatin1String("Unable to construct TpConnection"));
         return;
     }
 
     TpChannel *gchannel = tp_channel_new(gconnection,
             channel->objectPath().toAscii(),
-            TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL.latin1(),
+            TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL.latin1(),
             (TpHandleType) channel->targetHandleType(),
             channel->targetHandle(),
             0);
     g_object_unref(gconnection);
     gconnection = 0;
     if (!gchannel) {
-        setFinishedWithError(TP_QT4_ERROR_NOT_AVAILABLE,
+        setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE,
                 QLatin1String("Unable to construct TpChannel"));
         return;
     }
@@ -127,7 +127,7 @@
                 G_ASYNC_INITABLE(sourceObject), res, &error));
     if (error) {
         qDebug() << "PendingTfChannel::Private::onTfChannelNewFinish: error " << error->message;
-        self->setFinishedWithError(TP_QT4_ERROR_NOT_AVAILABLE, QLatin1String(error->message));
+        self->setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE, QLatin1String(error->message));
         g_clear_error(&error);
         return;
     }
--- a/TelepathyQt4Yell/Farstream/channel.h	2011-12-15 12:27:40.770560940 +0100
+++ b/TelepathyQt4Yell/Farstream/channel.h	2011-12-15 12:27:44.430561115 +0100
@@ -29,8 +29,8 @@
 #include <TelepathyQt4Yell/Farstream/Global>
 #include <TelepathyQt4Yell/Farstream/Types>
 
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/RefCounted>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/RefCounted>
 
 #include <telepathy-farstream/channel.h>
 
--- a/TelepathyQt4Yell/Farstream/CMakeLists.txt	2011-12-15 12:27:40.770560940 +0100
+++ b/TelepathyQt4Yell/Farstream/CMakeLists.txt	2011-12-15 12:27:44.430561115 +0100
@@ -48,8 +48,8 @@
 
     # Set the correct version number
     set_target_properties(telepathy-qt4-yell-farstream PROPERTIES
-                                                       SOVERSION ${TP_QT4_YELL_ABI_VERSION}
-                                                       VERSION ${TP_QT4_YELL_LIBRARY_VERSION})
+                                                       SOVERSION ${TP_QT_YELL_ABI_VERSION}
+                                                       VERSION ${TP_QT_YELL_LIBRARY_VERSION})
 
     # Install the library - watch out for the correct components
     if (WIN32)
--- a/TelepathyQt4Yell/Models/abstract-conversation-model.cpp	2011-12-15 12:27:40.772560937 +0100
+++ b/TelepathyQt4Yell/Models/abstract-conversation-model.cpp	2011-12-15 12:27:44.469561121 +0100
@@ -26,9 +26,9 @@
 #include <TelepathyQt4Yell/Models/CustomEventItem>
 #include <TelepathyQt4Yell/Models/TextEventItem>
 
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/ReceivedMessage>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/ReceivedMessage>
 
 #include <QPixmap>
 #include <QtAlgorithms>
--- a/TelepathyQt4Yell/Models/abstract-conversation-model.h	2011-12-15 12:27:40.772560937 +0100
+++ b/TelepathyQt4Yell/Models/abstract-conversation-model.h	2011-12-15 12:27:44.469561121 +0100
@@ -27,8 +27,8 @@
 
 #include <TelepathyQt4Yell/Models/Global>
 
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/Types>
 
 #include <QAbstractListModel>
 
--- a/TelepathyQt4Yell/Models/call-event-item.cpp	2011-12-15 12:27:40.772560937 +0100
+++ b/TelepathyQt4Yell/Models/call-event-item.cpp	2011-12-15 12:27:44.470561121 +0100
@@ -22,7 +22,7 @@
 
 #include "TelepathyQt4Yell/Models/_gen/call-event-item.moc.hpp"
 
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/Contact>
 
 namespace Tpy
 {
@@ -91,7 +91,7 @@
     return (!endActor().isNull() &&
             endReason() == Tpy::CallStateChangeReasonUserRequested &&
             duration().elapsed() <= 0 &&
-            detailedEndReason() == TP_QT4_ERROR_REJECTED);
+            detailedEndReason() == TP_QT_ERROR_REJECTED);
 }
 
 }
--- a/TelepathyQt4Yell/Models/call-event-item.h	2011-12-15 12:27:40.772560937 +0100
+++ b/TelepathyQt4Yell/Models/call-event-item.h	2011-12-15 12:27:44.469561121 +0100
@@ -29,7 +29,7 @@
 #include <TelepathyQt4Yell/Models/Global>
 #include <TelepathyQt4Yell/Constants>
 
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
 
 #include <QDateTime>
 #include <QString>
--- a/TelepathyQt4Yell/Models/CMakeLists.txt	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/Models/CMakeLists.txt	2011-12-15 12:27:44.469561121 +0100
@@ -58,8 +58,8 @@
 
 # Set the correct version number
 set_target_properties(telepathy-qt4-yell-models PROPERTIES
-    SOVERSION ${TP_QT4_YELL_ABI_VERSION}
-    VERSION ${TP_QT4_YELL_LIBRARY_VERSION})
+    SOVERSION ${TP_QT_YELL_ABI_VERSION}
+    VERSION ${TP_QT_YELL_LIBRARY_VERSION})
 
 # Install the library - watch out for the correct components
 if (WIN32)
--- a/TelepathyQt4Yell/Models/custom-event-item.h	2011-12-15 12:27:40.772560937 +0100
+++ b/TelepathyQt4Yell/Models/custom-event-item.h	2011-12-15 12:27:44.469561121 +0100
@@ -28,8 +28,8 @@
 #include <TelepathyQt4Yell/Models/EventItem>
 #include <TelepathyQt4Yell/Models/Global>
 
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Types>
 
 namespace Tpy
 {
--- a/TelepathyQt4Yell/Models/event-item.cpp	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/Models/event-item.cpp	2011-12-15 12:27:44.469561121 +0100
@@ -22,7 +22,7 @@
 
 #include "TelepathyQt4Yell/Models/_gen/event-item.moc.hpp"
 
-#include <TelepathyQt4/Contact>
+#include <TelepathyQt/Contact>
 
 namespace Tpy
 {
--- a/TelepathyQt4Yell/Models/event-item.h	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/Models/event-item.h	2011-12-15 12:27:44.469561121 +0100
@@ -27,7 +27,7 @@
 
 #include <TelepathyQt4Yell/Models/Global>
 
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
 
 #include <QDateTime>
 #include <QString>
--- a/TelepathyQt4Yell/Models/session-conversation-model.cpp	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/Models/session-conversation-model.cpp	2011-12-15 12:27:44.469561121 +0100
@@ -25,11 +25,11 @@
 #include <TelepathyQt4Yell/Models/TextEventItem>
 #include <TelepathyQt4Yell/Models/CustomEventItem>
 
-#include <TelepathyQt4/AvatarData>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/ReceivedMessage>
+#include <TelepathyQt/AvatarData>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/ReceivedMessage>
 
 #include <QPixmap>
 #include <QtAlgorithms>
--- a/TelepathyQt4Yell/Models/session-conversation-model.h	2011-12-15 12:27:40.772560937 +0100
+++ b/TelepathyQt4Yell/Models/session-conversation-model.h	2011-12-15 12:27:44.469561121 +0100
@@ -27,8 +27,8 @@
 
 #include <TelepathyQt4Yell/Models/Global>
 
-#include <TelepathyQt4/TextChannel>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/TextChannel>
+#include <TelepathyQt/Types>
 #include <TelepathyQt4Yell/Models/AbstractConversationModel>
 
 #include <QAbstractListModel>
--- a/TelepathyQt4Yell/Models/text-event-item.h	2011-12-15 12:27:40.772560937 +0100
+++ b/TelepathyQt4Yell/Models/text-event-item.h	2011-12-15 12:27:44.469561121 +0100
@@ -28,8 +28,8 @@
 #include <TelepathyQt4Yell/Models/EventItem>
 #include <TelepathyQt4Yell/Models/Global>
 
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Types>
 
 #include <QDateTime>
 #include <QString>
--- a/TelepathyQt4Yell/requestable-channel-class-spec.cpp	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/requestable-channel-class-spec.cpp	2011-12-15 12:27:44.431561115 +0100
@@ -31,9 +31,9 @@
 
     if (!spec.isValid()) {
         Tp::RequestableChannelClass rcc;
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL);
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
+                TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL);
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                 (uint) Tp::HandleTypeContact);
         spec = Tp::RequestableChannelClassSpec(rcc);
     }
@@ -47,11 +47,11 @@
 
     if (!spec.isValid()) {
         Tp::RequestableChannelClass rcc;
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL);
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
+                TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL);
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                 (uint) Tp::HandleTypeContact);
-        rcc.allowedProperties.append(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"));
+        rcc.allowedProperties.append(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"));
         spec = Tp::RequestableChannelClassSpec(rcc);
     }
 
@@ -64,11 +64,11 @@
 
     if (!spec.isValid()) {
         Tp::RequestableChannelClass rcc;
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL);
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
+                TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL);
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                 (uint) Tp::HandleTypeContact);
-        rcc.fixedProperties.insert(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
+        rcc.fixedProperties.insert(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
                 true);
         spec = Tp::RequestableChannelClassSpec(rcc);
     }
@@ -82,11 +82,11 @@
 
     if (!spec.isValid()) {
         Tp::RequestableChannelClass rcc;
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL);
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
+                TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL);
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                 (uint) Tp::HandleTypeContact);
-        rcc.fixedProperties.insert(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"),
+        rcc.fixedProperties.insert(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"),
                 true);
         spec = Tp::RequestableChannelClassSpec(rcc);
     }
@@ -100,11 +100,11 @@
 
     if (!spec.isValid()) {
         Tp::RequestableChannelClass rcc;
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL);
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
+                TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL);
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                 (uint) Tp::HandleTypeContact);
-        rcc.allowedProperties.append(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"));
+        rcc.allowedProperties.append(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"));
         spec = Tp::RequestableChannelClassSpec(rcc);
     }
 
@@ -117,12 +117,12 @@
 
     if (!spec.isValid()) {
         Tp::RequestableChannelClass rcc;
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL);
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
+                TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL);
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                 (uint) Tp::HandleTypeContact);
-        rcc.allowedProperties.append(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"));
-        rcc.allowedProperties.append(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"));
+        rcc.allowedProperties.append(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"));
+        rcc.allowedProperties.append(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"));
         spec = Tp::RequestableChannelClassSpec(rcc);
     }
 
@@ -135,13 +135,13 @@
 
     if (!spec.isValid()) {
         Tp::RequestableChannelClass rcc;
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL);
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
+                TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL);
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                 (uint) Tp::HandleTypeContact);
-        rcc.fixedProperties.insert(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
+        rcc.fixedProperties.insert(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
                 true);
-        rcc.allowedProperties.append(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"));
+        rcc.allowedProperties.append(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"));
         spec = Tp::RequestableChannelClassSpec(rcc);
     }
 
@@ -154,13 +154,13 @@
 
     if (!spec.isValid()) {
         Tp::RequestableChannelClass rcc;
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL);
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
+                TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL);
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                 (uint) Tp::HandleTypeContact);
-        rcc.fixedProperties.insert(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"),
+        rcc.fixedProperties.insert(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"),
                 true);
-        rcc.allowedProperties.append(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"));
+        rcc.allowedProperties.append(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"));
         spec = Tp::RequestableChannelClassSpec(rcc);
     }
 
@@ -173,13 +173,13 @@
 
     if (!spec.isValid()) {
         Tp::RequestableChannelClass rcc;
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL);
-        rcc.fixedProperties.insert(TP_QT4_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
+                TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL);
+        rcc.fixedProperties.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                 (uint) Tp::HandleTypeContact);
-        rcc.fixedProperties.insert(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"),
+        rcc.fixedProperties.insert(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"),
                 true);
-        rcc.fixedProperties.insert(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
+        rcc.fixedProperties.insert(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
                 true);
         spec = Tp::RequestableChannelClassSpec(rcc);
     }
--- a/TelepathyQt4Yell/requestable-channel-class-spec.h	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/requestable-channel-class-spec.h	2011-12-15 12:27:44.431561115 +0100
@@ -26,9 +26,9 @@
 #error IN_TELEPATHY_QT4_YELL_HEADER
 #endif
 
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/RequestableChannelClassSpec>
+#include <TelepathyQt/Constants>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/RequestableChannelClassSpec>
 #include <TelepathyQt4Yell/Types>
 
 namespace Tpy
--- a/TelepathyQt4Yell/types.h	2011-12-15 12:27:40.771560938 +0100
+++ b/TelepathyQt4Yell/types.h	2011-12-15 12:27:44.431561115 +0100
@@ -27,7 +27,7 @@
 
 #include <TelepathyQt4Yell/_gen/types.h>
 
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
 
 namespace Tpy
 {
--- a/tests/dbus/accounts-model-basics.cpp	2011-12-15 12:27:40.774560936 +0100
+++ b/tests/dbus/accounts-model-basics.cpp	2011-12-15 12:27:44.473561116 +0100
@@ -3,16 +3,16 @@
 #include <QtCore/QEventLoop>
 #include <QtTest/QtTest>
 
-#define TP_QT4_ENABLE_LOWLEVEL_API
+#define TP_QT_ENABLE_LOWLEVEL_API
 
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Account>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/ConnectionLowlevel>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/PendingAccount>
-#include <TelepathyQt4/Models/AccountsModel>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Account>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/ConnectionLowlevel>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/PendingAccount>
+#include <TelepathyQt/Models/AccountsModel>
 #include <telepathy-glib/debug.h>
 
 #include <tests/lib/test.h>
--- a/tests/dbus/call-chan.cpp	2011-12-15 12:27:40.774560936 +0100
+++ b/tests/dbus/call-chan.cpp	2011-12-15 12:27:44.473561116 +0100
@@ -1,20 +1,20 @@
 #include <QtCore/QDebug>
 #include <QtTest/QtTest>
 
-#define TP_QT4_ENABLE_LOWLEVEL_API
+#define TP_QT_ENABLE_LOWLEVEL_API
 
 #include <TelepathyQt4Yell/CallChannel>
 #include <TelepathyQt4Yell/ChannelFactory>
 
-#include <TelepathyQt4/ChannelFactory>
-#include <TelepathyQt4/Connection>
-#include <TelepathyQt4/ConnectionLowlevel>
-#include <TelepathyQt4/ContactFactory>
-#include <TelepathyQt4/ContactManager>
-#include <TelepathyQt4/PendingChannel>
-#include <TelepathyQt4/PendingContacts>
-#include <TelepathyQt4/PendingReady>
-#include <TelepathyQt4/Debug>
+#include <TelepathyQt/ChannelFactory>
+#include <TelepathyQt/Connection>
+#include <TelepathyQt/ConnectionLowlevel>
+#include <TelepathyQt/ContactFactory>
+#include <TelepathyQt/ContactManager>
+#include <TelepathyQt/PendingChannel>
+#include <TelepathyQt/PendingContacts>
+#include <TelepathyQt/PendingReady>
+#include <TelepathyQt/Debug>
 
 #include <telepathy-glib/debug.h>
 
@@ -255,12 +255,12 @@
 {
     qDebug() << "new channels";
     Q_FOREACH (const Tp::ChannelDetails &details, channels) {
-        QString channelType = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType")).toString();
-        bool requested = details.properties.value(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".Requested")).toBool();
+        QString channelType = details.properties.value(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType")).toString();
+        bool requested = details.properties.value(TP_QT_IFACE_CHANNEL + QLatin1String(".Requested")).toBool();
         qDebug() << " channelType:" << channelType;
         qDebug() << " requested  :" << requested;
 
-        if (channelType == TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL && !requested) {
+        if (channelType == TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL && !requested) {
             mChan = Tpy::CallChannel::create(mConn, details.channel.path(), details.properties);
             mLoop->exit(0);
         }
@@ -340,13 +340,13 @@
     qDebug() << "creating the channel";
 
     QVariantMap request;
-    request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
-                   TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL);
-    request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
+    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
+                   TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL);
+    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                    (uint) Tp::HandleTypeContact);
-    request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
+    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
                    otherContact->handle()[0]);
-    request.insert(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
+    request.insert(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
                    true);
     QVERIFY(connect(mConn->lowlevel()->createChannel(request),
                     SIGNAL(finished(Tp::PendingOperation*)),
@@ -585,13 +585,13 @@
     QVERIFY(otherContact);
 
     QVariantMap request;
-    request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".ChannelType"),
-                   TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL);
-    request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType"),
+    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
+                   TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL);
+    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
                    (uint) Tp::HandleTypeContact);
-    request.insert(QLatin1String(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle"),
+    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
                    otherContact->handle()[0]);
-    request.insert(TP_QT4_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
+    request.insert(TP_QT_YELL_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
                    true);
     QVERIFY(connect(mConn->lowlevel()->createChannel(request),
                     SIGNAL(finished(Tp::PendingOperation*)),
--- a/tests/lib/test.cpp	2011-12-15 12:27:40.773560936 +0100
+++ b/tests/lib/test.cpp	2011-12-15 12:27:44.471561119 +0100
@@ -6,12 +6,12 @@
 
 #include <TelepathyQt4Yell/Types>
 
-#include <TelepathyQt4/Types>
-#include <TelepathyQt4/Debug>
-#include <TelepathyQt4/DBus>
-#include <TelepathyQt4/PendingVoid>
-#include <TelepathyQt4/SharedPtr>
-#include <TelepathyQt4/RefCounted>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Debug>
+#include <TelepathyQt/DBus>
+#include <TelepathyQt/PendingVoid>
+#include <TelepathyQt/SharedPtr>
+#include <TelepathyQt/RefCounted>
 
 using Tp::PendingOperation;
 using Tp::PendingVoid;
--- a/tests/lib/test.h	2011-12-15 12:27:40.773560936 +0100
+++ b/tests/lib/test.h	2011-12-15 12:27:44.471561119 +0100
@@ -2,9 +2,9 @@
 
 #include <QtTest>
 
-#include <TelepathyQt4/PendingOperation>
-#include <TelepathyQt4/PendingVariant>
-#include <TelepathyQt4/Constants>
+#include <TelepathyQt/PendingOperation>
+#include <TelepathyQt/PendingVariant>
+#include <TelepathyQt/Constants>
 
 namespace Tp
 {
--- a/tools/qt4-client-gen.py	2011-12-15 12:27:40.769560941 +0100
+++ b/tools/qt4-client-gen.py	2011-12-15 12:27:44.429561115 +0100
@@ -85,9 +85,9 @@
 
 #include <QDBusPendingReply>
 
-#include <TelepathyQt4/AbstractInterface>
-#include <TelepathyQt4/DBusProxy>
-#include <TelepathyQt4/Global>
+#include <TelepathyQt/AbstractInterface>
+#include <TelepathyQt/DBusProxy>
+#include <TelepathyQt/Global>
 
 namespace Tp
 {
--- a/tools/qt4-types-gen.py	2011-12-15 12:27:40.769560941 +0100
+++ b/tools/qt4-types-gen.py	2011-12-15 12:27:44.429561115 +0100
@@ -172,7 +172,7 @@
 #include <QDBusSignature>
 #include <QDBusVariant>
 
-#include <TelepathyQt4/Global>
+#include <TelepathyQt/Global>
 
 /**
  * \\addtogroup typesconstants Types and constants
@@ -228,7 +228,7 @@
 """ % self.namespace)
 
         self.impl("""\
-TELEPATHY_QT4_NO_EXPORT void _registerTypes()
+TP_QT_NO_EXPORT void _registerTypes()
 {
     static bool registered = false;
     if (registered)