Rename header type identifier & internal items