Renamed query planner module