TimeTypes: More instances etc
TimeTypes: Renaming etc