Adapt to prepared_query field renames.