For #2036: fix namespace mapping