Minor: Fix incorrect namings
Fix: setInterval needs special care