Renaming a few variables

Magic fix...? That's not good. Let me try it out a little more
Ref #50