Change mumber variable name following the coding guideline