Improve axis labels and variable list

Specified the variable names explicitly in the formats.
These have proper capitalization.
Also used for the axis labels, which now includes units.