disambiguate the battle names in clodfelter
refactoring