r8218: fix namespace