@as-cii I think this naming makes more sense. If you like it, can you
push forward?

Release Notes:

- N/A