Renames, code cleanup.