Tmp changes.
Replaced 'Control' notation with 'Component'.
Fixed name.