Reorganizing Pages and renaming Entities