Cosmetic renaming and cleanup