Naming and structure improvements after honk+IVC integration

[ludamad]

This is a catchall for the issues linked to it in the yarn-project code