change enum to identities

[marcblanchet]

in -types, change enum to identities to be more flexible for adding new enumerations later on. Suggested by Yingzhen