Renaming and other house keeping