Renamed methods for consistency (#46)