Add BPHouse alias
Fix merge