corrected classes and ids according to naming conventions