I just Closed it. This should be solved with bug 45363 which depends on bug 47317 now, which says we need a clearly defined terminology.