Updated page titles and naming