RF: Change variable names