removed unnecessary BEM's naming in some classes