Did some refactoring on the names of pages