32: Refactor some inconsistent naming 

Task-Url:
https://github.com/unitsofmeasurement/uom-se/issues/issues/issue/32