removed trailing underscores in API names + fixed signatures of chaining functions