diff --git a/src/account-identity-dialog.cpp b/src/account-identity-dialog.cpp
index df8b085377e2847cd3e3c9405402bab1bcaf6a04..0ca69fabaf9f014944491c92650de5cb80c501dd 100644
--- a/src/account-identity-dialog.cpp
+++ b/src/account-identity-dialog.cpp
@@ -43,7 +43,7 @@ AccountIdentityDialog::AccountIdentityDialog(const Tp::AccountPtr &account, QWid
     setButtons(KDialog::Ok | KDialog::Cancel);
 
     connect(m_account.data(), SIGNAL(nicknameChanged(QString)), SLOT(onNicknameChanged(QString)));
-    connect(m_account.data(), SIGNAL(avatarChanged(Tp::Avatar)), SLOT(onAvatarChanged(Tp::Avatar)));
+    connect(m_account.data(), SIGNAL(avatarChanged(TpDBus::Avatar)), SLOT(onAvatarChanged(TpDBus::Avatar)));
     onNicknameChanged(account->nickname());
     onAvatarChanged(account->avatar());
 
@@ -63,7 +63,7 @@ void AccountIdentityDialog::onNicknameChanged(const QString &nickname)
     ui->accountNickname->setText(nickname);
 }
 
-void AccountIdentityDialog::onAvatarChanged(const Tp::Avatar &avatar)
+void AccountIdentityDialog::onAvatarChanged(const TpDBus::Avatar &avatar)
 {
     ui->accountAvatar->setAvatar(avatar);
 }
diff --git a/src/account-identity-dialog.h b/src/account-identity-dialog.h
index cb06fd13296576d5f71e3413f9caa8118daf1fa3..fe6354892b1bb675ffcb8a36b2f732169f2005cb 100644
--- a/src/account-identity-dialog.h
+++ b/src/account-identity-dialog.h
@@ -49,7 +49,7 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void onNicknameChanged(const QString &nickname);
-    void onAvatarChanged(const Tp::Avatar &avatar);
+    void onAvatarChanged(const TpDBus::Avatar &avatar);
 
 private:
     Tp::AccountPtr m_account;
diff --git a/src/avatar-button.cpp b/src/avatar-button.cpp
index 8e0338e5235214c958bbaa3808c851737522ce22..d3b387b66df0de496ef39830f219e8b6959934af 100644
--- a/src/avatar-button.cpp
+++ b/src/avatar-button.cpp
@@ -1,5 +1,5 @@
 /*
- * Button representing user's Avatar
+ * Button representing user's TpDBus::Avatar
  *
  * Copyright (C) 2011  Martin Klapetek <martin.klapetek@gmail.com>
  *
@@ -62,7 +62,7 @@ AvatarButton::~AvatarButton()
 
 }
 
-void AvatarButton::setAvatar(const Tp::Avatar &avatar)
+void AvatarButton::setAvatar(const TpDBus::Avatar &avatar)
 {
     m_avatar = avatar;
 
@@ -77,7 +77,7 @@ void AvatarButton::setAvatar(const Tp::Avatar &avatar)
     }
 }
 
-Tp::Avatar AvatarButton::avatar() const
+TpDBus::Avatar AvatarButton::avatar() const
 {
     return m_avatar;
 }
@@ -148,7 +148,7 @@ void AvatarButton::onLoadAvatarFromFile()
         return;
     }
 
-    Tp::Avatar avatar;
+    TpDBus::Avatar avatar;
     avatar.MIMEType = QLatin1String("image/png");
     QDataStream stream(&avatar.avatarData, QIODevice::WriteOnly);
     if (!finalPixmap.save(stream.device(), "PNG")) {
@@ -197,6 +197,6 @@ QPixmap AvatarButton::cropPixmap(const QPixmap &pixmap, int maxWidth, int maxHei
 
 void AvatarButton::onClearAvatar()
 {
-    setAvatar(Tp::Avatar());
+    setAvatar(TpDBus::Avatar());
     Q_EMIT avatarChanged();
 }
diff --git a/src/avatar-button.h b/src/avatar-button.h
index cdc04dfcf3b514809a0757a538d76c6de8885675..8e0cb8fbceece6199ce83bd187e1d6fc22326b01 100644
--- a/src/avatar-button.h
+++ b/src/avatar-button.h
@@ -1,5 +1,5 @@
 /*
- * Button representing user's Avatar
+ * Button representing user's TpDBus::Avatar
  *
  * Copyright (C) 2011  Martin Klapetek <martin.klapetek@gmail.com>
  *
@@ -39,8 +39,8 @@ public:
 
     void setAccount(const Tp::AccountPtr &account);
 
-    void setAvatar(const Tp::Avatar &avatar);
-    Tp::Avatar avatar() const;
+    void setAvatar(const TpDBus::Avatar &avatar);
+    TpDBus::Avatar avatar() const;
 
 Q_SIGNALS:
     void avatarChanged();
@@ -53,7 +53,7 @@ private:
     QPixmap cropPixmap(const QPixmap &pixmap, int maxWidth, int maxHeight,
                        int minWidth, int minHeight) const;
 
-    Tp::Avatar m_avatar;
+    TpDBus::Avatar m_avatar;
     Tp::AccountPtr m_account;
 
 };