Unify some remaining control names