rename ProxyId to proxy_id