Renaming and making the activity labels proper