diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/Control.java
--- a/javafx-ui-controls/src/javafx/scene/control/Control.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/Control.java	Thu Jan 10 01:02:30 2013 +0100
@@ -737,22 +737,13 @@
     }
 
     /**
-     * @treatAsPrivate implementation detail
-     * @deprecated This is an experimental API that is not intended for general use and is subject to change in future versions
-     */
-    @Deprecated
-    protected List<CssMetaData> impl_getControlStyleableProperties() {
-        return getClassCssMetaData();
-    }
-
-    /**
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public final List<CssMetaData> getCssMetaData() {
         if (styleableProperties == null) {
             styleableProperties = new ArrayList<CssMetaData>();
-            styleableProperties.addAll(impl_getControlStyleableProperties());
+            styleableProperties.addAll(getControlCssMetaData());
             
             if (skinBase != null) {
                 styleableProperties.addAll(skinBase.getCssMetaData());
@@ -760,6 +751,13 @@
         }
         return styleableProperties;
     }
+    
+    /**
+     * @return unmodifiable list of the controls css styleable properties
+     */
+    protected List<CssMetaData> getControlCssMetaData() {
+        return getClassCssMetaData();
+    }
 
     /**
      * @treatAsPrivate implementation detail
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/Labeled.java
--- a/javafx-ui-controls/src/javafx/scene/control/Labeled.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/Labeled.java	Thu Jan 10 01:02:30 2013 +0100
@@ -935,7 +935,7 @@
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/ListView.java
--- a/javafx-ui-controls/src/javafx/scene/control/ListView.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/ListView.java	Thu Jan 10 01:02:30 2013 +0100
@@ -802,7 +802,7 @@
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/MenuBar.java
--- a/javafx-ui-controls/src/javafx/scene/control/MenuBar.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/MenuBar.java	Thu Jan 10 01:02:30 2013 +0100
@@ -199,7 +199,7 @@
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/Pagination.java
--- a/javafx-ui-controls/src/javafx/scene/control/Pagination.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/Pagination.java	Thu Jan 10 01:02:30 2013 +0100
@@ -379,7 +379,7 @@
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/ScrollBar.java
--- a/javafx-ui-controls/src/javafx/scene/control/ScrollBar.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/ScrollBar.java	Thu Jan 10 01:02:30 2013 +0100
@@ -438,7 +438,7 @@
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/ScrollPane.java
--- a/javafx-ui-controls/src/javafx/scene/control/ScrollPane.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/ScrollPane.java	Thu Jan 10 01:02:30 2013 +0100
@@ -703,7 +703,7 @@
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/Separator.java
--- a/javafx-ui-controls/src/javafx/scene/control/Separator.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/Separator.java	Thu Jan 10 01:02:30 2013 +0100
@@ -309,7 +309,7 @@
      * @deprecated This is an experimental API that is not intended for general use and is subject to change in future versions
      */
     @Deprecated
-    @Override protected List<CssMetaData> impl_getControlStyleableProperties() {
+    @Override protected List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/Slider.java
--- a/javafx-ui-controls/src/javafx/scene/control/Slider.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/Slider.java	Thu Jan 10 01:02:30 2013 +0100
@@ -791,7 +791,7 @@
      * @deprecated This is an experimental API that is not intended for general use and is subject to change in future versions
      */
     @Deprecated
-    @Override protected List<CssMetaData> impl_getControlStyleableProperties() {
+    @Override protected List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/SplitPane.java
--- a/javafx-ui-controls/src/javafx/scene/control/SplitPane.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/SplitPane.java	Thu Jan 10 01:02:30 2013 +0100
@@ -418,7 +418,7 @@
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/TabPane.java
--- a/javafx-ui-controls/src/javafx/scene/control/TabPane.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/TabPane.java	Thu Jan 10 01:02:30 2013 +0100
@@ -580,7 +580,7 @@
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/TextField.java
--- a/javafx-ui-controls/src/javafx/scene/control/TextField.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/TextField.java	Thu Jan 10 01:02:30 2013 +0100
@@ -298,7 +298,7 @@
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 }
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/TitledPane.java
--- a/javafx-ui-controls/src/javafx/scene/control/TitledPane.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/TitledPane.java	Thu Jan 10 01:02:30 2013 +0100
@@ -327,7 +327,7 @@
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }
 
diff -r 57d5da41feb1 -r 904ec5cfc7f2 javafx-ui-controls/src/javafx/scene/control/ToolBar.java
--- a/javafx-ui-controls/src/javafx/scene/control/ToolBar.java	Thu Jan 10 00:28:41 2013 +0100
+++ b/javafx-ui-controls/src/javafx/scene/control/ToolBar.java	Thu Jan 10 01:02:30 2013 +0100
@@ -238,7 +238,7 @@
      * {@inheritDoc}
      */
     @Override
-    public List<CssMetaData> getCssMetaData() {
+    public List<CssMetaData> getControlCssMetaData() {
         return getClassCssMetaData();
     }