Fixed some confusing nomenclature.