diff --git a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
index e7b0409013..582aa7873a 100644
--- a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
+++ b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
@@ -81,7 +81,7 @@ private val darkColorPalette = FirefoxColors(
     iconAccentYellow = PhotonColors.Yellow20,
     iconGradientStart = PhotonColors.Violet20,
     iconGradientEnd = PhotonColors.Blue20,
-    borderDefault = PhotonColors.LightGrey05,
+    borderFormDefault = PhotonColors.LightGrey05,
     borderSelected = PhotonColors.Violet40,
     borderDisabled = PhotonColors.LightGrey70,
     borderWarning = PhotonColors.Red40,
@@ -129,7 +129,7 @@ private val lightColorPalette = FirefoxColors(
     iconAccentYellow = PhotonColors.Yellow60,
     iconGradientStart = PhotonColors.Violet50,
     iconGradientEnd = PhotonColors.Blue60,
-    borderDefault = PhotonColors.DarkGrey90,
+    borderFormDefault = PhotonColors.DarkGrey90,
     borderSelected = PhotonColors.Ink20,
     borderDisabled = PhotonColors.LightGrey70,
     borderWarning = PhotonColors.Red80,
@@ -182,7 +182,7 @@ class FirefoxColors(
     iconAccentYellow: Color,
     iconGradientStart: Color,
     iconGradientEnd: Color,
-    borderDefault: Color,
+    borderFormDefault: Color,
     borderSelected: Color,
     borderDisabled: Color,
     borderWarning: Color,
@@ -314,7 +314,7 @@ class FirefoxColors(
     // Border
 
     // Form parts
-    var borderDefault by mutableStateOf(borderDefault)
+    var borderFormDefault by mutableStateOf(borderFormDefault)
         private set
     // Selected tab
     var borderSelected by mutableStateOf(borderSelected)
@@ -369,7 +369,7 @@ class FirefoxColors(
         iconAccentYellow = other.iconAccentYellow
         iconGradientStart = other.iconGradientStart
         iconGradientEnd = other.iconGradientEnd
-        borderDefault = other.borderDefault
+        borderFormDefault = other.borderFormDefault
         borderSelected = other.borderSelected
         borderDisabled = other.borderDisabled
         borderWarning = other.borderWarning
@@ -417,7 +417,7 @@ class FirefoxColors(
         iconAccentYellow = iconAccentYellow,
         iconGradientStart = iconGradientStart,
         iconGradientEnd = iconGradientEnd,
-        borderDefault = borderDefault,
+        borderFormDefault = borderFormDefault,
         borderSelected = borderSelected,
         borderDisabled = borderDisabled,
         borderWarning = borderWarning,
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 090a084870..3451312064 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -86,7 +86,7 @@
 
     <!-- Border -->
     <!-- Form parts -->
-    <color name="fx_mobile_border_color_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
+    <color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
     <!-- Selected tab -->
     <color name="fx_mobile_border_color_selected" tools:ignore="UnusedResources">@color/photonViolet40</color>
     <!-- Form parts -->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 58f00c794c..8cb2c36a0b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -86,7 +86,7 @@
 
     <!-- Border -->
     <!-- Form parts -->
-    <color name="fx_mobile_border_color_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
+    <color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
     <!-- Selected tab -->
     <color name="fx_mobile_border_color_selected" tools:ignore="UnusedResources">@color/photonInk20</color>
     <!-- Form parts -->