fix namespace
small adjusts on namespace