Adding field name with underscore.

@emanuelez @bmunkholm @cmelchior