Renames to keep in sync with mongo-cc