Improve naming for the page handlers