Spelling
Changes due to EventQuery being removed