Adapts Class-naming to actual pattern

It's not a proxy, it's a Wrapper as we change the API