Just refactored variable names

Just a moment... I'm not sure if i should do this. :)