Language and variable names enhancements