diff --git a/src/e2eFlutterTest/java/io/appium/java_client/android/BaseFlutterTest.java b/src/e2eFlutterTest/java/io/appium/java_client/android/BaseFlutterTest.java
index 940a82640..e18112d4a 100644
--- a/src/e2eFlutterTest/java/io/appium/java_client/android/BaseFlutterTest.java
+++ b/src/e2eFlutterTest/java/io/appium/java_client/android/BaseFlutterTest.java
@@ -30,7 +30,7 @@ class BaseFlutterTest {
 
     private static AppiumDriverLocalService service;
     protected static FlutterAndroidDriver driver;
-    protected static final By loginButton = AppiumBy.flutterText("Login");
+    protected static final By LOGIN_BUTTON = AppiumBy.flutterText("Login");
 
     /**
      * initialization.
diff --git a/src/e2eFlutterTest/java/io/appium/java_client/android/CommandTest.java b/src/e2eFlutterTest/java/io/appium/java_client/android/CommandTest.java
index 4e7e39c19..80f32002d 100644
--- a/src/e2eFlutterTest/java/io/appium/java_client/android/CommandTest.java
+++ b/src/e2eFlutterTest/java/io/appium/java_client/android/CommandTest.java
@@ -12,35 +12,35 @@
 
 class CommandTest extends BaseFlutterTest {
 
-    private static final AppiumBy.FlutterBy messageFieldLocator = AppiumBy.flutterKey("message_field");
-    private static final AppiumBy.FlutterBy toggleButtonLocator = AppiumBy.flutterKey("toggle_button");
+    private static final AppiumBy.FlutterBy MESSAGE_FIELD = AppiumBy.flutterKey("message_field");
+    private static final AppiumBy.FlutterBy TOGGLE_BUTTON = AppiumBy.flutterKey("toggle_button");
 
     @Test
     public void testWaitCommand() {
-        WebElement loginButton = driver.findElement(BaseFlutterTest.loginButton);
+        WebElement loginButton = driver.findElement(BaseFlutterTest.LOGIN_BUTTON);
         loginButton.click();
         openScreen("Lazy Loading");
 
-        WebElement messageField = driver.findElement(messageFieldLocator);
-        WebElement toggleButton = driver.findElement(toggleButtonLocator);
+        WebElement messageField = driver.findElement(MESSAGE_FIELD);
+        WebElement toggleButton = driver.findElement(TOGGLE_BUTTON);
 
         assertEquals(messageField.getText(), "Hello world");
         toggleButton.click();
         assertEquals(messageField.getText(), "Hello world");
 
-        WaitParameter waitParameter = new WaitParameter().setLocator(messageFieldLocator);
+        WaitParameter waitParameter = new WaitParameter().setLocator(MESSAGE_FIELD);
 
         driver.waitForInVisible(waitParameter);
-        assertEquals(0, driver.findElements(messageFieldLocator).size());
+        assertEquals(0, driver.findElements(MESSAGE_FIELD).size());
         toggleButton.click();
         driver.waitForVisible(waitParameter);
-        assertEquals(1, driver.findElements(messageFieldLocator).size());
+        assertEquals(1, driver.findElements(MESSAGE_FIELD).size());
         assertEquals(messageField.getText(), "Hello world");
     }
 
     @Test
     public void testScrollTillVisibleCommand() {
-        WebElement loginButton = driver.findElement(BaseFlutterTest.loginButton);
+        WebElement loginButton = driver.findElement(BaseFlutterTest.LOGIN_BUTTON);
         loginButton.click();
         openScreen("Vertical Swiping");
 
diff --git a/src/e2eFlutterTest/java/io/appium/java_client/android/FinderTests.java b/src/e2eFlutterTest/java/io/appium/java_client/android/FinderTests.java
index 16c181e8a..dc2361869 100644
--- a/src/e2eFlutterTest/java/io/appium/java_client/android/FinderTests.java
+++ b/src/e2eFlutterTest/java/io/appium/java_client/android/FinderTests.java
@@ -35,7 +35,7 @@ public void testFlutterText() {
 
     @Test
     public void testFlutterTextContaining() {
-        WebElement loginButton = driver.findElement(BaseFlutterTest.loginButton);
+        WebElement loginButton = driver.findElement(BaseFlutterTest.LOGIN_BUTTON);
         loginButton.click();
         assertEquals(driver.findElement(AppiumBy.flutterTextContaining("Vertical")).getText(),
                 "Vertical Swiping");
@@ -43,7 +43,7 @@ public void testFlutterTextContaining() {
 
     @Test
     public void testFlutterSemanticsLabel() {
-        WebElement loginButton = driver.findElement(BaseFlutterTest.loginButton);
+        WebElement loginButton = driver.findElement(BaseFlutterTest.LOGIN_BUTTON);
         loginButton.click();
         openScreen("Lazy Loading");