Correction, I'm not going to merge the AOT timezone abbreviation, because it's technically incorrect. AOT is actually a different timezone which no longer exists, it's not a DST name for the WAT timezone. The other two changes are good though.