Renamed a couple of methods and parameters.