API naming cleanup