more napespace changes
better name query