Improve naming
Add better generation as part of testing