Rename some activities, delete 2 classes