fix some consistencies mistakes

I don't know if the remainings `control` terms are legits or not, so I didn't touch them. Please let me now if all `control` should be renamed to `component`. cc/ @wycats
Merge pull request #2879 from sly7-7/patch-1

fix some consistencies mistakes