Headers standardization update