rename badly named classes