Fix NTP templates to use @

See diff