Naming fixes: switch towards Proxy instead of Wrapper