revert Control name changes