Fix generation of `ItemSet` and `OptionSet` types

[anatol-sialitski]

The current implementation uses label instead of name during type creation, but must use name.