Client uses the app name within the connection context + minor refactoring