use WWW_HOST when talking about the service (not the software), cosmetic changes