#16: branchMapper renamed to branch_mapper for consistency.