Fix credential parameters, Better method names