Renaming of client classes to make code clearer

Preparation for moving to an "asset-only" gateway. Allowing
unauthenticated server connections.