Changed User/Client interfaces to use less generic names