Underscore in field names

Follow up of 40cf6e1ca92342135693908a6327402bfb1877e1