Fix overlapping API method names