Cleanup & Refactor API option names

refs #2610, refs #2697

This is still a work in progress, trying to introduce consistency across the API and models