Rename Timer to NodeTimer
Merge pull request #1401 from loyd/fix-#1321

Rename Timer to NodeTimer