Correct some variables that were accidentally called constants