renamed some common classes