Second stab at the sites renaming without the javascript hackery