expr: normalize identifiers to use underscores

Rather than spaces