Updated spec based on recent resource changes

This update includes some refinements to all resources to make the returned fields more consistent