realigning and changing definitions and labels