changed naming of time units