Change names so VIM has an easier time.
Fix "Dates" entry.