I do think however that changing all of the instances where something ends with `_kind` to `_factory` (which, as said, is something I agree with), but I think I'll all of these changes in a future PR.