Rename variables - refs BT#7998