Minimum changes. Renamed buttons.