Renamed a couple of methods and variables