From 988313c2ea8cf12750253789cd6f2ae42828c915 Mon Sep 17 00:00:00 2001
From: Eugene Zhernakov <eugene.zhernakov@gmail.com>
Date: Fri, 17 Apr 2026 14:41:06 +0100
Subject: [PATCH 1/3] Initial pass of selectors

---
 .../res/layout/billing_details_form_view.xml  | 22 +++++++++----------
 .../main/res/layout/card_entry_form_view.xml  | 14 ++++++------
 .../layout/judo_edit_text_input_layout.xml    |  2 +-
 .../no_saved_cards_placeholder_item.xml       |  2 +-
 .../layout/payment_call_to_action_view.xml    |  2 +-
 .../res/layout/saved_card_header_item.xml     |  4 ++--
 .../src/main/res/layout/saved_card_item.xml   |  8 +++----
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/judokit-android/src/main/res/layout/billing_details_form_view.xml b/judokit-android/src/main/res/layout/billing_details_form_view.xml
index 1bec7c22..47ec71f1 100644
--- a/judokit-android/src/main/res/layout/billing_details_form_view.xml
+++ b/judokit-android/src/main/res/layout/billing_details_form_view.xml
@@ -116,7 +116,7 @@
                     app:disableRightCornerRadius="true">
 
                     <EditText
-                        android:id="@+id/phoneCountryCodeTextInputEditText"
+                        android:id="@+id/cardholder_phone_code_field"
                         style="@style/JudoTheme.TextInputEditText"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -136,7 +136,7 @@
                     app:disableLeftCornerRadius="true">
 
                     <EditText
-                        android:id="@+id/mobileNumberTextInputEditText"
+                        android:id="@+id/cardholder_phone_number_field"
                         style="@style/JudoTheme.TextInputEditText"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
@@ -155,7 +155,7 @@
                 android:layout_height="wrap_content">
 
                 <EditText
-                    android:id="@+id/addressLine1TextInputEditText"
+                    android:id="@+id/cardholder_address_line_1_field"
                     style="@style/JudoTheme.TextInputEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -173,7 +173,7 @@
                 android:visibility="gone">
 
                 <EditText
-                    android:id="@+id/addressLine2TextInputEditText"
+                    android:id="@+id/cardholder_address_line_2_field"
                     style="@style/JudoTheme.TextInputEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -190,7 +190,7 @@
                 android:visibility="gone">
 
                 <EditText
-                    android:id="@+id/addressLine3TextInputEditText"
+                    android:id="@+id/cardholder_address_line_3_field"
                     style="@style/JudoTheme.TextInputEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -220,7 +220,7 @@
                     tools:ignore="HardcodedText" />
 
                 <TextView
-                    android:id="@+id/addAddressLineButtonText"
+                    android:id="@+id/add_address_line_button"
                     style="@style/JudoTheme.TextButton.Large"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -238,7 +238,7 @@
                 android:layout_height="wrap_content">
 
                 <EditText
-                    android:id="@+id/cityTextInputEditText"
+                    android:id="@+id/cardholder_city_field"
                     style="@style/JudoTheme.TextInputEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -254,7 +254,7 @@
                 android:layout_height="wrap_content">
 
                 <EditText
-                    android:id="@+id/postalCodeTextInputEditText"
+                    android:id="@+id/post_code_field"
                     style="@style/JudoTheme.TextInputEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -286,7 +286,7 @@
                 android:id="@+id/flow3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:constraint_referenced_ids="billingDetailsBackButton,billingDetailsSubmitButton"
+                app:constraint_referenced_ids="billing_details_back_button,billing_details_submit_button"
                 app:flow_horizontalAlign="start"
                 app:flow_horizontalBias="0"
                 app:flow_horizontalGap="@dimen/space_9"
@@ -299,7 +299,7 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <com.judopay.judokit.android.ui.common.ProgressButton
-                android:id="@+id/billingDetailsBackButton"
+                android:id="@+id/billing_details_back_button"
                 style="@style/JudoTheme.BottomBackButton"
                 android:layout_width="@dimen/width_100"
                 android:layout_height="@dimen/button_height"
