Update for Openwire v10 generation. 
2 files changed