Fixed some un-nice variable names