VE-1497: Renamed methods so their names are more descriptive