Updated named queries to reflect class name change