This is in preparation for other networking models. The current option names were very generic, and without namespacing them we could end up with some very confusing naming. Also some miscellaneous indentation fixes.