Modernized names and streamlined segment logic.