     {
         super.partRemoved(partName, instance);
 
-        if (instance == controlGroup)
+        if (instance == controlBarGroup)
         {
             // copy proxied values from contentGroup (if explicitely set) to contentGroupProperties
             
-            var newControlGroupProperties:Object = {};
-            
-            if (BitFlagUtil.isSet(controlGroupProperties as uint, CONTROLS_PROPERTY_FLAG))
-                newControlGroupProperties.controls = controlGroup.getMXMLContent();
-            
-            if (BitFlagUtil.isSet(controlGroupProperties as uint, LAYOUT_PROPERTY_FLAG))
-                newControlGroupProperties.layout = controlGroup.layout;
-            
-            controlGroupProperties = newControlGroupProperties;
-
-            controlGroup.mxmlContent = null;
-            controlGroup.layout = null;
+            var newControlBarGroupProperties:Object = {};
+            
+            if (BitFlagUtil.isSet(controlBarGroupProperties as uint, CONTROLBAR_PROPERTY_FLAG))
+                newControlBarGroupProperties.controlBarContent = controlBarGroup.getMXMLContent();
+            
+            if (BitFlagUtil.isSet(controlBarGroupProperties as uint, LAYOUT_PROPERTY_FLAG))
+                newControlBarGroupProperties.layout = controlBarGroup.layout;
+            
+            controlBarGroupProperties = newControlBarGroupProperties;
+
+            controlBarGroup.mxmlContent = null;
+            controlBarGroup.layout = null;
         }
     }
 

     *  @playerversion AIR 1.5
     *  @productversion Flex 4
     */
    public var controlGroup:Group;

    //----------------------------------
    //  controls
    //---------------------------------- 
    
    [ArrayElementType("mx.core.IVisualElement")]
    
    /**
     *  The set of items that become the content of
     *  the controlGroup
     *  
     *  @langversion 3.0
     *  @playerversion Flash 10
     *  @playerversion AIR 1.5
     *  @productversion Flex 4
     */
    public function set controls(value:Array):void
    {
        if (controlGroup)
        {
            controlGroup.mxmlContent = value;
            controlGroupProperties = BitFlagUtil.update(controlGroupProperties as uint, 
                                                        CONTROLS_PROPERTY_FLAG, true);
        }
        else
            controlGroupProperties.controls = value;
    }

    //----------------------------------
    //  controlLayout
    //---------------------------------- 
    
    /**

    override protected function getCurrentSkinState():String
    {
        var state:String = enabled ? "normal" : "disabled";
        if (controlBarGroup)
        {
            if (BitFlagUtil.isSet(controlBarGroupProperties as uint, CONTROLBAR_PROPERTY_FLAG))
                state += "WithControlBar";
        }
        else
        {
            if (controlBarGroupProperties.controlBarContent)
                state += "WithControlBar";
        }

        return state;
