finish nhl rename for query classes and tests