changed return object key names for consistency