fixed the namespace mess