Renaming controls.
Other changes