Merge "Add units to hal times and durations names"