Made some variable names more consistent