Migration to "xstd" namespace