Changed up nomenclature