Type renames and simplifications

Hopefully this will make things easier to understand