Corrected method and var names to reflect new nomenclature