Renaming, cleaning up.