Fix billing name issue