Renaming & misc. cleaning.