Match makeFields underscore and camel case behavior