Make the db field name more concise; #1675