Issue #29: Renamed some more stuff to manager/proxy.