Fix namespacing for Event in Response
Merge commit '56b46f6' into develop