Rename classes, make shims to prevent plugin breakage