Apparently they got renamed. It'd probably be easiest to wait until at least #5454 is merged. #5545 also has a dependency but not a big one.
