7 files changed, 14 insertions, 14 deletions
diff --git a/tests/dbus/account-channel-request.c b/tests/dbus/account-channel-request.c
index 953500328..5034ee8d1 100644
--- a/tests/dbus/account-channel-request.c
+++ b/tests/dbus/account-channel-request.c
@@ -1086,7 +1086,7 @@ test_observe_cancel_after_create (Test *test,
 /* Check if TargetHandleType: TP_ENTITY_TYPE_NONE is automatically added if no
  * target has been specified by the user. */
 static void
-test_no_handle_type (Test *test,
+test_no_entity_type (Test *test,
     gconstpointer data G_GNUC_UNUSED)
 {
   TpAccountChannelRequest *req;
@@ -1253,8 +1253,8 @@ main (int argc,
       setup, test_stream_tube_props, teardown);
   g_test_add ("/account-channels/test-dbus-tube-props", Test, NULL,
       setup, test_dbus_tube_props, teardown);
-  g_test_add ("/account-channels/test-no-handle-type", Test, NULL,
-      setup, test_no_handle_type, teardown);
+  g_test_add ("/account-channels/test-no-entity-type", Test, NULL,
+      setup, test_no_entity_type, teardown);
   g_test_add ("/account-channels/test-initial-invitees", Test, NULL,
       setup, test_initial_invitees, teardown);
 
diff --git a/tests/dbus/channel-introspect.c b/tests/dbus/channel-introspect.c
index 1cda337d0..72d3652d7 100644
--- a/tests/dbus/channel-introspect.c
+++ b/tests/dbus/channel-introspect.c
@@ -184,7 +184,7 @@ main (int argc,
   tp_tests_proxy_run_until_dbus_queue_processed (conn);
 
   chan = tp_tests_channel_new (conn, props_chan_path, NULL,
-      TP_UNKNOWN_HANDLE_TYPE, 0, &error);
+      TP_UNKNOWN_ENTITY_TYPE, 0, &error);
   g_assert_no_error (error);
 
   prepare_result = NULL;
@@ -307,7 +307,7 @@ main (int argc,
   bad_chan_path = g_strdup_printf ("%s/Does/Not/Actually/Exist",
       tp_proxy_get_object_path (conn));
   chan = tp_tests_channel_new (conn, bad_chan_path, NULL,
-      TP_UNKNOWN_HANDLE_TYPE, 0, &error);
+      TP_UNKNOWN_ENTITY_TYPE, 0, &error);
   g_assert_no_error (error);
 
   tp_tests_proxy_run_until_prepared_or_failed (chan, NULL, &error);
@@ -374,7 +374,7 @@ main (int argc,
   g_message ("Channel already dead");
 
   chan = tp_tests_channel_new (conn, props_chan_path, NULL,
-      TP_UNKNOWN_HANDLE_TYPE, 0, &error);
+      TP_UNKNOWN_ENTITY_TYPE, 0, &error);
   g_assert_no_error (error);
 
   prepare_result = NULL;
diff --git a/tests/dbus/cli-group.c b/tests/dbus/cli-group.c
index 4a199e26c..2c4b89ed5 100644
--- a/tests/dbus/cli-group.c
+++ b/tests/dbus/cli-group.c
@@ -171,7 +171,7 @@ run_membership_test (void)
       "connection", service_conn,
       "object-path", chan_path,
       NULL));
-  chan = tp_tests_channel_new (conn, chan_path, NULL, TP_UNKNOWN_HANDLE_TYPE, 0,
+  chan = tp_tests_channel_new (conn, chan_path, NULL, TP_UNKNOWN_ENTITY_TYPE, 0,
       &error);
 
   g_assert_no_error (error);
@@ -256,7 +256,7 @@ check_removed_unknown_error_in_invalidated (void)
       "connection", service_conn,
       "object-path", chan_path,
       NULL));
-  chan = tp_tests_channel_new (conn, chan_path, NULL, TP_UNKNOWN_HANDLE_TYPE, 0,
+  chan = tp_tests_channel_new (conn, chan_path, NULL, TP_UNKNOWN_ENTITY_TYPE, 0,
       &error);
 
   g_assert_no_error (error);
@@ -348,7 +348,7 @@ check_removed_known_error_in_invalidated (void)
       "connection", service_conn,
       "object-path", chan_path,
       NULL));
-  chan = tp_tests_channel_new (conn, chan_path, NULL, TP_UNKNOWN_HANDLE_TYPE, 0,
+  chan = tp_tests_channel_new (conn, chan_path, NULL, TP_UNKNOWN_ENTITY_TYPE, 0,
       &error);
 
   g_assert_no_error (error);
diff --git a/tests/dbus/contacts.c b/tests/dbus/contacts.c
index 716e43e1b..ab48cd291 100644
--- a/tests/dbus/contacts.c
+++ b/tests/dbus/contacts.c
@@ -804,7 +804,7 @@ free_rcc_list (GPtrArray *rccs)
 
 static void
 add_text_chat_class (GPtrArray *classes,
-    TpEntityType handle_type)
+    TpEntityType entity_type)
 {
   GHashTable *fixed;
   const gchar * const allowed[] = { NULL };
@@ -814,7 +814,7 @@ add_text_chat_class (GPtrArray *classes,
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_TEXT,
       TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
-          handle_type,
+          entity_type,
       NULL);
 
   arr = tp_value_array_build (2,
diff --git a/tests/dbus/group-mixin.c b/tests/dbus/group-mixin.c
index 9c110816d..77c064338 100644
--- a/tests/dbus/group-mixin.c
+++ b/tests/dbus/group-mixin.c
@@ -561,7 +561,7 @@ test (Fixture *f,
   MYASSERT (tp_cli_connection_run_connect (conn, -1, &error, NULL), "");
   g_assert_no_error (error);
 
-  chan = tp_tests_channel_new (conn, chan_path, NULL, TP_UNKNOWN_HANDLE_TYPE, 0,
+  chan = tp_tests_channel_new (conn, chan_path, NULL, TP_UNKNOWN_ENTITY_TYPE, 0,
       &error);
   g_assert_no_error (error);
 
diff --git a/tests/dbus/handle-repo.c b/tests/dbus/handle-repo.c
index 19e38715c..8789a6092 100644
--- a/tests/dbus/handle-repo.c
+++ b/tests/dbus/handle-repo.c
@@ -28,7 +28,7 @@ test_handles (Fixture *f,
   const gchar *return_jid;
 
   tp_repo = tp_tests_object_new_static_class (TP_TYPE_DYNAMIC_HANDLE_REPO,
-      "handle-type", TP_ENTITY_TYPE_CONTACT,
+      "entity-type", TP_ENTITY_TYPE_CONTACT,
       NULL);
   g_assert (tp_repo != NULL);
 
diff --git a/tests/dbus/handle-set.c b/tests/dbus/handle-set.c
index 4aa98c807..b2d4c6d97 100644
--- a/tests/dbus/handle-set.c
+++ b/tests/dbus/handle-set.c
@@ -44,7 +44,7 @@ test (Fixture *f,
   g_test_dbus_up (test_dbus);
 
   repo = tp_tests_object_new_static_class (TP_TYPE_DYNAMIC_HANDLE_REPO,
-      "handle-type", TP_ENTITY_TYPE_CONTACT,
+      "entity-type", TP_ENTITY_TYPE_CONTACT,
       NULL);
   MYASSERT (repo != NULL, "");