Use class map name when querying event class

Use class map name when querying event class #2704