Refactor FieldMapper method names and comments to make sense