More precise names.

Author: dbrant

app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.kt

@@ -213,7 +213,7 @@ class CreateAccountActivity : BaseActivity() {
             binding.viewCreateAccountError.visibility = View.GONE
         }
         binding.createAccountSubmitButton.setOnClickListener {
-            instrument?.submitInteraction("click", elementId = "create_account")
+            instrument?.submitInteraction("click", elementId = "create_account_button")
             if (requestSource == LoginActivity.SOURCE_YEAR_IN_REVIEW) {
                 YearInReviewEvent.submit(action = "create_account_click", slide = "explore_prompt")
             }

app/src/main/java/org/wikipedia/login/LoginActivity.kt

@@ -155,7 +155,7 @@ class LoginActivity : BaseActivity() {
 
     private fun setAllViewsClickListener() {
         binding.loginButton.setOnClickListener {
-            instrument?.submitInteraction("click", elementId = "login")
+            instrument?.submitInteraction("click", elementId = "login_button")
             validateThenLogin()
         }
         binding.loginCreateAccountButton.setOnClickListener {

app/src/main/java/org/wikipedia/settings/LogoutPreference.kt

@@ -49,17 +49,17 @@ class LogoutPreference : Preference {
             setOnClickListener {
                 val instrument = TestKitchenAdapter.client.getInstrument("apps-authentication")
                     .startFunnel("logout_account")
-                instrument.submitInteraction("click", actionSource = "settings", elementId = "logout")
+                instrument.submitInteraction("click", actionSource = "settings", elementId = "logout_button")
 
                 activity?.let {
                     instrument.submitInteraction("impression", actionSource = "logout_warning")
                     MaterialAlertDialogBuilder(it)
                         .setMessage(if (AccountUtil.isTemporaryAccount) R.string.temp_account_end_session_confirm else R.string.logout_prompt)
                         .setNegativeButton(R.string.logout_dialog_cancel_button_text) { dialog, which ->
-                            instrument.submitInteraction("click", actionSource = "logout_warning", elementId = "cancel")
+                            instrument.submitInteraction("click", actionSource = "logout_warning", elementId = "cancel_button")
                         }
                         .setPositiveButton(if (AccountUtil.isTemporaryAccount) R.string.temp_account_end_session else R.string.preference_title_logout) { _, _ ->
-                            instrument.submitInteraction("click", actionSource = "logout_warning", elementId = "logout_confirm")
+                            instrument.submitInteraction("click", actionSource = "logout_warning", elementId = "confirm_button")
                             WikipediaApp.instance.logOut()
                             Prefs.readingListsLastSyncTime = null
                             Prefs.isReadingListSyncEnabled = false
@@ -73,7 +73,7 @@ class LogoutPreference : Preference {
         holder.itemView.findViewById<View>(R.id.accountVanishButton).setOnClickListener {
             val instrument = TestKitchenAdapter.client.getInstrument("apps-authentication")
                 .startFunnel("vanish_account")
-            instrument.submitInteraction("click", actionSource = "settings", elementId = "vanish")
+            instrument.submitInteraction("click", actionSource = "settings", elementId = "vanish_button")
 
             activity?.let {
                 instrument.submitInteraction("impression", actionSource = "vanish_warning")
@@ -82,10 +82,10 @@ class LogoutPreference : Preference {
                     .setTitle(R.string.account_vanish_request_confirm_title)
                     .setMessage(StringUtil.fromHtml(it.getString(R.string.account_vanish_request_confirm)))
                     .setNegativeButton(android.R.string.cancel) { dialog, which ->
-                        instrument.submitInteraction("click", actionSource = "vanish_warning", elementId = "cancel")
+                        instrument.submitInteraction("click", actionSource = "vanish_warning", elementId = "cancel_button")
                     }
                     .setPositiveButton(R.string.account_vanish_request_title) { _, _ ->
-                        instrument.submitInteraction("click", actionSource = "vanish_warning", elementId = "vanish_confirm")
+                        instrument.submitInteraction("click", actionSource = "vanish_warning", elementId = "confirm_button")
                         it.finish()
                         it.startActivity(SingleWebViewActivity.newIntent(it, it.getString(R.string.account_vanish_url), isWebForm = true))
                     }.show()