Fixing header names