The command line option is renamed from "cairo" to "sw", and similarly all filenames and types from Cairo to Sw (and similar).