Adding concept of a 'Client' for new naming conventions