Variable name consistency cleanup

Fixed inconsistencies in casing in a few files