Sounds good to me, along with that I will update the app-xxx events to be dapp-xxx.