Hy 467 renames

## Devs
[ ] Verify that names are what we want them to be.