Rename OpQueryInstances and LUQueryInstances