Rename default generator to "generic"
Add Spring-style generator