Generating less classes
Fixing invalid constant names