Fixed naming nomenclature