Better year name guessing. #2323