Remove duplicated namespace. Rename to validatd and watched.