Variable Name Changes

Made variables more uniform all around