Refactor domain names