Fix unit quantity identifiers not supporting underscores