Changed the type of name field to corresponding enum type