Changed variable names

I'll do the pull request after this change!