Trying to fix name change bug