I think meaning of `name` field should change though, which may not be clear from here.