Bring up-to-date with latest org-mode release, and fix naming and documentation.