Refactor for website naming