Renamed local variables that would conflict with a rename of iTimer to timer

Signed-off-by: Haru <haru@dotalux.com>
Merge branch 'master' of https://github.com/HerculesWS/Hercules into ghbb