Starting to fix namespace handling.