TargetHandleType has been renamed to TargetEntityType

68 files changed, 178 insertions, 178 deletions

diff --git a/NEWS b/NEWS
index a60f2aff6..1353352c0 100644
--- a/NEWS
+++ b/NEWS
@@ -445,7 +445,7 @@ Fixes:
 • Fix generation of reentrant-methods.list in highly parallel builds
   (fd.o #52480, Ross Burton)
 
-• TpBaseChannel: assert that the subclass sets TargetHandleType. (Will)
+• TpBaseChannel: assert that the subclass sets TargetEntityType. (Will)
 
 telepathy-glib 0.19.5 (2012-07-24)
 ==================================
diff --git a/NEWS-0.x b/NEWS-0.x
index b93d71547..1b3941ec7 100644
--- a/NEWS-0.x
+++ b/NEWS-0.x
@@ -300,7 +300,7 @@ Fixes:
 • Fix generation of reentrant-methods.list in highly parallel builds
   (fd.o #52480, Ross Burton)
 
-• TpBaseChannel: assert that the subclass sets TargetHandleType. (Will)
+• TpBaseChannel: assert that the subclass sets TargetEntityType. (Will)
 
 telepathy-glib 0.19.5 (2012-07-24)
 ==================================
diff --git a/data/Logger.Call.client.in b/data/Logger.Call.client.in
index 41be1d7b0..80462188d 100644
--- a/data/Logger.Call.client.in
+++ b/data/Logger.Call.client.in
@@ -1,8 +1,8 @@
 [im.telepathy.v1.Client.Observer.ObserverChannelFilter 3]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
-im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.TargetEntityType u=1
 
 [im.telepathy.v1.Client.Observer.ObserverChannelFilter 4]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
-im.telepathy.v1.Channel.TargetHandleType u=2
+im.telepathy.v1.Channel.TargetEntityType u=2
 
diff --git a/data/Logger.Text.client.in b/data/Logger.Text.client.in
index 82a187166..defbd0b8b 100644
--- a/data/Logger.Text.client.in
+++ b/data/Logger.Text.client.in
@@ -1,8 +1,8 @@
 [im.telepathy.v1.Client.Observer.ObserverChannelFilter 0]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
-im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.TargetEntityType u=1
 
 [im.telepathy.v1.Client.Observer.ObserverChannelFilter 1]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
-im.telepathy.v1.Channel.TargetHandleType u=2
+im.telepathy.v1.Channel.TargetEntityType u=2
 
diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index ba5fcc720..9ea6a21d7 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -2650,7 +2650,7 @@ TP_PROP_CHANNEL_REQUEST_PREFERRED_HANDLER
 TP_PROP_CHANNEL_REQUEST_REQUESTS
 TP_PROP_CHANNEL_REQUEST_USER_ACTION_TIME
 TP_PROP_CHANNEL_TARGET_HANDLE
-TP_PROP_CHANNEL_TARGET_HANDLE_TYPE
+TP_PROP_CHANNEL_TARGET_ENTITY_TYPE
 TP_PROP_CHANNEL_TARGET_ID
 TP_PROP_CHANNEL_TYPE_CALL1_CALL_FLAGS
 TP_PROP_CHANNEL_TYPE_CALL1_CALL_MEMBERS
diff --git a/examples/client/approver.c b/examples/client/approver.c
index 080c4f94d..adf91bb44 100644
--- a/examples/client/approver.c
+++ b/examples/client/approver.c
@@ -145,7 +145,7 @@ main (int argc,
   tp_base_client_take_approver_filter (approver, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_TEXT,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
 
@@ -153,7 +153,7 @@ main (int argc,
   tp_base_client_take_approver_filter (approver, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_CALL,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
   */
@@ -162,7 +162,7 @@ main (int argc,
   tp_base_client_take_approver_filter (approver, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_TEXT,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_ROOM,
         NULL));
 
@@ -170,7 +170,7 @@ main (int argc,
   tp_base_client_take_approver_filter (approver, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
 
diff --git a/examples/client/dbus-tubes/accepter.c b/examples/client/dbus-tubes/accepter.c
index a371b6db9..bbff74981 100644
--- a/examples/client/dbus-tubes/accepter.c
+++ b/examples/client/dbus-tubes/accepter.c
@@ -174,7 +174,7 @@ main (int argc,
       G_TYPE_STRING,
       TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
 
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
       G_TYPE_UINT,
       TP_ENTITY_TYPE_CONTACT,
 
diff --git a/examples/client/dbus-tubes/offerer.c b/examples/client/dbus-tubes/offerer.c
index f99712a36..edbc585ae 100644
--- a/examples/client/dbus-tubes/offerer.c
+++ b/examples/client/dbus-tubes/offerer.c
@@ -208,7 +208,7 @@ main (int argc,
       G_TYPE_STRING,
       TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
 
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
       G_TYPE_UINT,
       TP_ENTITY_TYPE_CONTACT,
 
diff --git a/examples/client/media-observer.c b/examples/client/media-observer.c
index c6b6a4731..9e1ae38f2 100644
--- a/examples/client/media-observer.c
+++ b/examples/client/media-observer.c
@@ -75,7 +75,7 @@ main (int argc,
   tp_base_client_take_observer_filter (observer, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_CALL,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
   */
diff --git a/examples/client/python/dialler.py b/examples/client/python/dialler.py
index 66dcce26c..f7144eef4 100755
--- a/examples/client/python/dialler.py
+++ b/examples/client/python/dialler.py
@@ -178,7 +178,7 @@ class Dialler(Gtk.Application):
                 {
                     Tp.PROP_CHANNEL_CHANNEL_TYPE:
                         Tp.IFACE_CHANNEL_TYPE_CALL,
-                    Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+                    Tp.PROP_CHANNEL_TARGET_ENTITY_TYPE:
                         int(Tp.HandleType.CONTACT),
                     Tp.PROP_CHANNEL_TARGET_ID: self.target_entry.get_text(),
                     Tp.PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO: True,
diff --git a/examples/client/python/ensure-channel.py b/examples/client/python/ensure-channel.py
index 310fff6a9..b38a136e7 100755
--- a/examples/client/python/ensure-channel.py
+++ b/examples/client/python/ensure-channel.py
@@ -21,14 +21,14 @@ def create_request_dict(action, contact_id):
         return {
             TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE:
                 TelepathyGLib.IFACE_CHANNEL_TYPE_TEXT,
-            TelepathyGLib.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+            TelepathyGLib.PROP_CHANNEL_TARGET_ENTITY_TYPE:
                 int(TelepathyGLib.HandleType.CONTACT),
             TelepathyGLib.PROP_CHANNEL_TARGET_ID: contact_id}
     elif action in ['audio', 'video']:
         return {
             TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE:
                 TelepathyGLib.IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-            TelepathyGLib.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+            TelepathyGLib.PROP_CHANNEL_TARGET_ENTITY_TYPE:
                 int(TelepathyGLib.HandleType.CONTACT),
             TelepathyGLib.PROP_CHANNEL_TARGET_ID: contact_id,
             TelepathyGLib.PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO:
diff --git a/examples/client/python/file-transfer.py b/examples/client/python/file-transfer.py
index 6850d4599..55627693d 100755
--- a/examples/client/python/file-transfer.py
+++ b/examples/client/python/file-transfer.py
@@ -65,7 +65,7 @@ if __name__ == '__main__':
     request_dict = {
         TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE:
             TelepathyGLib.IFACE_CHANNEL_TYPE_FILE_TRANSFER,
-        TelepathyGLib.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+        TelepathyGLib.PROP_CHANNEL_TARGET_ENTITY_TYPE:
             int(TelepathyGLib.HandleType.CONTACT),
         TelepathyGLib.PROP_CHANNEL_TARGET_ID:
             contact_id,
diff --git a/examples/client/python/ft-handler.py b/examples/client/python/ft-handler.py
index 3d457da4e..5f47ca427 100644
--- a/examples/client/python/ft-handler.py
+++ b/examples/client/python/ft-handler.py
@@ -56,7 +56,7 @@ if __name__ == '__main__':
     handler.add_handler_filter({
         TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE:
             TelepathyGLib.IFACE_CHANNEL_TYPE_FILE_TRANSFER,
-        TelepathyGLib.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+        TelepathyGLib.PROP_CHANNEL_TARGET_ENTITY_TYPE:
             int(TelepathyGLib.HandleType.CONTACT),
         TelepathyGLib.PROP_CHANNEL_REQUESTED: False
         })
diff --git a/examples/client/python/stream-tube-accepter.py b/examples/client/python/stream-tube-accepter.py
index 2ab960ec9..8d0da1d48 100755
--- a/examples/client/python/stream-tube-accepter.py
+++ b/examples/client/python/stream-tube-accepter.py
@@ -65,7 +65,7 @@ if __name__ == '__main__':
 
     handler.add_handler_filter({
         Tp.PROP_CHANNEL_CHANNEL_TYPE: Tp.IFACE_CHANNEL_TYPE_STREAM_TUBE,
-        Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE: int(Tp.HandleType.CONTACT),
+        Tp.PROP_CHANNEL_TARGET_ENTITY_TYPE: int(Tp.HandleType.CONTACT),
         Tp.PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE: "ExampleService",
     })
 
diff --git a/examples/client/python/stream-tube-offerer.py b/examples/client/python/stream-tube-offerer.py
index 65eb528c7..884ba74c7 100755
--- a/examples/client/python/stream-tube-offerer.py
+++ b/examples/client/python/stream-tube-offerer.py
@@ -90,7 +90,7 @@ if __name__ == '__main__':
     request_dict = {
         Tp.PROP_CHANNEL_CHANNEL_TYPE:
             Tp.IFACE_CHANNEL_TYPE_STREAM_TUBE,
-        Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+        Tp.PROP_CHANNEL_TARGET_ENTITY_TYPE:
             int(Tp.HandleType.CONTACT),
         Tp.PROP_CHANNEL_TARGET_ID:
             contact_id,
diff --git a/examples/client/python/text-handler.py b/examples/client/python/text-handler.py
index 6b1c0e3dd..4d6a9f8d1 100755
--- a/examples/client/python/text-handler.py
+++ b/examples/client/python/text-handler.py
@@ -61,7 +61,7 @@ if __name__ == '__main__':
     handler.add_handler_filter({
         TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE: TelepathyGLib.IFACE_CHANNEL_TYPE_TEXT,
         # bgo #637466
-        TelepathyGLib.PROP_CHANNEL_TARGET_HANDLE_TYPE: int(TelepathyGLib.HandleType.CONTACT),
+        TelepathyGLib.PROP_CHANNEL_TARGET_ENTITY_TYPE: int(TelepathyGLib.HandleType.CONTACT),
         TelepathyGLib.PROP_CHANNEL_REQUESTED: False,
     })
 
diff --git a/examples/client/stream-tubes/accepter.c b/examples/client/stream-tubes/accepter.c
index d8848696f..ca0649dd3 100644
--- a/examples/client/stream-tubes/accepter.c
+++ b/examples/client/stream-tubes/accepter.c
@@ -116,7 +116,7 @@ main (int argc,
         G_TYPE_STRING,
         TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
 
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
         G_TYPE_UINT,
         TP_ENTITY_TYPE_CONTACT,
 
diff --git a/examples/client/stream-tubes/offerer.c b/examples/client/stream-tubes/offerer.c
index e3eb7bc6b..18b6de080 100644
--- a/examples/client/stream-tubes/offerer.c
+++ b/examples/client/stream-tubes/offerer.c
@@ -160,7 +160,7 @@ main (int argc,
       G_TYPE_STRING,
       TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
 
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
       G_TYPE_UINT,
       TP_ENTITY_TYPE_CONTACT,
 
diff --git a/examples/client/text-handler.c b/examples/client/text-handler.c
index 4e79f1c05..db722acd5 100644
--- a/examples/client/text-handler.c
+++ b/examples/client/text-handler.c
@@ -115,7 +115,7 @@ main (int argc,
   tp_base_client_take_handler_filter (handler, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_TEXT,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
         NULL));
diff --git a/examples/cm/call/call-channel.c b/examples/cm/call/call-channel.c
index cb4bc76e1..2985a2f7b 100644
--- a/examples/cm/call/call-channel.c
+++ b/examples/cm/call/call-channel.c
@@ -338,7 +338,7 @@ example_call_channel_class_init (ExampleCallChannelClass *klass)
   call_class->add_content = call_add_content;
   call_class->hangup = call_hangup;
 
-  base_class->target_handle_type = TP_ENTITY_TYPE_CONTACT;
+  base_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
   base_class->get_interfaces = example_call_channel_get_interfaces;
   base_class->close = close_channel;
 
diff --git a/examples/cm/call/call-manager.c b/examples/cm/call/call-manager.c
index 4287e8114..fe7443344 100644
--- a/examples/cm/call/call-manager.c
+++ b/examples/cm/call/call-manager.c
@@ -358,14 +358,14 @@ new_channel (ExampleCallManager *self,
 
 static const gchar * const audio_fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
     TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
     NULL
 };
 
 static const gchar * const video_fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
     TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
     NULL
 };
@@ -392,7 +392,7 @@ example_call_manager_type_foreach_channel_class (GType type,
   GHashTable *table = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE,
           G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL1,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
     TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
       NULL);
 
@@ -425,7 +425,7 @@ example_call_manager_request (ExampleCallManager *self,
     }
 
   if (tp_asv_get_uint32 (request_properties,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) != TP_ENTITY_TYPE_CONTACT)
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL) != TP_ENTITY_TYPE_CONTACT)
     {
       return FALSE;
     }
diff --git a/examples/cm/call/example_call.manager b/examples/cm/call/example_call.manager
index a863e57be..1eb54c137 100644
--- a/examples/cm/call/example_call.manager
+++ b/examples/cm/call/example_call.manager
@@ -14,12 +14,12 @@ Icon=face-smile
 
 [audio]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
-im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.TargetEntityType u=1
 im.telepathy.v1.Channel.Type.Call1.InitialAudio b=1
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;im.telepathy.v1.Channel.Type.Call1.InitialVideo;
 
 [video]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
-im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.TargetEntityType u=1
 im.telepathy.v1.Channel.Type.Call1.InitialVideo b=1
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;im.telepathy.v1.Channel.Type.Call1.InitialAudio;
diff --git a/examples/cm/channelspecific/example_csh.manager b/examples/cm/channelspecific/example_csh.manager
index 8beed206c..6114bf208 100644
--- a/examples/cm/channelspecific/example_csh.manager
+++ b/examples/cm/channelspecific/example_csh.manager
@@ -14,5 +14,5 @@ Icon=face-smile
 
 [room]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
-im.telepathy.v1.Channel.TargetHandleType u=2
+im.telepathy.v1.Channel.TargetEntityType u=2
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
diff --git a/examples/cm/channelspecific/room-manager.c b/examples/cm/channelspecific/room-manager.c
index acd5aa838..44f46f46c 100644
--- a/examples/cm/channelspecific/room-manager.c
+++ b/examples/cm/channelspecific/room-manager.c
@@ -261,7 +261,7 @@ new_channel (ExampleCSHRoomManager *self,
 
 static const gchar * const fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
     NULL
 };
 
@@ -279,7 +279,7 @@ example_csh_room_manager_type_foreach_channel_class (GType type,
     GHashTable *table = tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE,
             G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_ROOM,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_ROOM,
         NULL);
 
     func (type, table, allowed_properties, user_data);
@@ -305,7 +305,7 @@ example_csh_room_manager_request (ExampleCSHRoomManager *self,
     }
 
   if (tp_asv_get_uint32 (request_properties,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) != TP_ENTITY_TYPE_ROOM)
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL) != TP_ENTITY_TYPE_ROOM)
     {
       return FALSE;
     }
diff --git a/examples/cm/channelspecific/room.c b/examples/cm/channelspecific/room.c
index 07a81544f..f8a83ad0c 100644
--- a/examples/cm/channelspecific/room.c
+++ b/examples/cm/channelspecific/room.c
@@ -405,7 +405,7 @@ example_csh_room_channel_class_init (ExampleCSHRoomChannelClass *klass)
   object_class->finalize = finalize;
 
   base_class->channel_type = TP_IFACE_CHANNEL_TYPE_TEXT;
-  base_class->target_handle_type = TP_ENTITY_TYPE_ROOM;
+  base_class->target_entity_type = TP_ENTITY_TYPE_ROOM;
   base_class->get_interfaces = example_csh_room_channel_get_interfaces;
 
   base_class->close = example_csh_room_channel_close;
diff --git a/examples/cm/contactlist/example_contact_list.manager b/examples/cm/contactlist/example_contact_list.manager
index 238b4a994..a6fd78d04 100644
--- a/examples/cm/contactlist/example_contact_list.manager
+++ b/examples/cm/contactlist/example_contact_list.manager
@@ -14,10 +14,10 @@ Icon=face-smile
 
 [contactlist]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ContactList
-im.telepathy.v1.Channel.TargetHandleType u=3
+im.telepathy.v1.Channel.TargetEntityType u=3
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
 
 [contactgroup]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ContactList
-im.telepathy.v1.Channel.TargetHandleType u=4
+im.telepathy.v1.Channel.TargetEntityType u=4
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
diff --git a/examples/cm/echo-message-parts/chan.c b/examples/cm/echo-message-parts/chan.c
index 15dbef738..7d2a6fabf 100644
--- a/examples/cm/echo-message-parts/chan.c
+++ b/examples/cm/echo-message-parts/chan.c
@@ -332,7 +332,7 @@ example_echo_2_channel_class_init (ExampleEcho2ChannelClass *klass)
   object_class->finalize = finalize;
 
   base_class->channel_type = TP_IFACE_CHANNEL_TYPE_TEXT;
-  base_class->target_handle_type = TP_ENTITY_TYPE_CONTACT;
+  base_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
   base_class->get_interfaces = example_echo_2_channel_get_interfaces;
   base_class->close = example_echo_2_channel_close;
   base_class->fill_immutable_properties =
diff --git a/examples/cm/echo-message-parts/example_echo_2.manager b/examples/cm/echo-message-parts/example_echo_2.manager
index cd283cac0..b56a85d61 100644
--- a/examples/cm/echo-message-parts/example_echo_2.manager
+++ b/examples/cm/echo-message-parts/example_echo_2.manager
@@ -12,5 +12,5 @@ Icon=im-icq
 
 [1-1-text]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
-im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.TargetEntityType u=1
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
diff --git a/examples/cm/echo-message-parts/im-manager.c b/examples/cm/echo-message-parts/im-manager.c
index 236d143d5..a826aa418 100644
--- a/examples/cm/echo-message-parts/im-manager.c
+++ b/examples/cm/echo-message-parts/im-manager.c
@@ -257,7 +257,7 @@ new_channel (ExampleEcho2ImManager *self,
 
 static const gchar * const fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
     NULL
 };
 
@@ -275,7 +275,7 @@ example_echo_2_im_manager_type_foreach_channel_class (GType type,
   GHashTable *table = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE,
           G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
       NULL);
 
   func (type, table, allowed_properties, user_data);
@@ -301,7 +301,7 @@ example_echo_2_im_manager_request (ExampleEcho2ImManager *self,
     }
 
   if (tp_asv_get_uint32 (request_properties,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) != TP_ENTITY_TYPE_CONTACT)
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL) != TP_ENTITY_TYPE_CONTACT)
     {
       return FALSE;
     }
diff --git a/telepathy-farstream/examples/call-handler.c b/telepathy-farstream/examples/call-handler.c
index 8d8291312..bde8bb4e9 100644
--- a/telepathy-farstream/examples/call-handler.c
+++ b/telepathy-farstream/examples/call-handler.c
@@ -608,7 +608,7 @@ main (int argc, char **argv)
     tp_asv_new (
        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_CALL1,
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+       TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, G_TYPE_BOOLEAN,
           TRUE,
@@ -618,7 +618,7 @@ main (int argc, char **argv)
     tp_asv_new (
        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_CALL1,
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+       TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, G_TYPE_BOOLEAN,
           TRUE,
diff --git a/telepathy-farstream/examples/python/callhandler.py b/telepathy-farstream/examples/python/callhandler.py
index 71af24cd9..0d99ca32f 100644
--- a/telepathy-farstream/examples/python/callhandler.py
+++ b/telepathy-farstream/examples/python/callhandler.py
@@ -61,22 +61,22 @@ class CallHandler(dbus.service.Object, telepathy.server.DBusProperties):
     def _get_filters(self):
         return dbus.Array ([
             { CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CALL,
-              CHANNEL_INTERFACE + ".TargetHandleType":
+              CHANNEL_INTERFACE + ".TargetEntityType":
                 CONNECTION_HANDLE_TYPE_CONTACT,
               CALL_INITIAL_AUDIO: True,
             },
             { CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CALL,
-              CHANNEL_INTERFACE + ".TargetHandleType":
+              CHANNEL_INTERFACE + ".TargetEntityType":
                 CONNECTION_HANDLE_TYPE_CONTACT,
               CALL_INITIAL_VIDEO: True,
             },
             { CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CALL,
-              CHANNEL_INTERFACE + ".TargetHandleType":
+              CHANNEL_INTERFACE + ".TargetEntityType":
                 CONNECTION_HANDLE_TYPE_ROOM,
               CALL_INITIAL_AUDIO: True,
             },
             { CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CALL,
-              CHANNEL_INTERFACE + ".TargetHandleType":
+              CHANNEL_INTERFACE + ".TargetEntityType":
                 CONNECTION_HANDLE_TYPE_ROOM,
               CALL_INITIAL_VIDEO: True,
             }
diff --git a/telepathy-farstream/examples/python/callui.py b/telepathy-farstream/examples/python/callui.py
index 9e7558f6c..570f70f7d 100644
--- a/telepathy-farstream/examples/python/callui.py
+++ b/telepathy-farstream/examples/python/callui.py
@@ -47,7 +47,7 @@ class CallChannelRequest:
 
         props = {
             CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CALL,
-            CHANNEL_INTERFACE + ".TargetHandleType": calltype,
+            CHANNEL_INTERFACE + ".TargetEntityType": calltype,
               CHANNEL_INTERFACE + ".TargetID": contact,
         }
 
@@ -76,7 +76,7 @@ class CallChannelRequest:
 class Account:
     CALL_CLASS = {
         CHANNEL_INTERFACE + '.ChannelType': CHANNEL_TYPE_CALL,
-        CHANNEL_INTERFACE + '.TargetHandleType': HANDLE_TYPE_CONTACT
+        CHANNEL_INTERFACE + '.TargetEntityType': HANDLE_TYPE_CONTACT
     }
 
     def __init__(self, bus, path):
@@ -103,7 +103,7 @@ class Account:
         conn = self.bus.get_object (path[1:].replace("/","."), path)
         yours, channel, properties = conn.EnsureChannel (
             { CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CONTACT_LIST,
-              CHANNEL_INTERFACE + ".TargetHandleType": HANDLE_TYPE_LIST,
+              CHANNEL_INTERFACE + ".TargetEntityType": HANDLE_TYPE_LIST,
               CHANNEL_INTERFACE + ".TargetID": "subscribe"
             },
             dbus_interface = CONNECTION_INTERFACE_REQUESTS
diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c
index 72dc5df7b..86ea45333 100644
--- a/telepathy-glib/account-channel-request.c
+++ b/telepathy-glib/account-channel-request.c
@@ -1606,7 +1606,7 @@ tp_account_channel_request_set_target_contact (
 
   /* Do not use tp_asv_set_uint32 or similar - the key is dup'd */
   g_hash_table_insert (self->priv->request,
-      g_strdup (TP_PROP_CHANNEL_TARGET_HANDLE_TYPE),
+      g_strdup (TP_PROP_CHANNEL_TARGET_ENTITY_TYPE),
       tp_g_value_slice_new_uint (TP_ENTITY_TYPE_CONTACT));
   /* We use the ID because it persists across a disconnect/reconnect */
   g_hash_table_insert (self->priv->request,
@@ -1643,7 +1643,7 @@ tp_account_channel_request_set_target_id (
 
   /* Do not use tp_asv_set_uint32 or similar - the key is dup'd */
   g_hash_table_insert (self->priv->request,
-      g_strdup (TP_PROP_CHANNEL_TARGET_HANDLE_TYPE),
+      g_strdup (TP_PROP_CHANNEL_TARGET_ENTITY_TYPE),
       tp_g_value_slice_new_uint (handle_type));
   g_hash_table_insert (self->priv->request,
       g_strdup (TP_PROP_CHANNEL_TARGET_ID),
diff --git a/telepathy-glib/base-channel.c b/telepathy-glib/base-channel.c
index 4b93698b7..7e3ee42b2 100644
--- a/telepathy-glib/base-channel.c
+++ b/telepathy-glib/base-channel.c
@@ -30,7 +30,7 @@
  * relevant properties.
  *
  * Subclasses should fill in #TpBaseChannelClass.channel_type and
- * #TpBaseChannelClass.target_handle_type; and implement the
+ * #TpBaseChannelClass.target_entity_type; and implement the
  * #TpBaseChannelClass.get_interfaces and
  * #TpBaseChannelClass.close virtual functions.
  *
@@ -125,7 +125,7 @@
  * @dbus_props_class: The class structure for the DBus properties mixin
  * @channel_type: The type of channel that instances of this class represent
  * (e.g. #TP_IFACE_CHANNEL_TYPE_TEXT)
- * @target_handle_type: The type of handle that is the target of channels of
+ * @target_entity_type: The type of handle that is the target of channels of
  * this type
  * @close: A virtual function called to close the channel, which will be called
  *  by tp_base_channel_close() and by the implementation of the Closed D-Bus
@@ -610,7 +610,7 @@ tp_base_channel_get_self_handle (TpBaseChannel *chan)
  * @chan: a channel
  *
  * Returns the target handle of @chan (without a reference), which will be 0
- * if #TpBaseChannelClass.target_handle_type is #TP_ENTITY_TYPE_NONE for this
+ * if #TpBaseChannelClass.target_entity_type is #TP_ENTITY_TYPE_NONE for this
  * class, and non-zero otherwise. This is a shortcut for retrieving the
  * #TpChannelIface:handle property.
  *
@@ -739,7 +739,7 @@ tp_base_channel_fill_basic_immutable_properties (TpBaseChannel *chan, GHashTable
   tp_dbus_properties_mixin_fill_properties_hash (G_OBJECT (chan),
       properties,
       TP_IFACE_CHANNEL, "ChannelType",
-      TP_IFACE_CHANNEL, "TargetHandleType",
+      TP_IFACE_CHANNEL, "TargetEntityType",
       TP_IFACE_CHANNEL, "TargetHandle",
       TP_IFACE_CHANNEL, "TargetID",
       TP_IFACE_CHANNEL, "InitiatorHandle",
@@ -820,7 +820,7 @@ tp_base_channel_get_property (GObject *object,
       g_value_set_static_string (value, klass->channel_type);
       break;
     case PROP_HANDLE_TYPE:
-      g_value_set_uint (value, klass->target_handle_type);
+      g_value_set_uint (value, klass->target_entity_type);
       break;
     case PROP_HANDLE:
       g_value_set_uint (value, chan->priv->target);
@@ -829,9 +829,9 @@ tp_base_channel_get_property (GObject *object,
       if (chan->priv->target != 0)
         {
           TpHandleRepoIface *repo = tp_base_connection_get_handles (
-              chan->priv->conn, klass->target_handle_type);
+              chan->priv->conn, klass->target_entity_type);
 
-          g_assert (klass->target_handle_type != TP_ENTITY_TYPE_NONE);
+          g_assert (klass->target_entity_type != TP_ENTITY_TYPE_NONE);
           g_assert (repo != NULL);
           g_value_set_string (value, tp_handle_inspect (repo, chan->priv->target));
         }
@@ -970,7 +970,7 @@ static void
 tp_base_channel_class_init (TpBaseChannelClass *tp_base_channel_class)
 {
   static TpDBusPropertiesMixinPropImpl channel_props[] = {
-      { "TargetHandleType", "handle-type", NULL },
+      { "TargetEntityType", "handle-type", NULL },
       { "TargetHandle", "handle", NULL },
       { "TargetID", "target-id", NULL },
       { "ChannelType", "channel-type", NULL },
diff --git a/telepathy-glib/base-channel.h b/telepathy-glib/base-channel.h
index c886ff127..51788493f 100644
--- a/telepathy-glib/base-channel.h
+++ b/telepathy-glib/base-channel.h
@@ -55,7 +55,7 @@ struct _TpBaseChannelClass
   TpDBusPropertiesMixinClass dbus_props_class;
 
   const gchar *channel_type;
-  TpEntityType target_handle_type;
+  TpEntityType target_entity_type;
 
   TpBaseChannelCloseFunc close;
   TpBaseChannelFillPropertiesFunc fill_immutable_properties;
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index 46734ca8b..4baf0e1af 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -368,7 +368,7 @@ tp_base_client_add_observer_filter (TpBaseClient *self,
  *    tp_asv_new (
  *        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
  *            TP_IFACE_CHANNEL_TYPE_TEXT,
- *        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+ *        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
  *            TP_ENTITY_TYPE_CONTACT,
  *        ...));
  * ]|
@@ -409,7 +409,7 @@ tp_base_client_take_observer_filter (TpBaseClient *self,
  * tp_base_client_add_observer_filter_vardict (client,
  *    g_variant_new_parsed ("{ %s: <%s>, %s: <%u>, ... }",
  *        TP_PROP_CHANNEL_CHANNEL_TYPE, TP_IFACE_CHANNEL_TYPE_TEXT,
- *        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, (guint32) TP_ENTITY_TYPE_CONTACT,
+ *        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, (guint32) TP_ENTITY_TYPE_CONTACT,
  *        ...));
  * ]|
  *
@@ -551,7 +551,7 @@ tp_base_client_add_approver_filter (TpBaseClient *self,
  *    tp_asv_new (
  *        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
  *            TP_IFACE_CHANNEL_TYPE_TEXT,
- *        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+ *        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
  *            TP_ENTITY_TYPE_CONTACT,
  *        ...));
  * ]|
@@ -668,7 +668,7 @@ tp_base_client_add_handler_filter (TpBaseClient *self,
  *    tp_asv_new (
  *        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
  *            TP_IFACE_CHANNEL_TYPE_TEXT,
- *        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+ *        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
  *            TP_ENTITY_TYPE_CONTACT,
  *        ...));
  * ]|
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 262d6804e..4ac89443a 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -2358,13 +2358,13 @@ static void conn_requests_check_basic_properties (TpBaseConnection *self,
 static void
 conn_requests_requestotron_validate_handle (TpBaseConnection *self,
     GHashTable *requested_properties, TpChannelManagerRequestMethod method,
-    const gchar *type, TpEntityType target_handle_type,
+    const gchar *type, TpEntityType target_entity_type,
     TpHandle target_handle, const gchar *target_id,
     DBusGMethodInvocation *context);
 
 static void conn_requests_offer_request (TpBaseConnection *self,
     GHashTable *requested_properties, TpChannelManagerRequestMethod method,
-    const gchar *type, TpEntityType target_handle_type,
+    const gchar *type, TpEntityType target_entity_type,
     TpHandle target_handle, DBusGMethodInvocation *context);
 
 
@@ -2399,11 +2399,11 @@ conn_requests_check_basic_properties (TpBaseConnection *self,
                                       DBusGMethodInvocation *context)
 {
   /* Step 1:
-   *  Check that ChannelType, TargetHandleType, TargetHandle, TargetID have
+   *  Check that ChannelType, TargetEntityType, TargetHandle, TargetID have
    *  the correct types, and that ChannelType is not omitted.
    */
   const gchar *type;
-  TpEntityType target_handle_type;
+  TpEntityType target_entity_type;
   TpHandle target_handle;
   const gchar *target_id;
   gboolean valid;
@@ -2414,14 +2414,14 @@ conn_requests_check_basic_properties (TpBaseConnection *self,
   if (type == NULL)
     RETURN_INVALID_ARGUMENT ("ChannelType is required");
 
-  target_handle_type = tp_asv_get_uint32 (requested_properties,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, &valid);
+  target_entity_type = tp_asv_get_uint32 (requested_properties,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, &valid);
 
-  /* Allow TargetHandleType to be missing, but not to be otherwise broken */
+  /* Allow TargetEntityType to be missing, but not to be otherwise broken */
   if (!valid && tp_asv_lookup (requested_properties,
-          TP_PROP_CHANNEL_TARGET_HANDLE_TYPE) != NULL)
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE) != NULL)
     RETURN_INVALID_ARGUMENT (
-        "TargetHandleType must be an integer in range 0 to 2**32-1");
+        "TargetEntityType must be an integer in range 0 to 2**32-1");
 
   target_handle = tp_asv_get_uint32 (requested_properties,
       TP_PROP_CHANNEL_TARGET_HANDLE, &valid);
@@ -2458,7 +2458,7 @@ conn_requests_check_basic_properties (TpBaseConnection *self,
 
   conn_requests_requestotron_validate_handle (self,
       requested_properties, method,
-      type, target_handle_type, target_handle, target_id,
+      type, target_entity_type, target_handle, target_id,
       context);
 }
 
@@ -2472,7 +2472,7 @@ conn_requests_requestotron_validate_handle (TpBaseConnection *self,
                                             GHashTable *requested_properties,
                                             TpChannelManagerRequestMethod method,
                                             const gchar *type,
-                                            TpEntityType target_handle_type,
+                                            TpEntityType target_entity_type,
                                             TpHandle target_handle,
                                             const gchar *target_id,
                                             DBusGMethodInvocation *context)
@@ -2484,28 +2484,28 @@ conn_requests_requestotron_validate_handle (TpBaseConnection *self,
   GValue *target_id_value = NULL;
 
   /* Handle type 0 cannot have a handle */
-  if (target_handle_type == TP_ENTITY_TYPE_NONE && target_handle != 0)
+  if (target_entity_type == TP_ENTITY_TYPE_NONE && target_handle != 0)
     RETURN_INVALID_ARGUMENT (
-        "When TargetHandleType is NONE, TargetHandle must be omitted");
+        "When TargetEntityType is NONE, TargetHandle must be omitted");
 
   /* Handle type 0 cannot have a target id */
-  if (target_handle_type == TP_ENTITY_TYPE_NONE && target_id != NULL)
+  if (target_entity_type == TP_ENTITY_TYPE_NONE && target_id != NULL)
     RETURN_INVALID_ARGUMENT (
-      "When TargetHandleType is NONE, TargetID must be omitted");
+      "When TargetEntityType is NONE, TargetID must be omitted");
 
-  if (target_handle_type != TP_ENTITY_TYPE_NONE)
+  if (target_entity_type != TP_ENTITY_TYPE_NONE)
     {
       GError *error = NULL;
 
       if (target_handle == 0 && target_id == NULL)
-        RETURN_INVALID_ARGUMENT ("When TargetHandleType is not None, either "
+        RETURN_INVALID_ARGUMENT ("When TargetEntityType is not None, either "
             "TargetHandle or TargetID must also be given");
 
       if (target_handle != 0 && target_id != NULL)
         RETURN_INVALID_ARGUMENT (
             "TargetHandle and TargetID must not both be given");
 
-      handles = tp_base_connection_get_handles (self, target_handle_type);
+      handles = tp_base_connection_get_handles (self, target_entity_type);
 
       if (handles == NULL)
         {
@@ -2572,7 +2572,7 @@ conn_requests_requestotron_validate_handle (TpBaseConnection *self,
     }
 
   conn_requests_offer_request (self, requested_properties, method, type,
-      target_handle_type, target_handle, context);
+      target_entity_type, target_handle, context);
 
   /* If we made a new table, we should destroy it, and whichever of the GValues
    * holding TargetHandle or TargetID we filled in.  The other GValues are
@@ -2596,7 +2596,7 @@ conn_requests_offer_request (TpBaseConnection *self,
                              GHashTable *requested_properties,
                              TpChannelManagerRequestMethod method,
                              const gchar *type,
-                             TpEntityType target_handle_type,
+                             TpEntityType target_entity_type,
                              TpHandle target_handle,
                              DBusGMethodInvocation *context)
 {
@@ -2623,7 +2623,7 @@ conn_requests_offer_request (TpBaseConnection *self,
     }
 
   request = _tp_channel_manager_request_new (context, method,
-      type, target_handle_type, target_handle);
+      type, target_entity_type, target_handle);
   g_ptr_array_add (priv->channel_requests, request);
 
   for (i = 0; i < priv->channel_managers->len; i++)
diff --git a/telepathy-glib/base-password-channel.c b/telepathy-glib/base-password-channel.c
index 99839458f..8418155fb 100644
--- a/telepathy-glib/base-password-channel.c
+++ b/telepathy-glib/base-password-channel.c
@@ -291,7 +291,7 @@ tp_base_password_channel_class_init (TpBasePasswordChannelClass *tp_base_passwor
   object_class->finalize = tp_base_password_channel_finalize;
 
   chan_class->channel_type = TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION1;
-  chan_class->target_handle_type = TP_ENTITY_TYPE_NONE;
+  chan_class->target_entity_type = TP_ENTITY_TYPE_NONE;
   chan_class->get_interfaces = tp_base_password_channel_get_interfaces;
   chan_class->close = tp_base_password_channel_close;
   chan_class->fill_immutable_properties =
diff --git a/telepathy-glib/capabilities.c b/telepathy-glib/capabilities.c
index eefb6d091..d3e88d99b 100644
--- a/telepathy-glib/capabilities.c
+++ b/telepathy-glib/capabilities.c
@@ -336,7 +336,7 @@ supports_simple_channel (TpCapabilities *self,
 
       chan_type = tp_asv_get_string (fixed, TP_PROP_CHANNEL_CHANNEL_TYPE);
       handle_type = tp_asv_get_uint32 (fixed,
-          TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, &valid);
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, &valid);
 
       if (!valid)
         continue;
@@ -363,7 +363,7 @@ supports_simple_channel (TpCapabilities *self,
  * then this method will return %FALSE.
  *
  * Returns: %TRUE if a channel request containing Text as ChannelType,
- * HandleTypeContact as TargetHandleType and a contact identifier can be
+ * HandleTypeContact as TargetEntityType and a contact identifier can be
  * expected to work, %FALSE otherwise.
  *
  * Since: 0.11.3
@@ -394,7 +394,7 @@ tp_capabilities_supports_text_chats (TpCapabilities *self)
  * (because more information is needed), then this method will return %FALSE.
  *
  * Returns: %TRUE if a channel request containing Text as ChannelType,
- * HandleTypeRoom as TargetHandleType and a channel identifier can be
+ * HandleTypeRoom as TargetEntityType and a channel identifier can be
  * expected to work, %FALSE otherwise.
  *
  * Since: 0.11.3
@@ -419,7 +419,7 @@ tp_capabilities_supports_text_chatrooms (TpCapabilities *self)
  * SMS text channels.
  *
  * Returns: %TRUE if a channel request containing Text as ChannelType,
- * HandleTypeContact as TargetHandleType, a channel identifier and
+ * HandleTypeContact as TargetEntityType, a channel identifier and
  * #TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL set to %TRUE can be
  * expected to work, %FALSE otherwise.
  *
@@ -447,7 +447,7 @@ tp_capabilities_supports_sms (TpCapabilities *self)
           &allowed);
 
       handle_type = tp_asv_get_uint32 (fixed,
-          TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, &valid);
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, &valid);
 
       if (!valid)
         continue;
@@ -514,7 +514,7 @@ supports_call_full (TpCapabilities *self,
         continue;
 
       handle_type = tp_asv_get_uint32 (fixed_prop,
-          TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, &valid);
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, &valid);
       if (!valid || handle_type != expected_handle_type)
         continue;
 
@@ -572,7 +572,7 @@ supports_call_full (TpCapabilities *self,
  * @handle_type to %TP_ENTITY_TYPE_CONTACT.
  *
  * Returns: %TRUE if a channel request containing Call as ChannelType,
- * @handle_type as TargetHandleType, a True value for InitialAudio and an
+ * @handle_type as TargetEntityType, a True value for InitialAudio and an
  * identifier of the appropriate type can be expected to work, %FALSE otherwise.
  *
  * Since: 0.17.6
@@ -600,7 +600,7 @@ tp_capabilities_supports_audio_call (TpCapabilities *self,
  * @handle_type to %TP_ENTITY_TYPE_CONTACT.
  *
  * Returns: %TRUE if a channel request containing Call as ChannelType,
- * @handle_type as TargetHandleType, a True value for
+ * @handle_type as TargetEntityType, a True value for
  * InitialAudio/InitialVideo and an identifier of the appropriate type can be
  * expected to work,
  * %FALSE otherwise.
@@ -648,7 +648,7 @@ supports_file_transfer (TpCapabilities *self,
         continue;
 
       handle_type = tp_asv_get_uint32 (fixed,
-          TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, &valid);
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, &valid);
 
       if (!valid)
         continue;
@@ -711,7 +711,7 @@ supports_file_transfer (TpCapabilities *self,
  * a contact identifier.
  *
  * Returns: %TRUE if a channel request containing FileTransfer as ChannelType,
- * HandleTypeContact as TargetHandleType and a contact identifier can be
+ * HandleTypeContact as TargetEntityType and a contact identifier can be
  * expected to work, %FALSE otherwise.
  *
  * Since: 0.17.6
@@ -828,7 +828,7 @@ tp_capabilities_supports_tubes_common (TpCapabilities *self,
         continue;
 
       handle_type = tp_asv_get_uint32 (fixed,
-          TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, &valid);
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, &valid);
       if (!valid || handle_type != expected_handle_type)
         continue;
 
@@ -858,7 +858,7 @@ tp_capabilities_supports_tubes_common (TpCapabilities *self,
  *
  * If the #TpCapabilities:contact-specific property is %TRUE, this function
  * checks if the contact associated with this #TpCapabilities supports
- * stream tubes with @handle_type as TargetHandleType.
+ * stream tubes with @handle_type as TargetEntityType.
  * If @service is not %NULL, it also checks if it supports stream tubes
  * with @service as #TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE.
  *
@@ -890,7 +890,7 @@ tp_capabilities_supports_stream_tubes (TpCapabilities *self,
  *
  * If the #TpCapabilities:contact-specific property is %TRUE, this function
  * checks if the contact associated with this #TpCapabilities supports
- * D-Bus tubes with @handle_type as TargetHandleType.
+ * D-Bus tubes with @handle_type as TargetEntityType.
  * If @service_name is not %NULL, it also checks if it supports stream tubes
  * with @service as #TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME.
  *
@@ -958,8 +958,8 @@ tp_capabilities_supports_contact_search (TpCapabilities *self,
 
       tp_value_array_unpack (arr, 2, &fixed, &allowed_properties);
 
-      /* ContactSearch channel should have ChannelType and TargetHandleType=NONE
-       * but CM implementations are wrong and omitted TargetHandleType,
+      /* ContactSearch channel should have ChannelType and TargetEntityType=NONE
+       * but CM implementations are wrong and omitted TargetEntityType,
        * so it's set in stone now.  */
       if (g_hash_table_size (fixed) != 1)
         continue;
@@ -1008,7 +1008,7 @@ tp_capabilities_supports_contact_search (TpCapabilities *self,
  * request = tp_asv_new (
  *     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
  *       TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
- *     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_NONE,
+ *     TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_NONE,
  *     NULL);
  *
  * req = tp_account_channel_request_new (account, request,
@@ -1028,14 +1028,14 @@ tp_capabilities_supports_contact_search (TpCapabilities *self,
  * request = tp_asv_new (
  *     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
  *       TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
- *     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_NONE,
+ *     TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_NONE,
  *     TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER, G_TYPE_STRING,
  *       "characters.shakespeare.lit",
  *     NULL);
  * ]|
  *
  * Returns: %TRUE if a channel request containing RoomList as ChannelType,
- * HandleTypeNone as TargetHandleType can be expected to work,
+ * HandleTypeNone as TargetEntityType can be expected to work,
  * %FALSE otherwise.
  *
  * Since: 0.13.14
@@ -1067,7 +1067,7 @@ tp_capabilities_supports_room_list (TpCapabilities *self,
         continue;
 
       handle_type = tp_asv_get_uint32 (fixed,
-          TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, &valid);
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, &valid);
       if (!valid || handle_type != TP_ENTITY_TYPE_NONE)
         continue;
 
diff --git a/telepathy-glib/channel-manager.c b/telepathy-glib/channel-manager.c
index f42bb1049..cd7edea3c 100644
--- a/telepathy-glib/channel-manager.c
+++ b/telepathy-glib/channel-manager.c
@@ -142,13 +142,13 @@
  *      the ChannelType property is present, and is a (const gchar *)
  *   </listitem>
  *   <listitem>
- *     the TargetHandleType property is a valid #TpEntityType, if present
+ *     the TargetEntityType property is a valid #TpEntityType, if present
  *   </listitem>
  *   <listitem>
- *     if TargetHandleType is None, TargetHandle is omitted
+ *     if TargetEntityType is None, TargetHandle is omitted
  *   </listitem>
  *   <listitem>
- *     if TargetHandleType is not None, TargetHandle is a valid #TpHandle of
+ *     if TargetEntityType is not None, TargetHandle is a valid #TpHandle of
  *     that #TpEntityType
  *   </listitem>
  * </itemizedlist>
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index fa1bb0e96..aef035858 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -486,7 +486,7 @@ _tp_channel_maybe_set_handle_type (TpChannel *self,
     {
       self->priv->handle_type = handle_type;
       g_hash_table_insert (self->priv->channel_properties,
-          g_strdup (TP_PROP_CHANNEL_TARGET_HANDLE_TYPE),
+          g_strdup (TP_PROP_CHANNEL_TARGET_ENTITY_TYPE),
           tp_g_value_slice_new_uint (handle_type));
     }
 }
@@ -567,7 +567,7 @@ tp_channel_set_property (GObject *object,
                   (GBoxedCopyFunc) tp_g_value_slice_dup);
 
               u = tp_asv_get_uint32 (self->priv->channel_properties,
-                  TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, &valid);
+                  TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, &valid);
               _tp_channel_maybe_set_handle_type (self, u, valid);
 
               u = tp_asv_get_uint32 (self->priv->channel_properties,
@@ -673,7 +673,7 @@ _tp_channel_got_properties (TpProxy *proxy,
   _tp_channel_maybe_set_interfaces (self,
       tp_asv_get_boxed (asv, "Interfaces", G_TYPE_STRV));
 
-  u = tp_asv_get_uint32 (asv, "TargetHandleType", &valid);
+  u = tp_asv_get_uint32 (asv, "TargetEntityType", &valid);
   _tp_channel_maybe_set_handle_type (self, u, valid);
 
   u = tp_asv_get_uint32 (asv, "TargetHandle", &valid);
@@ -1173,7 +1173,7 @@ tp_channel_class_init (TpChannelClass *klass)
    *
    * Changed in 0.11.4: this property is never %NULL. Previously,
    * it was %NULL before an identifier was known, or when a channel
-   * with no TargetID D-Bus property had TargetHandleType %TP_ENTITY_TYPE_NONE.
+   * with no TargetID D-Bus property had TargetEntityType %TP_ENTITY_TYPE_NONE.
    */
   param_spec = g_param_spec_string ("identifier",
       "The identifier",
diff --git a/telepathy-glib/dbus-tube-channel.c b/telepathy-glib/dbus-tube-channel.c
index db2e239ca..ea25bd8c6 100644
--- a/telepathy-glib/dbus-tube-channel.c
+++ b/telepathy-glib/dbus-tube-channel.c
@@ -31,7 +31,7 @@
  * |[
  * GHashTable *request_properties = tp_asv_new (
  *     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
- *     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+ *     TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
  *     TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, tp_contact_get_identifier (contact),
  *     TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME, G_TYPE_STRING, "com.example.walrus",
  *     NULL);
diff --git a/telepathy-glib/exportable-channel.c b/telepathy-glib/exportable-channel.c
index 0e79a1226..2fb2edbda 100644
--- a/telepathy-glib/exportable-channel.c
+++ b/telepathy-glib/exportable-channel.c
@@ -109,7 +109,7 @@ exportable_channel_base_init (gpointer klass)
        *      tp_dbus_properties_mixin_make_properties_hash (object,
        *          // The spec says these properties MUST be included:
        *          TP_IFACE_CHANNEL, "TargetHandle",
-       *          TP_IFACE_CHANNEL, "TargetHandleType",
+       *          TP_IFACE_CHANNEL, "TargetEntityType",
        *          TP_IFACE_CHANNEL, "ChannelType",
        *          TP_IFACE_CHANNEL, "TargetID",
        *          TP_IFACE_CHANNEL, "Requested",
diff --git a/telepathy-glib/file-transfer-channel.c b/telepathy-glib/file-transfer-channel.c
index 4507f90e0..28e6c3744 100644
--- a/telepathy-glib/file-transfer-channel.c
+++ b/telepathy-glib/file-transfer-channel.c
@@ -45,7 +45,7 @@
  * |[
  * GHashTable *request = tp_asv_new (
  *     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
- *     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+ *     TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
  *     TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, "foo@bar.com",
  *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE, G_TYPE_STRING, "text/plain",
  *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE, G_TYPE_INT64, 1320925992,
@@ -939,7 +939,7 @@ tp_file_transfer_channel_class_init (TpFileTransferChannelClass *klass)
    * |[
    * tp_base_client_take_handler_filter (handler, tp_asv_new (
    *               TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
-   *               TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+   *               TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
    *               TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
    *               TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME, G_TYPE_STRING, "service.name",
    *               NULL));
@@ -978,7 +978,7 @@ tp_file_transfer_channel_class_init (TpFileTransferChannelClass *klass)
    *
    * request = tp_asv_new (
    *     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
-   *     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+   *     TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
    *     TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, "foo@bar.com",
    *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE, G_TYPE_STRING, "text/plain",
    *     TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_DATE, G_TYPE_INT64, 1320925992,
diff --git a/telepathy-glib/simple-approver.c b/telepathy-glib/simple-approver.c
index c6d90da14..ec3046f19 100644
--- a/telepathy-glib/simple-approver.c
+++ b/telepathy-glib/simple-approver.c
@@ -49,7 +49,7 @@
  *
  * tp_base_client_take_approver_filter (client, tp_asv_new (
  *      TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
- *      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+ *      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
  *      NULL));
  *
  * tp_base_client_register (client, NULL);
diff --git a/telepathy-glib/simple-handler.c b/telepathy-glib/simple-handler.c
index 2d0dac6a4..be4a2ec2c 100644
--- a/telepathy-glib/simple-handler.c
+++ b/telepathy-glib/simple-handler.c
@@ -50,7 +50,7 @@
  *
  * tp_base_client_take_handler_filter (client, tp_asv_new (
  *      TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
- *      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+ *      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
  *      NULL));
  *
  * tp_base_client_register (client, NULL);
diff --git a/telepathy-glib/simple-observer.c b/telepathy-glib/simple-observer.c
index 55bd29e57..96093434a 100644
--- a/telepathy-glib/simple-observer.c
+++ b/telepathy-glib/simple-observer.c
@@ -49,7 +49,7 @@
  *
  * tp_base_client_take_observer_filter (client, tp_asv_new (
  *      TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
- *      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+ *      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
  *      NULL));
  *
  * tp_base_client_register (client, NULL);
diff --git a/telepathy-logger/observer.c b/telepathy-logger/observer.c
index 4484bcffe..79e04665d 100644
--- a/telepathy-logger/observer.c
+++ b/telepathy-logger/observer.c
@@ -223,7 +223,7 @@ _tpl_observer_init (TplObserver *self)
       tp_asv_new (
        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
            TP_IFACE_CHANNEL_TYPE_TEXT,
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+       TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
            TP_ENTITY_TYPE_CONTACT,
       NULL));
 
@@ -232,7 +232,7 @@ _tpl_observer_init (TplObserver *self)
       tp_asv_new (
        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
            TP_IFACE_CHANNEL_TYPE_TEXT,
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+       TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
            TP_ENTITY_TYPE_ROOM,
       NULL));
 
@@ -241,7 +241,7 @@ _tpl_observer_init (TplObserver *self)
       tp_asv_new (
        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
            "im.telepathy.v1.Channel.Type.Call1",
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+       TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
            TP_ENTITY_TYPE_CONTACT,
       NULL));
 
@@ -250,7 +250,7 @@ _tpl_observer_init (TplObserver *self)
       tp_asv_new (
        TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
            "im.telepathy.v1.Channel.Type.Call1",
-       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+       TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
            TP_ENTITY_TYPE_ROOM,
       NULL));
 
diff --git a/tests/capabilities.c b/tests/capabilities.c
index 9c9bbb3d2..0ecfc0ef7 100644
--- a/tests/capabilities.c
+++ b/tests/capabilities.c
@@ -37,7 +37,7 @@ add_text_chat_class (GPtrArray *classes,
   fixed = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_TEXT,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           handle_type,
       NULL);
 
@@ -68,7 +68,7 @@ add_ft_class (GPtrArray *classes,
   fixed = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
       NULL);
 
@@ -127,7 +127,7 @@ test_basics (Test *test,
   chan_type = tp_asv_get_string (fixed, TP_PROP_CHANNEL_CHANNEL_TYPE);
   g_assert_cmpstr (chan_type, ==, TP_IFACE_CHANNEL_TYPE_TEXT);
 
-  handle_type = tp_asv_get_uint32 (fixed, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+  handle_type = tp_asv_get_uint32 (fixed, TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
       &valid);
   g_assert (valid);
   g_assert_cmpuint (handle_type, ==, TP_ENTITY_TYPE_CONTACT);
@@ -148,7 +148,7 @@ test_basics (Test *test,
   chan_type = tp_asv_get_string (fixed, TP_PROP_CHANNEL_CHANNEL_TYPE);
   g_assert_cmpstr (chan_type, ==, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1);
 
-  handle_type = tp_asv_get_uint32 (fixed, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+  handle_type = tp_asv_get_uint32 (fixed, TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
       &valid);
   g_assert (valid);
   g_assert_cmpuint (handle_type, ==, TP_ENTITY_TYPE_CONTACT);
@@ -253,7 +253,7 @@ add_stream_tube_class (GPtrArray *classes,
   fixed = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           handle_type,
       NULL);
 
@@ -286,7 +286,7 @@ add_dbus_tube_class (GPtrArray *classes,
   fixed = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           handle_type,
       NULL);
 
@@ -611,7 +611,7 @@ add_room_list_class (GPtrArray *classes,
   fixed = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_ROOM_LIST1,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_NONE,
       NULL);
 
@@ -718,7 +718,7 @@ add_sms_class (GPtrArray *classes,
   fixed = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_TEXT,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
       NULL);
 
@@ -820,7 +820,7 @@ add_call_class (GPtrArray *classes,
   fixed = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_CALL1,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           handle_type,
       NULL);
 
@@ -1139,7 +1139,7 @@ test_classes_variant (Test *test,
   g_assert_cmpstr (chan_type, ==, TP_IFACE_CHANNEL_TYPE_TEXT);
 
   g_assert (g_variant_lookup (fixed,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, "u", &handle_type));
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, "u", &handle_type));
   g_assert_cmpuint (handle_type, ==, TP_ENTITY_TYPE_CONTACT);
 
   g_assert_cmpuint (g_variant_n_children (allowed), ==, 0);
@@ -1163,7 +1163,7 @@ test_classes_variant (Test *test,
   g_assert_cmpstr (chan_type, ==, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1);
 
   g_assert (g_variant_lookup (fixed,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, "u", &handle_type));
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, "u", &handle_type));
   g_assert_cmpuint (handle_type, ==, TP_ENTITY_TYPE_CONTACT);
 
   g_assert_cmpuint (g_variant_n_children (allowed), ==, 2);
diff --git a/tests/dbus/account-channel-request.c b/tests/dbus/account-channel-request.c
index 4e6bed87b..67db9608a 100644
--- a/tests/dbus/account-channel-request.c
+++ b/tests/dbus/account-channel-request.c
@@ -187,7 +187,7 @@ create_request (void)
 {
   return tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
         TP_ENTITY_TYPE_CONTACT,
       TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, "alice",
       NULL);
@@ -199,7 +199,7 @@ floating_request (void)
   return g_variant_new_parsed (
       "{ %s: <%s>, %s: <%u>, %s: <%s> }",
       TP_PROP_CHANNEL_CHANNEL_TYPE, TP_IFACE_CHANNEL_TYPE_TEXT,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, (guint32) TP_ENTITY_TYPE_CONTACT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, (guint32) TP_ENTITY_TYPE_CONTACT,
       TP_PROP_CHANNEL_TARGET_ID, "alice");
 }
 
@@ -237,7 +237,7 @@ test_handle_create_success (Test *test,
   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
         TP_PROP_CHANNEL_TARGET_ID), ==, "alice");
   g_assert_cmpuint (tp_asv_get_uint32 (test->cd_service->last_request,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
   g_assert_cmpuint (tp_asv_size (test->cd_service->last_request), ==, 3);
 
   g_object_unref (req);
@@ -276,7 +276,7 @@ test_handle_create_fail (Test *test,
   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
         TP_PROP_CHANNEL_TARGET_ID), ==, "alice");
   g_assert_cmpuint (tp_asv_get_uint32 (test->cd_service->last_request,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
   g_assert_cmpuint (tp_asv_get_boolean (test->cd_service->last_request,
         TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, NULL), ==, TRUE);
   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
@@ -507,7 +507,7 @@ test_handle_ensure_success (Test *test,
   g_assert_cmpstr (tp_asv_get_string (test->cd_service->last_request,
         TP_PROP_CHANNEL_TARGET_ID), ==, "alice");
   g_assert_cmpuint (tp_asv_get_uint32 (test->cd_service->last_request,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
   g_assert_cmpuint (tp_asv_size (test->cd_service->last_request), ==, 3);
 }
 
diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c
index 4c695eec3..ab2ca09ee 100644
--- a/tests/dbus/base-client.c
+++ b/tests/dbus/base-client.c
@@ -402,7 +402,7 @@ check_filters (GPtrArray *filters)
   g_assert_cmpstr (tp_asv_get_string (filter, TP_PROP_CHANNEL_CHANNEL_TYPE), ==,
       TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
   g_assert_cmpuint (tp_asv_get_uint32 (filter,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
 }
 
 static void
@@ -481,7 +481,7 @@ test_observer (Test *test,
   tp_base_client_take_observer_filter (test->base_client, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
 
@@ -625,7 +625,7 @@ test_approver (Test *test,
   tp_base_client_take_approver_filter (test->base_client, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
 
@@ -813,7 +813,7 @@ test_handler (Test *test,
   tp_base_client_take_handler_filter (test->base_client, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
 
@@ -965,7 +965,7 @@ test_handler_requests (Test *test,
   tp_base_client_take_handler_filter (test->base_client, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
 
diff --git a/tests/dbus/call-channel.c b/tests/dbus/call-channel.c
index c9bd10840..60cfded78 100644
--- a/tests/dbus/call-channel.c
+++ b/tests/dbus/call-channel.c
@@ -174,7 +174,7 @@ outgoing_call (Test *test,
   GHashTable *request = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE,
           G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL1,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
       TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, id,
       TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
           G_TYPE_BOOLEAN, initial_audio,
diff --git a/tests/dbus/channel-introspect.c b/tests/dbus/channel-introspect.c
index a07e5e53c..01b63b3da 100644
--- a/tests/dbus/channel-introspect.c
+++ b/tests/dbus/channel-introspect.c
@@ -88,7 +88,7 @@ assert_chan_sane (TpChannel *chan,
       tp_vardict_get_string (variant, TP_PROP_CHANNEL_CHANNEL_TYPE), ==,
       TP_IFACE_CHANNEL_TYPE_TEXT);
   g_assert_cmpuint (
-      tp_vardict_get_uint32 (variant, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==,
+      tp_vardict_get_uint32 (variant, TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL), ==,
       handle == 0 ? TP_ENTITY_TYPE_NONE : TP_ENTITY_TYPE_CONTACT);
   g_assert_cmpuint (
       tp_vardict_get_uint32 (variant, TP_PROP_CHANNEL_TARGET_HANDLE, NULL), ==,
@@ -222,7 +222,7 @@ main (int argc,
   asv = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_TEXT,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
       TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, handle,
       TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, IDENTIFIER,
       TP_PROP_CHANNEL_INITIATOR_HANDLE, G_TYPE_UINT, handle,
@@ -260,7 +260,7 @@ main (int argc,
     asv = tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
             TP_IFACE_CHANNEL_TYPE_TEXT,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
             TP_ENTITY_TYPE_CONTACT,
         TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, handle,
         TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, IDENTIFIER,
@@ -331,7 +331,7 @@ main (int argc,
     asv = tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
             TP_IFACE_CHANNEL_TYPE_TEXT,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
             TP_ENTITY_TYPE_CONTACT,
         TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, handle,
         TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, IDENTIFIER,
diff --git a/tests/dbus/channel-manager-request-properties.c b/tests/dbus/channel-manager-request-properties.c
index 43229b09b..077d8931f 100644
--- a/tests/dbus/channel-manager-request-properties.c
+++ b/tests/dbus/channel-manager-request-properties.c
@@ -164,7 +164,7 @@ test_target_id (Test *test,
 
   request = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
       TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, "lolbags#dingdong",
       NULL);
 
diff --git a/tests/dbus/contacts.c b/tests/dbus/contacts.c
index c6e509e99..c57630d2c 100644
--- a/tests/dbus/contacts.c
+++ b/tests/dbus/contacts.c
@@ -799,7 +799,7 @@ add_text_chat_class (GPtrArray *classes,
   fixed = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_TEXT,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           handle_type,
       NULL);
 
diff --git a/tests/dbus/message-mixin.c b/tests/dbus/message-mixin.c
index 42d815010..a8c602ab0 100644
--- a/tests/dbus/message-mixin.c
+++ b/tests/dbus/message-mixin.c
@@ -219,7 +219,7 @@ main (int argc,
       GHashTable *request = tp_asv_new (
           TP_PROP_CHANNEL_CHANNEL_TYPE,
               G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
-          TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
               G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
           TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, "them@example.com",
           NULL);
diff --git a/tests/dbus/simple-approver.c b/tests/dbus/simple-approver.c
index 78c177771..7d4c6f0d9 100644
--- a/tests/dbus/simple-approver.c
+++ b/tests/dbus/simple-approver.c
@@ -231,7 +231,7 @@ check_filters (GPtrArray *filters)
   g_assert_cmpstr (tp_asv_get_string (filter, TP_PROP_CHANNEL_CHANNEL_TYPE), ==,
       TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
   g_assert_cmpuint (tp_asv_get_uint32 (filter,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
 }
 
 static void
@@ -286,7 +286,7 @@ test_properties (Test *test,
   tp_base_client_add_approver_filter_vardict (test->simple_approver,
       g_variant_new_parsed ("{ %s: <%s>, %s: <%u> }",
         TP_PROP_CHANNEL_CHANNEL_TYPE, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, (guint32) TP_ENTITY_TYPE_CONTACT));
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, (guint32) TP_ENTITY_TYPE_CONTACT));
 
   tp_base_client_register (test->simple_approver, &test->error);
   g_assert_no_error (test->error);
diff --git a/tests/dbus/simple-handler.c b/tests/dbus/simple-handler.c
index 44d94838e..1a8e32d3b 100644
--- a/tests/dbus/simple-handler.c
+++ b/tests/dbus/simple-handler.c
@@ -235,7 +235,7 @@ check_filters (GPtrArray *filters)
   g_assert_cmpstr (tp_asv_get_string (filter, TP_PROP_CHANNEL_CHANNEL_TYPE), ==,
       TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
   g_assert_cmpuint (tp_asv_get_uint32 (filter,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
 }
 
 static void
@@ -307,7 +307,7 @@ test_properties (Test *test,
   tp_base_client_add_handler_filter_vardict (test->simple_handler,
       g_variant_new_parsed ("{ %s: <%s>, %s: <%u> }",
         TP_PROP_CHANNEL_CHANNEL_TYPE, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, (guint32) TP_ENTITY_TYPE_CONTACT));
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, (guint32) TP_ENTITY_TYPE_CONTACT));
 
   tp_base_client_register (test->simple_handler, &test->error);
   g_assert_no_error (test->error);
diff --git a/tests/dbus/simple-observer.c b/tests/dbus/simple-observer.c
index 4c4142124..3615f2c0d 100644
--- a/tests/dbus/simple-observer.c
+++ b/tests/dbus/simple-observer.c
@@ -207,7 +207,7 @@ check_filters (GPtrArray *filters)
   g_assert_cmpstr (tp_asv_get_string (filter, TP_PROP_CHANNEL_CHANNEL_TYPE), ==,
       TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1);
   g_assert_cmpuint (tp_asv_get_uint32 (filter,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL), ==, TP_ENTITY_TYPE_CONTACT);
 }
 
 static void
@@ -274,7 +274,7 @@ test_properties (Test *test,
   tp_base_client_add_observer_filter_vardict (test->simple_observer,
       g_variant_new_parsed ("{ %s: <%s>, %s: <%u> }",
         TP_PROP_CHANNEL_CHANNEL_TYPE, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, (guint32) TP_ENTITY_TYPE_CONTACT));
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, (guint32) TP_ENTITY_TYPE_CONTACT));
 
   tp_base_client_register (test->simple_observer, &test->error);
   g_assert_no_error (test->error);
diff --git a/tests/dbus/telepathy-1/managers/test_manager_file.manager b/tests/dbus/telepathy-1/managers/test_manager_file.manager
index 0498e64c2..a6388e2da 100644
--- a/tests/dbus/telepathy-1/managers/test_manager_file.manager
+++ b/tests/dbus/telepathy-1/managers/test_manager_file.manager
@@ -28,7 +28,7 @@ MaximumAvatarBytes=37748736
 
 [1-1-text]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
-im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.TargetEntityType u=1
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
 
 [Protocol bar]
diff --git a/tests/lib/dbus-tube-chan.c b/tests/lib/dbus-tube-chan.c
index fc781e2f9..d2de191e0 100644
--- a/tests/lib/dbus-tube-chan.c
+++ b/tests/lib/dbus-tube-chan.c
@@ -241,7 +241,7 @@ tp_tests_dbus_tube_channel_class_init (TpTestsDBusTubeChannelClass *klass)
   base_class->close = channel_close;
   base_class->fill_immutable_properties = fill_immutable_properties;
 
-  /* base_class->target_handle_type is defined in subclasses */
+  /* base_class->target_entity_type is defined in subclasses */
 
   param_spec = g_param_spec_string ("service-name", "Service Name",
       "the service name associated with this tube object.",
@@ -430,7 +430,7 @@ tp_tests_contact_dbus_tube_channel_class_init (
 {
   TpBaseChannelClass *base_class = TP_BASE_CHANNEL_CLASS (klass);
 
-  base_class->target_handle_type = TP_ENTITY_TYPE_CONTACT;
+  base_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
 }
 
 /* Room DBus Tube */
@@ -451,5 +451,5 @@ tp_tests_room_dbus_tube_channel_class_init (
 {
   TpBaseChannelClass *base_class = TP_BASE_CHANNEL_CLASS (klass);
 
-  base_class->target_handle_type = TP_ENTITY_TYPE_ROOM;
+  base_class->target_entity_type = TP_ENTITY_TYPE_ROOM;
 }
diff --git a/tests/lib/echo-chan.c b/tests/lib/echo-chan.c
index 023cd67f4..644237807 100644
--- a/tests/lib/echo-chan.c
+++ b/tests/lib/echo-chan.c
@@ -132,7 +132,7 @@ tp_tests_echo_channel_class_init (TpTestsEchoChannelClass *klass)
   object_class->finalize = finalize;
 
   base_class->channel_type = TP_IFACE_CHANNEL_TYPE_TEXT;
-  base_class->target_handle_type = TP_ENTITY_TYPE_CONTACT;
+  base_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
   base_class->get_interfaces = tp_tests_echo_channel_get_interfaces;
   base_class->close = channel_close;
 
diff --git a/tests/lib/echo-im-manager.c b/tests/lib/echo-im-manager.c
index 4ea1328af..71afd6db6 100644
--- a/tests/lib/echo-im-manager.c
+++ b/tests/lib/echo-im-manager.c
@@ -261,7 +261,7 @@ new_channel (TpTestsEchoImManager *self,
 
 static const gchar * const fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
     NULL
 };
 
@@ -279,7 +279,7 @@ tp_tests_echo_im_manager_foreach_channel_class (TpChannelManager *manager,
   GHashTable *table = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE,
           G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
       NULL);
 
 
@@ -306,7 +306,7 @@ tp_tests_echo_im_manager_request (TpTestsEchoImManager *self,
     }
 
   if (tp_asv_get_uint32 (request_properties,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) != TP_ENTITY_TYPE_CONTACT)
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL) != TP_ENTITY_TYPE_CONTACT)
     {
       return FALSE;
     }
diff --git a/tests/lib/file-transfer-chan.c b/tests/lib/file-transfer-chan.c
index ff9eb65d4..813826e83 100644
--- a/tests/lib/file-transfer-chan.c
+++ b/tests/lib/file-transfer-chan.c
@@ -614,7 +614,7 @@ tp_tests_file_transfer_channel_class_init (
   object_class->dispose = dispose;
 
   base_class->channel_type = TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1;
-  base_class->target_handle_type = TP_ENTITY_TYPE_CONTACT;
+  base_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
 
   base_class->close = channel_close;
   base_class->fill_immutable_properties = fill_immutable_properties;
diff --git a/tests/lib/room-list-chan.c b/tests/lib/room-list-chan.c
index be3d98210..a71b29cbc 100644
--- a/tests/lib/room-list-chan.c
+++ b/tests/lib/room-list-chan.c
@@ -134,7 +134,7 @@ tp_tests_room_list_chan_class_init (
   oclass->finalize = tp_tests_room_list_chan_finalize;
 
   base_class->channel_type = TP_IFACE_CHANNEL_TYPE_ROOM_LIST1;
-  base_class->target_handle_type = TP_ENTITY_TYPE_NONE;
+  base_class->target_entity_type = TP_ENTITY_TYPE_NONE;
   base_class->fill_immutable_properties = fill_immutable_properties;
   base_class->close = room_list_chan_close;
 
diff --git a/tests/lib/stream-tube-chan.c b/tests/lib/stream-tube-chan.c
index 64008bcff..8a41064d0 100644
--- a/tests/lib/stream-tube-chan.c
+++ b/tests/lib/stream-tube-chan.c
@@ -277,7 +277,7 @@ tp_tests_stream_tube_channel_class_init (TpTestsStreamTubeChannelClass *klass)
   base_class->close = channel_close;
   base_class->fill_immutable_properties = fill_immutable_properties;
 
-  /* base_class->target_handle_type is defined in subclasses */
+  /* base_class->target_entity_type is defined in subclasses */
 
   param_spec = g_param_spec_string ("service", "service name",
       "the service associated with this tube object.",
@@ -625,7 +625,7 @@ tp_tests_contact_stream_tube_channel_class_init (
 {
   TpBaseChannelClass *base_class = TP_BASE_CHANNEL_CLASS (klass);
 
-  base_class->target_handle_type = TP_ENTITY_TYPE_CONTACT;
+  base_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
 }
 
 /* Room Stream Tube */
@@ -646,5 +646,5 @@ tp_tests_room_stream_tube_channel_class_init (
 {
   TpBaseChannelClass *base_class = TP_BASE_CHANNEL_CLASS (klass);
 
-  base_class->target_handle_type = TP_ENTITY_TYPE_ROOM;
+  base_class->target_entity_type = TP_ENTITY_TYPE_ROOM;
 }
diff --git a/tests/lib/textchan-group.c b/tests/lib/textchan-group.c
index 733579722..fedb0028d 100644
--- a/tests/lib/textchan-group.c
+++ b/tests/lib/textchan-group.c
@@ -223,7 +223,7 @@ tp_tests_text_channel_group_class_init (TpTestsTextChannelGroupClass *klass)
   object_class->finalize = finalize;
 
   base_class->channel_type = TP_IFACE_CHANNEL_TYPE_TEXT;
-  base_class->target_handle_type = TP_ENTITY_TYPE_NONE;
+  base_class->target_entity_type = TP_ENTITY_TYPE_NONE;
   base_class->get_interfaces = text_channel_group_get_interfaces;
   base_class->close = channel_close;
 
diff --git a/tests/lib/util.c b/tests/lib/util.c
index 8acfd2394..245efcc46 100644
--- a/tests/lib/util.c
+++ b/tests/lib/util.c
@@ -650,7 +650,7 @@ tp_tests_channel_new (TpConnection *conn,
   if (optional_handle_type != TP_ENTITY_TYPE_NONE)
     {
       tp_asv_set_uint32 (asv,
-          TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, optional_handle_type);
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, optional_handle_type);
     }
   if (optional_handle != 0)
     {