House votes to adopt Department of War renaming in annual defense bill