@@ -307,7 +307,7 @@
                 android:text="@string/jp_back" />
 
             <com.judopay.judokit.android.ui.common.ProgressButton
-                android:id="@+id/billingDetailsSubmitButton"
+                android:id="@+id/billing_details_submit_button"
                 style="@style/JudoTheme.BlackRoundedButton"
                 android:layout_width="@dimen/width_0"
                 android:layout_height="@dimen/button_height"
diff --git a/judokit-android/src/main/res/layout/card_entry_form_view.xml b/judokit-android/src/main/res/layout/card_entry_form_view.xml
index c89f7897..70af8036 100644
--- a/judokit-android/src/main/res/layout/card_entry_form_view.xml
+++ b/judokit-android/src/main/res/layout/card_entry_form_view.xml
@@ -52,7 +52,7 @@
                 android:layout_height="wrap_content">
 
                 <EditText
-                    android:id="@+id/numberTextInputEditText"
+                    android:id="@+id/card_number"
                     style="@style/JudoTheme.TextInputEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
                 android:layout_height="wrap_content">
 
                 <EditText
-                    android:id="@+id/nameTextInputEditText"
+                    android:id="@+id/cardholder_name"
                     style="@style/JudoTheme.TextInputEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -96,7 +96,7 @@
                     android:layout_height="match_parent">
 
                     <EditText
-                        android:id="@+id/expirationDateTextInputEditText"
+                        android:id="@+id/expiry_date"
                         style="@style/JudoTheme.TextInputEditText"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -118,7 +118,7 @@
                     android:layout_height="match_parent">
 
                     <EditText
-                        android:id="@+id/securityNumberTextInputEditText"
+                        android:id="@+id/security_code"
                         style="@style/JudoTheme.TextInputEditText"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -148,7 +148,7 @@
                     android:visibility="gone">
 
                     <androidx.appcompat.widget.AppCompatAutoCompleteTextView
-                        android:id="@+id/countryTextInputEditText"
+                        android:id="@+id/country_field"
                         style="@style/JudoTheme.TextInputEditText"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
@@ -205,7 +205,7 @@
                 android:id="@+id/flow3"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:constraint_referenced_ids="cardEntrySubmitButton,secureTransmissionTextView"
+                app:constraint_referenced_ids="submit_button,secureTransmissionTextView"
                 app:flow_horizontalAlign="start"
                 app:flow_horizontalBias="0"
                 app:flow_maxElementsWrap="1"
@@ -218,7 +218,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"/>
 
             <com.judopay.judokit.android.ui.common.ProgressButton
-                android:id="@+id/cardEntrySubmitButton"
+                android:id="@+id/submit_button"
                 style="@style/JudoTheme.BlackRoundedButton"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/button_height"
diff --git a/judokit-android/src/main/res/layout/judo_edit_text_input_layout.xml b/judokit-android/src/main/res/layout/judo_edit_text_input_layout.xml
index 931baa10..4ecc2517 100644
--- a/judokit-android/src/main/res/layout/judo_edit_text_input_layout.xml
+++ b/judokit-android/src/main/res/layout/judo_edit_text_input_layout.xml
@@ -21,7 +21,7 @@
         app:layout_constraintEnd_toStartOf="@+id/verticalBarrier">
 
         <TextView
-            android:id="@+id/errorTextView"
+            android:id="@+id/error_text_view"
             style="@style/JudoTheme.Caption.Error.Medium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/judokit-android/src/main/res/layout/no_saved_cards_placeholder_item.xml b/judokit-android/src/main/res/layout/no_saved_cards_placeholder_item.xml
index 102d05ca..b0dbe42a 100644
--- a/judokit-android/src/main/res/layout/no_saved_cards_placeholder_item.xml
+++ b/judokit-android/src/main/res/layout/no_saved_cards_placeholder_item.xml
@@ -17,7 +17,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
-        android:id="@+id/addButton"
+        android:id="@+id/add_card_button"
         style="@style/JudoTheme.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/judokit-android/src/main/res/layout/payment_call_to_action_view.xml b/judokit-android/src/main/res/layout/payment_call_to_action_view.xml
