fixing some veriable names to make more sense