Changed localCollectionName logic for C21