[dev] More work getting docs and examples to compile with new names.