nomenclature changes
Sample updated too