Second stab at the sites renaming without the javascript hackery
Merge pull request #1068 from DirectEmployers/pd-845

[PD-845] Second stab at the sites renaming without the javascript hackery