Change a few variable names