         // Initially state is dirty
         rendererStateIsDirty = true;
         
-        itemRendererInteractionStateDetector = new ItemRendererInteractionStateDetector(this);
-        itemRendererInteractionStateDetector.addEventListener(Event.CHANGE, itemRendererInteractionStateDetector_changeHandler);
+        interactionStateDetector = new InteractionStateDetector(this);
+        interactionStateDetector.addEventListener(Event.CHANGE, interactionStateDetector_changeHandler);
     }
     
     //--------------------------------------------------------------------------

        if (value != _down)
        {
            _down = value;
            setCurrentState(getCurrentRendererState(), playTransitions);
            if (autoDrawBackground)
            {
                redrawRequested = true;

            return;

        _showsCaret = value;
        invalidateRendererState();
        if (autoDrawBackground)
        {
            redrawRequested = true;
