1 files changed, 7 insertions, 7 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index c108040c7a1..5548928b9d0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -128,7 +128,7 @@ import com.yahoo.vespa.hosted.controller.tenant.Email;
 import com.yahoo.vespa.hosted.controller.tenant.LastLoginInfo;
 import com.yahoo.vespa.hosted.controller.tenant.PendingMailVerification;
 import com.yahoo.vespa.hosted.controller.tenant.PurchaseOrder;
-import com.yahoo.vespa.hosted.controller.tenant.TaxCode;
+import com.yahoo.vespa.hosted.controller.tenant.TaxId;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 import com.yahoo.vespa.hosted.controller.tenant.TenantAddress;
 import com.yahoo.vespa.hosted.controller.tenant.TenantBilling;
@@ -696,7 +696,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
             contact.setString("email", billingContact.contact().email().getEmailAddress());
             contact.setBool("emailVerified", billingContact.contact().email().isVerified());
             contact.setString("phone", billingContact.contact().phone());
-            root.setString("taxCode", billingContact.getTaxCode().value());
+            root.setString("taxId", billingContact.getTaxId().value());
             root.setString("purchaseOrder", billingContact.getPurchaseOrder().value());
             root.setString("invoiceEmail", billingContact.getInvoiceEmail().getEmailAddress());
 
@@ -714,14 +714,14 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
 
         var mergedContact = updateBillingContact(inspector.field("contact"), cloudTenant.name(), contact);
         var mergedAddress = updateTenantInfoAddress(inspector.field("address"), billing.address());
-        var mergedTaxCode = optional("taxCode", inspector).map(TaxCode::new).orElse(billing.getTaxCode());
+        var mergedTaxId = optional("taxId", inspector).map(TaxId::new).orElse(billing.getTaxId());
         var mergedPurchaseOrder = optional("purchaseOrder", inspector).map(PurchaseOrder::new).orElse(billing.getPurchaseOrder());
         var mergedInvoiceEmail = optional("invoiceEmail", inspector).map(mail -> new Email(mail, false)).orElse(billing.getInvoiceEmail());
 
         var mergedBilling = info.billingContact()
                 .withContact(mergedContact)
                 .withAddress(mergedAddress)
-                .withTaxCode(mergedTaxCode)
+                .withTaxId(mergedTaxId)
                 .withPurchaseOrder(mergedPurchaseOrder)
                 .withInvoiceEmail(mergedInvoiceEmail);
 
@@ -802,7 +802,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         billingCursor.setString("email", billingContact.contact().email().getEmailAddress());
         billingCursor.setBool("emailVerified", billingContact.contact().email().isVerified());
         billingCursor.setString("phone", billingContact.contact().phone());
-        billingCursor.setString("taxCode", billingContact.getTaxCode().value());
+        billingCursor.setString("taxId", billingContact.getTaxId().value());
         billingCursor.setString("purchaseOrder", billingContact.getPurchaseOrder().value());
         billingCursor.setString("invoiceEmail", billingContact.getInvoiceEmail().getEmailAddress());
         toSlime(billingContact.address(), billingCursor);
@@ -934,13 +934,13 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
     private TenantBilling updateTenantInfoBillingContact(Inspector insp, TenantName tenantName, TenantBilling oldContact) {
         if (!insp.valid()) return oldContact;
 
-        var taxCode = optional("taxCode", insp).map(TaxCode::new).orElse(oldContact.getTaxCode());
+        var taxId = optional("taxId", insp).map(TaxId::new).orElse(oldContact.getTaxId());
         var purchaseOrder = optional("purchaseOrder", insp).map(PurchaseOrder::new).orElse(oldContact.getPurchaseOrder());
         var invoiceEmail = optional("invoiceEmail", insp).map(mail -> new Email(mail, false)).orElse(oldContact.getInvoiceEmail());
         return TenantBilling.empty()
                 .withContact(updateBillingContact(insp, tenantName, oldContact.contact()))
                 .withAddress(updateTenantInfoAddress(insp.field("address"), oldContact.address()))
-                .withTaxCode(taxCode)
+                .withTaxId(taxId)
                 .withPurchaseOrder(purchaseOrder)
                 .withInvoiceEmail(invoiceEmail);
     }