Fix buttons names for tags and timers