From dd7b8459aa1e5fbd52482f02fd1039a3e3551154 Mon Sep 17 00:00:00 2001
From: prrace <philip.race@oracle.com>
Date: Mon, 26 Jan 2026 13:11:45 -0800
Subject: [PATCH] 8375567

---
 .../classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java  | 4 ++--
 .../com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java        | 4 ++--
 .../classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java   | 4 ++--
 .../com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
index ee4c80316d8..7a11e4a47e9 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java
@@ -53,13 +53,13 @@ public class MotifButtonUI extends BasicButtonUI {
 
     private boolean defaults_initialized = false;
 
-    private static final MotifButtonUI MOTIF_BUTTON_UI = new MotifButtonUI();
+    private static final ComponentUI UI = new MotifButtonUI();
 
     // ********************************
     //          Create PLAF
     // ********************************
     public static ComponentUI createUI(JComponent c) {
-        return MOTIF_BUTTON_UI;
+        return UI;
     }
 
     // ********************************
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
index ac2f9ccc2d3..7017eaf546c 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java
@@ -37,7 +37,7 @@ import javax.swing.plaf.ComponentUI;
  */
 public class MotifCheckBoxUI extends MotifRadioButtonUI {
 
-    private static final MotifCheckBoxUI MOTIF_CHECK_BOX_UI = new MotifCheckBoxUI();
+    private static final ComponentUI UI = new MotifCheckBoxUI();
 
     private static final String propertyPrefix = "CheckBox" + ".";
 
@@ -48,7 +48,7 @@ public class MotifCheckBoxUI extends MotifRadioButtonUI {
     //         Create PLAF
     // ********************************
     public static ComponentUI createUI(JComponent c) {
-        return MOTIF_CHECK_BOX_UI;
+        return UI;
     }
 
     @Override
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
index fa8a52f2499..89c2e309f9e 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java
@@ -37,9 +37,9 @@ import javax.swing.plaf.basic.BasicLabelUI;
  */
 public class MotifLabelUI extends BasicLabelUI
 {
-    private static final MotifLabelUI MOTIF_LABEL_UI = new MotifLabelUI();
+    private static final ComponentUI UI = new MotifLabelUI();
 
     public static ComponentUI createUI(JComponent c) {
-        return MOTIF_LABEL_UI;
+        return UI;
     }
 }
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
index 2039a882f46..7956023ed06 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java
@@ -46,7 +46,7 @@ import javax.swing.plaf.basic.BasicToggleButtonUI;
  */
 public class MotifToggleButtonUI extends BasicToggleButtonUI
 {
-    private static final MotifToggleButtonUI MOTIF_TOGGLE_BUTTON_UI = new MotifToggleButtonUI();
+    private static final ComponentUI UI = new MotifToggleButtonUI();
 
     protected Color selectColor;
 
@@ -56,7 +56,7 @@ public class MotifToggleButtonUI extends BasicToggleButtonUI
     //         Create PLAF
     // ********************************
     public static ComponentUI createUI(JComponent b) {
-        return MOTIF_TOGGLE_BUTTON_UI;
+        return UI;
     }
 
     // ********************************