Made changes to make the name change compatible wuth the naming convention in the system