Fix variable names. For real. Yo.