Some functions in swh.model.cli imported by swh-scanner were renamed in
swh-model 0.3.8 leading to import errors, fix those.
Also rename references to persistent identifiers (doc, variables, function
names) in order to use the SWHID abbreviation as this is what should be
used now.