CiviGrant result lists / exports show incorrect Grant Type

When viewing grant search results / exporting grants the Grant Type column shows the stored field value and not the label.
So if a Grant Type label is renamed (i.e. from 'Emergency' to 'Small Grant Programme') all results / exports still show the Emergency value.

I suspect that when a new grant type is entered value and label are set the same but the label only can be edited later.

D Greenberg thoughts;
1. Search results and Export should use 'label' not 'name' for Grant Type
2. Changing the Grant Type label should also change the 'name' in the civicrm_option_value table for non-reserved option values (and I don't think any Grant Type option values are 'reserved').