They now correspond to the enum definitions.