* Use correct Pascal case for java enum
* Uniquely name @Bean annotations
* Use existing mustache var instead, run generate files
* rebase, re-run generators
* try to undo botched rebase/merge
* Attempt to manually undo whatever is going on w/ build, oops
* Attempt to manually undo whatever is going on w/ build, oops