This should be `const std::string &name` not `std::string &name`

And I wouldn't worry about long standing branches, afaict all of these are small localized changes, as long is code is not reordered, merging shouldn't be difficult.