Finished global rename, and deleted more *~ files.