Changed some variable/constant names to make more sense.