Some tidy up of the over-explicit scoping.
Added some simple name accessors.