Changed a number of variable names to be consistant with naming guidelines.