[NGRINDER-699] Make APIs consistent