Renaming & cleanup.