Revert "Derive scheduling collection name"

This reverts commit 7bf16f26ef37b505d60e3abd901101738783a816.
Revert "Revert "Derive scheduling collection name""

This reverts commit 32c47e6aa4b16bac16aa6bd4e62a639a5c1b2bfa.
Revert "Revert "Revert "Derive scheduling collection name"""

This reverts commit cd429794e2ae5a074f31b7d6b6d34920a5c649ae.