Update API naming for clarity