     {
         super.partAdded(partName, instance);
         
-        if (instance == controlGroup)
-        {
-            // copy proxied values from controlGroupProperties (if set) to contentGroup
-            var newControlGroupProperties:uint = 0;
+        if (instance == controlBarGroup)
+        {
+            // copy proxied values from controlBarGroupProperties (if set) to contentGroup
+            var newControlBarGroupProperties:uint = 0;
             
-            if (controlGroupProperties.controls !== undefined)
+            if (controlBarGroupProperties.controlBarContent !== undefined)
             {
-                controlGroup.mxmlContent = controlGroupProperties.controls;
-                newControlGroupProperties = BitFlagUtil.update(newControlGroupProperties, 
-                                                               CONTROLS_PROPERTY_FLAG, true);
+                controlBarGroup.mxmlContent = controlBarGroupProperties.controlBarContent;
+                newControlBarGroupProperties = BitFlagUtil.update(newControlBarGroupProperties, 
+                                                               CONTROLBAR_PROPERTY_FLAG, true);
             }
 
-            if (controlGroupProperties.layout !== undefined)
+            if (controlBarGroupProperties.layout !== undefined)
             {
-                controlGroup.layout = controlGroupProperties.layout;
-                newControlGroupProperties = BitFlagUtil.update(newControlGroupProperties, 
+                controlBarGroup.layout = controlBarGroupProperties.layout;
+                newControlBarGroupProperties = BitFlagUtil.update(newControlBarGroupProperties, 
                                                                LAYOUT_PROPERTY_FLAG, true);
             }
 
-            controlGroupProperties = newControlGroupProperties;
+            controlBarGroupProperties = newControlBarGroupProperties;
         }
     }
 

     *  @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
    //---------------------------------- 
    
    /**

    /**
     *  @private
     */
    private static const CONTROLBAR_PROPERTY_FLAG:uint = 1 << 0;

    /**
     *  @private
