Renamed methods and vars to better fit naming conventions