Merge fixEdgeFieldName() into fieldNameToColumnName()