class renaming; adding docs towards ns handling;