Nginx vhost naming

Various changes for bring vhosts into line.