index 7d8e89ee..36de5cdb 100644
--- a/judokit-android/src/main/res/layout/payment_call_to_action_view.xml
+++ b/judokit-android/src/main/res/layout/payment_call_to_action_view.xml
@@ -54,7 +54,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <com.judopay.judokit.android.ui.common.ProgressButton
-            android:id="@+id/payButton"
+            android:id="@+id/submit_button"
             style="@style/JudoTheme.BlackRoundedButton"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/judokit-android/src/main/res/layout/saved_card_header_item.xml b/judokit-android/src/main/res/layout/saved_card_header_item.xml
index 5c8a7daf..c1451600 100644
--- a/judokit-android/src/main/res/layout/saved_card_header_item.xml
+++ b/judokit-android/src/main/res/layout/saved_card_header_item.xml
@@ -17,12 +17,12 @@
         android:text="@string/jp_connected_cards"
         android:gravity="start"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/editButton"
+        app:layout_constraintEnd_toStartOf="@+id/edit_button"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <Button
-        android:id="@+id/editButton"
+        android:id="@+id/edit_button"
         style="@style/JudoTheme.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/judokit-android/src/main/res/layout/saved_card_item.xml b/judokit-android/src/main/res/layout/saved_card_item.xml
index b225235d..eec43695 100644
--- a/judokit-android/src/main/res/layout/saved_card_item.xml
+++ b/judokit-android/src/main/res/layout/saved_card_item.xml
@@ -11,7 +11,7 @@
     android:paddingBottom="@dimen/space_12">
 
     <ImageView
-        android:id="@+id/removeCardIcon"
+        android:id="@+id/remove_card_button"
         style="@style/JudoTheme.ImageButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
         android:background="@drawable/card_network_decoration_shape"
         android:padding="@dimen/space_8"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/removeCardIcon"
+        app:layout_constraintStart_toEndOf="@id/remove_card_button"
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
@@ -52,11 +52,11 @@
         app:layout_constraintEnd_toStartOf="@+id/radioIconImageView"
         app:layout_constraintStart_toEndOf="@+id/networkIconContainer"
         app:layout_constraintTop_toTopOf="@+id/networkIconContainer"
-        app:layout_constraintBottom_toTopOf="@id/subTitle"
+        app:layout_constraintBottom_toTopOf="@id/sub_title"
         tools:text="Card for shopping" />
 
     <TextView
-        android:id="@+id/subTitle"
+        android:id="@+id/sub_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/space_8"

From d05ba29226bd0ac260edf2fdb16dab49903afbe2 Mon Sep 17 00:00:00 2001
From: Eugene Zhernakov <eugene.zhernakov@gmail.com>
Date: Tue, 21 Apr 2026 11:06:06 +0100
Subject: [PATCH 2/3] More selectors covered

---
 .../src/main/res/menu/demo_feature_menu.xml                 | 2 +-
 .../src/main/res/layout/billing_details_form_view.xml       | 6 +++---
 .../src/main/res/layout/card_entry_form_view.xml            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/judokit-android-examples/src/main/res/menu/demo_feature_menu.xml b/judokit-android-examples/src/main/res/menu/demo_feature_menu.xml
index 05d2093a..81379ef8 100644
--- a/judokit-android-examples/src/main/res/menu/demo_feature_menu.xml
+++ b/judokit-android-examples/src/main/res/menu/demo_feature_menu.xml
@@ -4,7 +4,7 @@
 
     <!-- Settings, should appear as action button -->
     <item
-        android:id="@+id/action_settings"
+        android:id="@+id/settings_button"
         android:icon="@drawable/ic_settings_24"
         android:title="@string/title_settings"
         app:showAsAction="always" />
diff --git a/judokit-android/src/main/res/layout/billing_details_form_view.xml b/judokit-android/src/main/res/layout/billing_details_form_view.xml
index 47ec71f1..a4e9a6a1 100644
--- a/judokit-android/src/main/res/layout/billing_details_form_view.xml
+++ b/judokit-android/src/main/res/layout/billing_details_form_view.xml
@@ -54,7 +54,7 @@
                 android:layout_height="wrap_content">
 
                 <EditText
