Fixes #3502 Argonaut is sometimes called «infastructure service» and sometimes «service infrastructure»