Changed TAG to INTERVAL and MACHINE to HOSTNAME

Closes #2