Cleanup edit name demo