Update generators to use new UsPhoneNumber key