Issue #177 - Remove hard coded header name