Changed name from label to header
Made adjustments for #name