Refactored variable names

There's also some code in here to play an alarm when the timer runs out,
but I think I want to change it to use the AlarmClock. Doing some
research before I make the change