adds a container-of-things to reduce mostly-unused return value bloat, and updates some func names to be more appropriate to their behavior.
No logical changes, just renaming/movement.
---
#### Does this PR need a docs update or release note?
- [x] ⛔ No
#### Type of change
- [x] 🧹 Tech Debt/Cleanup