Merge fixing war names