Changed proxy-map to proxy, proxy-host to host, etc.