ACUMULO-2659 Replace some more methods for api's sake