Fix classes with name not conforming to standard