cleanup, modify collection name regexp