This also removes the potential [1] breaking of the different services (referencing the old task names without the module installed)
[1] I did not see it in the earlier diff (D2304).
I also did not yet tested it (in-progress), thus the `[wip]` in the title.
Related T1389