s2s: some namespace cleaning