Improve names. Document the Generate annotation.