Fix inconsistencies with time words