Refactor

Renamed term 'application' to 'client' in most cases