Fixing variables that I forgot to rename