fixing BuildName and BranchName options