Make some variables names more consistent by using the name "type" only when dealing
with an actual unit_type object.


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