Chore: api-spec once-over

Simple task, go over code-base and ensure all code that can be transitioned to new api-spec is transitioned.