 include "../../styles/metadata/AdvancedCharacterFormatTextStyles.as"
 
 /**
- *  Name of the skin to use for this component. The skin must be a class that extends
+ *  Name of the skin class to use for this component. The skin must be a class that extends
  *  the mx.components.Skin class. 
- * 
- *  NOTE: We need to give the "skin" style a different name in order to resolve the
- *  collision with the Flex 3 "skin" style.
- *  This is an obviously bad name to serve as a reminder that it needs to get fixed.
- * 
- *  TODO: Fix name
  */
-[Style(name="skinZZ", type="Class")]
+[Style(name="skinClass", type="Class")]
 
 /**
  *  The FxComponent class defines the base class for skinnable components. 
  *  The skins used by a FxComponent class are child classes of the Skin class.
  *
- *  <p>Associate a skin class with a component class by setting the <code>skinZZ</code> style property of the 
- *  component class. You can set the <code>skinZZ</code> property in CSS, as the following example shows:</p>
+ *  <p>Associate a skin class with a component class by setting the <code>skinClass</code> style property of the 
+ *  component class. You can set the <code>skinClass</code> property in CSS, as the following example shows:</p>
  *
- *  <pre>  MyComponent
+ *  <pre>MyComponent
  *  {
  *    skinClass: ClassReference("my.skins.MyComponentSkin")
  *  }</pre>
  *
- *  <p>The following example sets the <code>skinZZ</code> property in MXML:</p>
+ *  <p>The following example sets the <code>skinClass</code> property in MXML:</p>
  *
  *  <pre>
- *  &lt;MyComponent skinZZ="my.skins.MyComponentSkin"/&gt;</pre>
+ *  &lt;MyComponent skinClass="my.skins.MyComponentSkin"/&gt;</pre>
  *
  *
  *  @see mx.components.Skin

    //
    //--------------------------------------------------------------------------
    
    // we need all these getters/setters around skinObject so it
    // can be a public read-only Bindable variable and a protected
    // read/write variable.
    private var __skinObject:Skin;
    
    [Bindable("skinObjectChanged")]
    
    /**
     *  @private
     */
    private function get _skinObject():Skin
    {
        return __skinObject;
    }
    
    private function set _skinObject(value:Skin):void
    {
        if (value === __skinObject)
           return;
        
        __skinObject = value;
        dispatchEvent(new Event("skinObjectChanged"));
    }
    
    [Bindable("skinObjectChanged")]
    
    /**
     *  The instance of the skin class for this component instance. 
     *  This is a read-only property that you set 
     *  by calling the <code>loadSkin()</code> method.
     */
    public function get skinObject():Skin
    {
        return _skinObject;
    }
    
    //--------------------------------------------------------------------------

     */
    override protected function updateDisplayList(unscaledWidth:Number, unscaledHeight:Number):void
    {
        if (skin)
            skin.setActualSize(unscaledWidth, unscaledHeight);
    }
    
    /**
