Name change bug fix