Avoid name collisions on enum generation

Change-Id: I21fc062ba2c9652e4d7d17f4c3c2c8058392167a