more consistent class-name munging