Update deprecated API Query calls

Removed rvtoken and replaced intoken uses with uses of its new
apropriate equivalents.