(fix namespace declarations #17)