Auto merge of #3803 - felix91gr:master, r=oli-obk
Cognitive Complexity (step 1 out of 3+): name changes
Following up on #3793
**Overall checklist:**
1. **Name changes**
2. MVP of functionality
3. Tests
After this PR, we will start working on the implementation itself.