Fix unicode error, rename classes (swr1-bw and -rp are the same)