Switched to strict representation of unit names.