Bring names into closer alignment with HTTP spec.