Merge "Rename hysteresis-related symbols for clarity"