Fix #1332: Correct package names for CLI runners

This was forgotten in the refactoring commit:
3200c872b1f567393eaf6632048b2c21a1154c11