Add naming to mock objects, to make them more easily distinguishable in tests
Add mock names to proxy instances in addition to the mocks themselves