Switch API naming conventions