HappyMapper namespace fixes