Forgot to rename some other variables/functions