Duplicated namespace  level consts  as class  consts and  switched the
internal API  to use  class level  consts.  Nsp  level consts  are now
present for backwards compat purposes only.