Code cleanup.
UI timing tweaks.
Rename it back again.