diff --git a/ClosedXML/Excel/Tables/XLTable.cs b/ClosedXML/Excel/Tables/XLTable.cs
index b69831d..5e8f3a6 100644
--- a/ClosedXML/Excel/Tables/XLTable.cs
+++ b/ClosedXML/Excel/Tables/XLTable.cs
@@ -499,7 +499,7 @@
                                 }
 
                                 Int32 co = 1;
-                                foreach (var name in FieldNames.Keys)
+                                foreach (var name in FieldNames.Values.Select(f => f.Name))
                                 {
                                     rangeRow.Cell(co).SetValue(name);
                                     co++;
diff --git a/ClosedXML_Tests/Excel/Tables/TablesTests.cs b/ClosedXML_Tests/Excel/Tables/TablesTests.cs
index 7ccce95..d3c29df 100644
--- a/ClosedXML_Tests/Excel/Tables/TablesTests.cs
+++ b/ClosedXML_Tests/Excel/Tables/TablesTests.cs
@@ -318,6 +318,15 @@
             Assert.AreEqual("LName", nameBefore);
             Assert.AreEqual("LastName", nameAfter);
             Assert.AreEqual("LastName", cellValue);
+
+            tbl.ShowHeaderRow = false;
+            tbl.Field(tbl.Fields.Last().Index).Name = "LastNameChanged";
+            nameAfter = tbl.Field(tbl.Fields.Last().Index).Name;
+            Assert.AreEqual("LastNameChanged", nameAfter);
+
+            tbl.SetShowHeaderRow(true);
+            nameAfter = tbl.Cell("B1").Value.ToString();
+            Assert.AreEqual("LastNameChanged", nameAfter);
         }
     }
 }