Rename classes, fix for new api.