I forgot to change all these global variables to their new names… stupid me #140