These variables aren't CLI-only anymore, so pick some more general names for them. Note: all language ports would need to follow-up with the rename after the next roll. Fixes #11450
=