[CAPEDWARF-187]; fix namespace handling.