Fix collection names in the wake of collections reform

Rust master has changed the names of some collections. These minor changes were needed to compile. It doesn't look like any relevant behavior has changed. Tests pass.