Cleanup

This still would pass even if the name wasn't updated. Look specifically for the name change, reloading from service.