Some variable name changes taken from patch #3122.

Splitting these from the logic changes should make it easier to check
them.


git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@56375 75b3775d-3801-0410-9e12-e2e43121521d