rename combinators to match documentation