refactored field names generation
Merge pull request #37 from stanfy/fix/java-keywords

refactored field names generation