-                    android:id="@+id/emailTextInputEditText"
+                    android:id="@+id/cardholder_email_field"
                     style="@style/JudoTheme.TextInputEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
                 android:layout_height="wrap_content">
 
                 <androidx.appcompat.widget.AppCompatAutoCompleteTextView
-                    android:id="@+id/countryTextInputEditText"
+                    android:id="@+id/country_field"
                     style="@style/JudoTheme.TextInputEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -89,7 +89,7 @@
                 android:layout_height="wrap_content">
 
                 <androidx.appcompat.widget.AppCompatAutoCompleteTextView
-                    android:id="@+id/administrativeDivisionTextInputEditText"
+                    android:id="@+id/administrative_division_field"
                     style="@style/JudoTheme.TextInputEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/judokit-android/src/main/res/layout/card_entry_form_view.xml b/judokit-android/src/main/res/layout/card_entry_form_view.xml
index 70af8036..248bb5c9 100644
--- a/judokit-android/src/main/res/layout/card_entry_form_view.xml
+++ b/judokit-android/src/main/res/layout/card_entry_form_view.xml
@@ -173,7 +173,7 @@
                     android:visibility="gone">
 
                     <EditText
-                        android:id="@+id/postcodeTextInputEditText"
+                        android:id="@+id/postcode_field"
                         style="@style/JudoTheme.TextInputEditText"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"

From ec3b81ff3573069d312adc04b887a9c1fcce7129 Mon Sep 17 00:00:00 2001
From: Eugene Zhernakov <eugene.zhernakov@gmail.com>
Date: Tue, 21 Apr 2026 14:30:20 +0100
Subject: [PATCH 3/3] Update tests with new selectors

---
 .../examples/test/card/CardPaymentTest.kt     | 138 +++++++++---------
 .../android/examples/test/card/Functions.kt   |  24 +--
 .../test/card/RavelinIntegrationTest.kt       |  22 +--
 3 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/CardPaymentTest.kt b/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/CardPaymentTest.kt
index 43e3ba6f..8a9997cf 100644
--- a/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/CardPaymentTest.kt
+++ b/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/CardPaymentTest.kt
@@ -132,7 +132,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
     }
 
