Rename fields to match result set

Signed-off-by: mienkoja <mienkoja@gmail.com>