merge BOP and fix Umatilla names