Renaming things and drying up a bit