Fix issues with set_collection_name nullifying SCI on 1.8