Language refactors
Rename some vars