@@ -162,7 +162,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -185,7 +185,7 @@ class CardPaymentTest {
             "123",
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -208,7 +208,7 @@ class CardPaymentTest {
             "123",
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -229,7 +229,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -258,7 +258,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -279,7 +279,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -311,7 +311,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -357,7 +357,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -399,7 +399,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -425,7 +425,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -451,7 +451,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -476,7 +476,7 @@ class CardPaymentTest {
         Thread.sleep(1000)
 
         try {
-            onView(withId(R.id.addButton))
+            onView(withId(R.id.add_card_button))
                 .check(matches(isEnabled()))
                 .perform(click())
 
@@ -487,19 +487,19 @@ class CardPaymentTest {
                 CARD_SECURITY_CODE,
             )
 
-            onView(withId(R.id.cardEntrySubmitButton))
+            onView(withId(R.id.submit_button))
                 .check(matches(isEnabled()))
                 .perform(click())
 
             Thread.sleep(1000)
 
-            onView(withId(R.id.payButton))
+            onView(withId(R.id.submit_button))
                 .perform(click())
 
-            onView(withId(R.id.securityNumberTextInputEditText))
+            onView(withId(R.id.security_code))
                 .perform(clearText(), typeText(CARD_SECURITY_CODE))
 
-            onView(withId(R.id.cardEntrySubmitButton))
+            onView(withId(R.id.submit_button))
                 .check(matches(isEnabled()))
                 .perform(click())
 
@@ -507,13 +507,13 @@ class CardPaymentTest {
 
             assertReceiptObject("", "", "Success", "Payment")
         } catch (e: NoMatchingViewException) {
-            onView(withId(R.id.payButton))
+            onView(withId(R.id.submit_button))
                 .perform(click())
 
-            onView(withId(R.id.securityNumberTextInputEditText))
+            onView(withId(R.id.security_code))
                 .perform(clearText(), typeText(CARD_SECURITY_CODE))
 
-            onView(withId(R.id.cardEntrySubmitButton))
+            onView(withId(R.id.submit_button))
                 .check(matches(isEnabled()))
                 .perform(click())
 
@@ -540,7 +540,7 @@ class CardPaymentTest {
         Thread.sleep(1000)
 
         try {
-            onView(withId(R.id.addButton))
+            onView(withId(R.id.add_card_button))
                 .check(matches(isEnabled()))
                 .perform(click())
 
@@ -551,19 +551,19 @@ class CardPaymentTest {
                 CARD_SECURITY_CODE,
             )
 
-            onView(withId(R.id.cardEntrySubmitButton))
+            onView(withId(R.id.submit_button))
                 .check(matches(isEnabled()))
                 .perform(click())
 
             Thread.sleep(1000)
 
-            onView(withId(R.id.payButton))
+            onView(withId(R.id.submit_button))
                 .perform(click())
 
-            onView(withId(R.id.securityNumberTextInputEditText))
+            onView(withId(R.id.security_code))
                 .perform(clearText(), typeText(CARD_SECURITY_CODE))
 
-            onView(withId(R.id.cardEntrySubmitButton))
+            onView(withId(R.id.submit_button))
                 .check(matches(isEnabled()))
                 .perform(click())
 
@@ -571,13 +571,13 @@ class CardPaymentTest {
 
             assertReceiptObject("", "", "Success", "PreAuth")
         } catch (e: NoMatchingViewException) {
-            onView(withId(R.id.payButton))
+            onView(withId(R.id.submit_button))
                 .perform(click())
 
-            onView(withId(R.id.securityNumberTextInputEditText))
+            onView(withId(R.id.security_code))
                 .perform(clearText(), typeText(CARD_SECURITY_CODE))
 
-            onView(withId(R.id.cardEntrySubmitButton))
+            onView(withId(R.id.submit_button))
                 .check(matches(isEnabled()))
                 .perform(click())
 
@@ -594,7 +594,7 @@ class CardPaymentTest {
 
         Thread.sleep(5000)
 
-        doOnView(withId(R.id.addButton), click())
+        doOnView(withId(R.id.add_card_button), click())
 
         enterPaymentSheetDetails(
             "4222 0000 0122 7408",
@@ -603,20 +603,20 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
         Thread.sleep(10000)
 
-        onView(withId(R.id.subTitle))
+        onView(withId(R.id.sub_title))
             .check(matches(withText("Visa Ending 7408")))
 
-        onView(withId(R.id.editButton))
+        onView(withId(R.id.edit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
-        onView(withId(R.id.removeCardIcon))
+        onView(withId(R.id.remove_card_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -643,7 +643,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -658,7 +658,7 @@ class CardPaymentTest {
             VALID_POSTCODE,
         )
 
-        onView(withId(R.id.billingDetailsSubmitButton))
+        onView(withId(R.id.billing_details_submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -683,7 +683,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -698,10 +698,10 @@ class CardPaymentTest {
             INVALID_POSTCODE,
         )
 
-        onView(withId(R.id.cityTextInputEditText))
+        onView(withId(R.id.cardholder_city_field))
             .perform(click())
 
-        onView(allOf(withId(R.id.errorTextView), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        onView(allOf(withId(R.id.error_text_view), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
             .check(matches(withText(INVALID_POSTCODE_LABEL)))
 
         toggleBillingInfoSetting(false)
@@ -721,7 +721,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -736,10 +736,10 @@ class CardPaymentTest {
             INVALID_POSTCODE,
         )
 
-        onView(withId(R.id.cityTextInputEditText))
+        onView(withId(R.id.cardholder_city_field))
             .perform(click())
 
-        onView(allOf(withId(R.id.errorTextView), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        onView(allOf(withId(R.id.error_text_view), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
             .check(matches(withText(INVALID_ZIPCODE_LABEL)))
 
         toggleBillingInfoSetting(false)
@@ -759,7 +759,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -774,10 +774,10 @@ class CardPaymentTest {
             INVALID_POSTCODE,
         )
 
-        onView(withId(R.id.cityTextInputEditText))
+        onView(withId(R.id.cardholder_city_field))
             .perform(click())
 
-        onView(allOf(withId(R.id.errorTextView), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        onView(allOf(withId(R.id.error_text_view), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
             .check(matches(withText(INVALID_POSTCODE_LABEL)))
 
         toggleBillingInfoSetting(false)
@@ -797,45 +797,45 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
         Thread.sleep(1000)
 
-        fillTextField(R.id.emailTextInputEditText, SPECIAL_CHARACTERS)
+        fillTextField(R.id.cardholder_email_field, SPECIAL_CHARACTERS)
         closeSoftKeyboard()
-        onView(withId(R.id.cityTextInputEditText)).perform(click())
+        onView(withId(R.id.cardholder_city_field)).perform(click())
         closeSoftKeyboard()
         Thread.sleep(500)
-        onView(allOf(withId(R.id.errorTextView), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        onView(allOf(withId(R.id.error_text_view), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
             .check(matches(withText(INVALID_EMAIL_LABEL)))
         if (isTablet()) {
             closeSoftKeyboard()
         }
-        fillTextField(R.id.emailTextInputEditText, VALID_EMAIL)
+        fillTextField(R.id.cardholder_email_field, VALID_EMAIL)
 
-        selectFromMultipleAndEnterText(R.id.countryTextInputEditText, VALID_COUNTRY)
+        selectFromMultipleAndEnterText(R.id.country_field, VALID_COUNTRY)
         onView(withText(VALID_COUNTRY)).perform(click())
-        fillTextField(R.id.mobileNumberTextInputEditText, VALID_COUNTRY_CODE)
-        onView(withId(R.id.cityTextInputEditText)).perform(click())
+        fillTextField(R.id.cardholder_phone_number_field, VALID_COUNTRY_CODE)
+        onView(withId(R.id.cardholder_city_field)).perform(click())
         Thread.sleep(1000)
-        onView(allOf(withId(R.id.errorTextView), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        onView(allOf(withId(R.id.error_text_view), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
             .check(matches(withText(INVALID_PHONE_LABEL)))
         Thread.sleep(500)
-        fillTextField(R.id.mobileNumberTextInputEditText, VALID_MOBILE)
+        fillTextField(R.id.cardholder_phone_number_field, VALID_MOBILE)
 
-        fillTextField(R.id.addressLine1TextInputEditText, SPECIAL_CHARACTERS)
-        onView(withId(R.id.cityTextInputEditText)).perform(click())
-        onView(allOf(withId(R.id.errorTextView), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        fillTextField(R.id.cardholder_address_line_1_field, SPECIAL_CHARACTERS)
+        onView(withId(R.id.cardholder_city_field)).perform(click())
+        onView(allOf(withId(R.id.error_text_view), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
             .check(matches(withText(INVALID_ADDRESS_LABEL)))
-        fillTextField(R.id.addressLine1TextInputEditText, VALID_ADDRESS)
+        fillTextField(R.id.cardholder_address_line_1_field, VALID_ADDRESS)
 
-        fillTextField(R.id.cityTextInputEditText, SPECIAL_CHARACTERS)
-        onView(withId(R.id.addressLine1TextInputEditText)).perform(click())
-        onView(allOf(withId(R.id.errorTextView), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
+        fillTextField(R.id.cardholder_city_field, SPECIAL_CHARACTERS)
+        onView(withId(R.id.cardholder_address_line_1_field)).perform(click())
+        onView(allOf(withId(R.id.error_text_view), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
             .check(matches(withText(INVALID_CITY_LABEL)))
-        fillTextField(R.id.cityTextInputEditText, VALID_CITY)
+        fillTextField(R.id.cardholder_city_field, VALID_CITY)
 
         toggleBillingInfoSetting(false)
     }
@@ -858,7 +858,7 @@ class CardPaymentTest {
             WRONG_CV2,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -887,7 +887,7 @@ class CardPaymentTest {
             WRONG_CV2,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -916,7 +916,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -941,7 +941,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -957,7 +957,7 @@ class CardPaymentTest {
             "Kerala",
         )
 
-        onView(withId(R.id.billingDetailsSubmitButton))
+        onView(withId(R.id.billing_details_submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -982,7 +982,7 @@ class CardPaymentTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -998,7 +998,7 @@ class CardPaymentTest {
             "Sichuan Sheng",
         )
 
-        onView(withId(R.id.billingDetailsSubmitButton))
+        onView(withId(R.id.billing_details_submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
diff --git a/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/Functions.kt b/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/Functions.kt
index 4b23f48e..c2cd06f3 100644
--- a/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/Functions.kt
+++ b/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/Functions.kt
@@ -107,13 +107,13 @@ fun enterPaymentSheetDetails(
     cardExpiry: String,
     cardSecurityCode: String,
 ) {
-    fillTextField(SDK.id.numberTextInputEditText, cardNumber)
+    fillTextField(SDK.id.card_number, cardNumber)
 
-    fillTextField(SDK.id.nameTextInputEditText, cardHolder)
+    fillTextField(SDK.id.cardholder_name, cardHolder)
 
-    fillTextField(SDK.id.expirationDateTextInputEditText, cardExpiry)
+    fillTextField(SDK.id.expiry_date, cardExpiry)
 
-    fillTextField(SDK.id.securityNumberTextInputEditText, cardSecurityCode)
+    fillTextField(SDK.id.security_code, cardSecurityCode)
 }
 
 fun fillTextField(
@@ -131,7 +131,7 @@ fun updateRecommendationUrlWith(suffix: String) {
             putString("recommendation_url", recommendationURL + suffix)
         }.commit()
 
-    onView(withId(Examples.id.action_settings))
+    onView(withId(Examples.id.settings_button))
         .perform(click())
 
     onView(withText("Generate payment session"))
@@ -149,9 +149,9 @@ fun fillBillingDetails(
     postcode: String,
     state: String? = null,
 ) {
-    fillTextField(SDK.id.emailTextInputEditText, email)
+    fillTextField(SDK.id.cardholder_email_field, email)
 
-    selectFromMultipleAndEnterText(SDK.id.countryTextInputEditText, country)
+    selectFromMultipleAndEnterText(SDK.id.country_field, country)
 
     onView(withText(country)).perform(click())
 
@@ -159,18 +159,18 @@ fun fillBillingDetails(
 
     if (country == "India" || country == "China") {
         if (state != null) {
-            fillTextField(SDK.id.administrativeDivisionTextInputEditText, state)
+            fillTextField(SDK.id.administrative_division_field, state)
             onView(withText(state)).perform(click())
         }
     }
 
-    fillTextField(SDK.id.mobileNumberTextInputEditText, phone)
+    fillTextField(SDK.id.cardholder_phone_number_field, phone)
 
-    fillTextField(SDK.id.addressLine1TextInputEditText, addressLineOne)
+    fillTextField(SDK.id.cardholder_address_line_1_field, addressLineOne)
 
-    fillTextField(SDK.id.cityTextInputEditText, city)
+    fillTextField(SDK.id.cardholder_city_field, city)
 
-    fillTextField(SDK.id.postalCodeTextInputEditText, postcode)
+    fillTextField(SDK.id.postcode_field, postcode)
 }
 
 fun selectFromMultipleAndEnterText(
diff --git a/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/RavelinIntegrationTest.kt b/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/RavelinIntegrationTest.kt
index 326bdcf6..71d3d8a5 100644
--- a/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/RavelinIntegrationTest.kt
+++ b/judokit-android-examples/src/androidTest/java/com/judokit/android/examples/test/card/RavelinIntegrationTest.kt
@@ -89,7 +89,7 @@ class RavelinIntegrationTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -112,7 +112,7 @@ class RavelinIntegrationTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -135,7 +135,7 @@ class RavelinIntegrationTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -156,7 +156,7 @@ class RavelinIntegrationTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -177,7 +177,7 @@ class RavelinIntegrationTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -200,7 +200,7 @@ class RavelinIntegrationTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -221,7 +221,7 @@ class RavelinIntegrationTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -249,7 +249,7 @@ class RavelinIntegrationTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -280,7 +280,7 @@ class RavelinIntegrationTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -303,7 +303,7 @@ class RavelinIntegrationTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())
 
@@ -334,7 +334,7 @@ class RavelinIntegrationTest {
             CARD_SECURITY_CODE,
         )
 
-        onView(withId(R.id.cardEntrySubmitButton))
+        onView(withId(R.id.submit_button))
             .check(matches(isEnabled()))
             .perform(click())