ESOPS-1041 stripping underscores