diff --git a/gdata/gdata-goa-authorizer.c b/gdata/gdata-goa-authorizer.c
index 6f0c525..503bcbc 100644
--- a/gdata/gdata-goa-authorizer.c
+++ b/gdata/gdata-goa-authorizer.c
@@ -229,11 +229,11 @@ static void
 gdata_goa_authorizer_add_authorization (GDataAuthorizer *authorizer, SoupMessage *message)
 {
 	GDataGoaAuthorizerPrivate *priv;
-	GoaOAuthBased *goa_oauth_based;
+	GoaOAuth2Based *goa_oauth2_based;
 	GHashTable *parameters;
 	GString *authorization;
-	const gchar *consumer_key;
-	const gchar *consumer_secret;
+	const gchar *client_id;
+	const gchar *client_secret;
 	guint ii;
 
 	const gchar *oauth_keys[] = {
@@ -258,12 +258,12 @@ gdata_goa_authorizer_add_authorization (GDataAuthorizer *authorizer, SoupMessage
 		return;
 	}
 
-	goa_oauth_based = goa_object_get_oauth_based (priv->goa_object);
+	goa_oauth2_based = goa_object_get_oauth2_based (priv->goa_object);
 
-	consumer_key = goa_oauth_based_get_consumer_key (goa_oauth_based);
-	consumer_secret = goa_oauth_based_get_consumer_secret (goa_oauth_based);
+	client_id = goa_oauth2_based_get_client_id (goa_oauth2_based);
+	client_secret = goa_oauth2_based_get_client_secret (goa_oauth2_based);
 
-	parameters = gdata_goa_authorizer_get_parameters (message, consumer_key, consumer_secret, priv->access_token, priv->access_token_secret);
+	parameters = gdata_goa_authorizer_get_parameters (message, client_id, client_secret, priv->access_token, priv->access_token_secret);
 
 	authorization = g_string_new ("OAuth ");
 
@@ -292,7 +292,7 @@ gdata_goa_authorizer_add_authorization (GDataAuthorizer *authorizer, SoupMessage
 	g_string_free (authorization, TRUE);
 	g_hash_table_destroy (parameters);
 
-	g_object_unref (goa_oauth_based);
+	g_object_unref (goa_oauth2_based);
 }
 
 static gboolean
