Fix collection references to use the new name.