Password was not used in HttpClient

Also changed a few more vars
Moving away from samples and towards an API client