Better naming for `serviceName` / `mappedName`

[nfroidure]

Those names are confusing and led to bugs, best would be to name them like that serviceAlias>serviceCanonicalName to avoid any misunderstanding.