get rid of superfluous ControlTypeId property
Name property on AutomationProvider drives the automation name
ControlProviders use the Text value for the name
fix scenario for overriding the control name