Change some classes from old-style to new-style