Switch to correctly prefixed classes