Renamed a couple of methods