Change variable names

I should stop failing at typing and thinking.