refractoring timer names