FIxed name normalization
Changed measurement units