Adapt collection naming scheme