Remove duplicated namespace. Rename to validated and watched.