Make name changes according to naming ref