Rename variables for manual control setpoint

As discussed in #910