Update and rename Timer to CountDown