Change variable names so we can be sure that we need them