Don't use DB column names for sort keys

The user shouldn't need to know how data is stored in the database in order
to use the API. Instead, use the same key names as provided in the output
data as possible sort keys.

Change-Id: I02e13e2fb6b1949ef8ee5b9b0b08ed5c8d946c68
Closes-Bug: #1355669