Add namespace to valid/invalid events as per docs