Timer variable rename
Merge commit 'd7e31fe1efbd308b6e714f5e4a0b039d6f11659f'