Renamed a few dangerous variable names