Fix displayed value for usage group.
Inplace rename + bug fixes.