Fixed uniform class names for utilitiy classes