[WIPCleanup & Refactor API option names

refs #2610, refs #2697