Updating pages to new module naming style