Fixed issues with name clashes on enums and fields.