remove b2g naming