update interval names in more places to avoid fatal errors