Fix classnames after refactoring