Bad key labels for the UPS battery statistics and time remaining graphs

The key labels for the UPS Battery Statistics and UPS Battery Time Remaining Statistics graphs could do with some love. I'd suggest Percent Charge and Time remaining (UOM) respectively. With respect the units of measurement (UOM) on the UPS Battery Time Remaining Statistics graph, could that be changed to minutes from the current seconds? To my mind, knowing that there is 36 minutes of runtime remaining is much more useful than knowing there is 2,200 seconds remaining.

See the attached screenshot.

If you want a debug please see NAS-108623.