issue #216 - Remove HeaderName. Use simple String instead.