Fixing class names due to refactory