Rename some stuff and add to BattleWrench