Variable names changes to follow conventions
Language enhancements
Merge pull request #58 from rampo/develop

Language and variable names enhancements