Renamed buttons as per feedback