Couple API naming related changes