Fix lower case var names