Renamed methods to match golang coding style