Papillitis is swelling of the optic nerve head due to inflammation. Optic neuritis is inflammation of the optic nerve.