Renamed methods for consistency and accuracy (#46)