Fix enum suffix
Bunch more work on the struct template ...