Fixed some consistency issues with variable names