diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java
index 67728871..52032e36 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java
@@ -134,7 +134,7 @@ public interface FlatClientProperties
 	 *
 	 * @since TODO
 	 */
-	String COMPONENT_STYLE = "JComponent.style";
+	String STYLE = "FlatLaf.style";
 
 	/**
 	 * Specifies minimum width of a component.
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java
index 27ad3a71..6760a412 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java
@@ -155,7 +155,7 @@ public class FlatEditorPaneUI
 				c.revalidate();
 				break;
 
-			case FlatClientProperties.COMPONENT_STYLE:
+			case FlatClientProperties.STYLE:
 				applyStyle.accept( e.getNewValue() );
 				c.revalidate();
 				c.repaint();
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatProgressBarUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatProgressBarUI.java
index d3129f8b..14ddaea9 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatProgressBarUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatProgressBarUI.java
@@ -102,7 +102,7 @@ public class FlatProgressBarUI
 					progressBar.repaint();
 					break;
 
-				case COMPONENT_STYLE:
+				case STYLE:
 					applyStyle( e.getNewValue() );
 					progressBar.revalidate();
 					progressBar.repaint();
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java
index b812ffd8..82449a07 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java
@@ -131,7 +131,7 @@ public class FlatRadioButtonUI
 	 */
 	protected void propertyChange( AbstractButton b, PropertyChangeEvent e ) {
 		switch( e.getPropertyName() ) {
-			case FlatClientProperties.COMPONENT_STYLE:
+			case FlatClientProperties.STYLE:
 				applyStyle( b, this, e.getNewValue() );
 				break;
 		}
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java
index 4bd9c239..98cae5a3 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java
@@ -193,7 +193,7 @@ public class FlatScrollBarUI
 					scrollbar.repaint();
 					break;
 
-				case FlatClientProperties.COMPONENT_STYLE:
+				case FlatClientProperties.STYLE:
 					applyStyle( e.getNewValue() );
 					scrollbar.revalidate();
 					scrollbar.repaint();
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSeparatorUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSeparatorUI.java
index a5cfb37f..d84d82b8 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSeparatorUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSeparatorUI.java
@@ -109,7 +109,7 @@ public class FlatSeparatorUI
 
 		propertyChangeListener = e -> {
 			switch( e.getPropertyName() ) {
-				case FlatClientProperties.COMPONENT_STYLE:
+				case FlatClientProperties.STYLE:
 					applyStyle( s, this, e.getNewValue() );
 					s.revalidate();
 					s.repaint();
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java
index 82005439..dbd2d24e 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java
@@ -190,7 +190,7 @@ public class FlatSliderUI
 			superListener.propertyChange( e );
 
 			switch( e.getPropertyName() ) {
-				case FlatClientProperties.COMPONENT_STYLE:
+				case FlatClientProperties.STYLE:
 					applyStyle( e.getNewValue() );
 					slider.revalidate();
 					slider.repaint();
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java
index 0395af4d..0b56b0d3 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java
@@ -119,7 +119,7 @@ public class FlatSplitPaneUI
 
 		propertyChangeListener = e -> {
 			switch( e.getPropertyName() ) {
-				case FlatClientProperties.COMPONENT_STYLE:
+				case FlatClientProperties.STYLE:
 					applyStyle( e.getNewValue() );
 					splitPane.revalidate();
 					splitPane.repaint();
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStyleSupport.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStyleSupport.java
index 8fc4459c..404f9da9 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStyleSupport.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatStyleSupport.java
@@ -216,7 +216,7 @@ public class FlatStyleSupport
 	}
 
 	public static Object getStyle( JComponent c ) {
-		return c.getClientProperty( FlatClientProperties.COMPONENT_STYLE );
+		return c.getClientProperty( FlatClientProperties.STYLE );
 	}
 
 	static Border cloneBorder( Border border ) {
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java
index 42df0c11..c56cde8a 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java
@@ -182,7 +182,7 @@ public class FlatTextFieldUI
 				c.revalidate();
 				break;
 
-			case FlatClientProperties.COMPONENT_STYLE:
+			case FlatClientProperties.STYLE:
 				applyStyle.accept( e.getNewValue() );
 				c.revalidate();
 				c.repaint();
diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/FlatTextComponentTests.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/FlatTextComponentTests.java
index 90db77fc..f79354c9 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/FlatTextComponentTests.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/FlatTextComponentTests.java
@@ -17,7 +17,7 @@
 package com.formdev.flatlaf.ui;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static com.formdev.flatlaf.FlatClientProperties.COMPONENT_STYLE;
+import static com.formdev.flatlaf.FlatClientProperties.STYLE;
 import java.util.function.Supplier;
 import javax.swing.JEditorPane;
 import javax.swing.JFormattedTextField;
@@ -131,7 +131,7 @@ public class FlatTextComponentTests
 		String style1 = "inactiveBackground: #00ee00; disabledBackground: #0000ee";
 		String style2 = "inactiveBackground: #00dd00; disabledBackground: #0000dd";
 
-		c.putClientProperty( COMPONENT_STYLE, style1 );
+		c.putClientProperty( STYLE, style1 );
 
 		assertEquals( background, c.getBackground() );
 		c.setEditable( false ); assertEquals( inactiveBackground1, c.getBackground() );
@@ -139,23 +139,23 @@ public class FlatTextComponentTests
 		c.setEditable( true );  assertEquals( disabledBackground1, c.getBackground() );
 		c.setEnabled( true );   assertEquals( background, c.getBackground() );
 
-		c.putClientProperty( COMPONENT_STYLE, null );
+		c.putClientProperty( STYLE, null );
 		assertEquals( background, c.getBackground() );
 
 		c.setEditable( false );
-		c.putClientProperty( COMPONENT_STYLE, style1 );
+		c.putClientProperty( STYLE, style1 );
 		assertEquals( inactiveBackground1, c.getBackground() );
 
-		c.putClientProperty( COMPONENT_STYLE, null );
+		c.putClientProperty( STYLE, null );
 		assertEquals( inactiveBackground, c.getBackground() );
 
 		c.setEnabled( false );
-		c.putClientProperty( COMPONENT_STYLE, style1 );
+		c.putClientProperty( STYLE, style1 );
 		assertEquals( disabledBackground1, c.getBackground() );
 
 
 		// change from style1 to style2
-		c.putClientProperty( COMPONENT_STYLE, style2 );
+		c.putClientProperty( STYLE, style2 );
 		assertEquals( disabledBackground2, c.getBackground() );
 
 		c.setEnabled( true );
@@ -163,7 +163,7 @@ public class FlatTextComponentTests
 
 
 		// remove style
-		c.putClientProperty( COMPONENT_STYLE, null );
+		c.putClientProperty( STYLE, null );
 		assertEquals( inactiveBackground, c.getBackground() );
 	}
 }