More complete fix for the previous issue; remove the _type key when SCI is turned off with set_collection_name. Add specs to cover it.