memoryGb => memoryGiB

26 files changed, 78 insertions, 87 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
index 36221d978a1..402b5941701 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
@@ -627,7 +627,7 @@ public final class Node implements Nodelike {
         NodeResources allocated = all.subtract(freeHostCapacity.justNumbers());
 
         return new Mean(allocated.vcpu() / all.vcpu(),
-                        allocated.memoryGb() / all.memoryGb(),
+                        allocated.memoryGiB() / all.memoryGiB(),
                         allocated.diskGb() / all.diskGb())
                        .deviation();
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableResources.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableResources.java
index 7609851d7fe..b7ad29af7fe 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableResources.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableResources.java
@@ -122,7 +122,7 @@ public class AllocatableResources {
 
     private static double fulfilment(ClusterResources realResources, ClusterResources idealResources) {
         double vcpuFulfilment     = Math.min(1, realResources.totalResources().vcpu()     / idealResources.totalResources().vcpu());
-        double memoryGbFulfilment = Math.min(1, realResources.totalResources().memoryGb() / idealResources.totalResources().memoryGb());
+        double memoryGbFulfilment = Math.min(1, realResources.totalResources().memoryGiB() / idealResources.totalResources().memoryGiB());
         double diskGbFulfilment   = Math.min(1, realResources.totalResources().diskGb()   / idealResources.totalResources().diskGb());
         double fulfilment = (vcpuFulfilment + memoryGbFulfilment + diskGbFulfilment) / 3;
         if (equal(fulfilment, 0)) return 0;
@@ -163,7 +163,7 @@ public class AllocatableResources {
         }
         return nodes.get(0).allocation().get().requestedResources()
                                        .withVcpu(sum.vcpu() / nodes.size())
-                                       .withMemoryGb(sum.memoryGb() / nodes.size())
+                                       .withMemoryGiB(sum.memoryGiB() / nodes.size())
                                        .withDiskGb(sum.diskGb() / nodes.size())
                                        .withBandwidthGbps(sum.bandwidthGbps() / nodes.size());
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java
index 82199888a48..186b8c76f84 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java
@@ -133,7 +133,7 @@ public class AllocationOptimizer {
         var nonScaled = limits.isEmpty() || limits.min().nodeResources().isUnspecified()
                         ? model.current().advertisedResources().nodeResources()
                         : limits.min().nodeResources(); // min=max for non-scaled
-        return nonScaled.withVcpu(scaled.vcpu()).withMemoryGb(scaled.memoryGb()).withDiskGb(scaled.diskGb());
+        return nonScaled.withVcpu(scaled.vcpu()).withMemoryGiB(scaled.memoryGiB()).withDiskGb(scaled.diskGb());
     }
 
     /** Returns a copy of the given limits where the minimum nodes are at least the given value when allowed */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
index d0ea406c91e..88c0ac80726 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
@@ -110,7 +110,7 @@ public class Autoscaler {
     public static boolean worthRescaling(ClusterResources from, ClusterResources to) {
         // *Increase* if needed with no regard for cost difference to prevent running out of a resource
         if (meaningfulIncrease(from.totalResources().vcpu(), to.totalResources().vcpu())) return true;
-        if (meaningfulIncrease(from.totalResources().memoryGb(), to.totalResources().memoryGb())) return true;
+        if (meaningfulIncrease(from.totalResources().memoryGiB(), to.totalResources().memoryGiB())) return true;
         if (meaningfulIncrease(from.totalResources().diskGb(), to.totalResources().diskGb())) return true;
 
         // Otherwise, only *decrease* if
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
index 209cd3c4879..8ae06c8e7d2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
@@ -444,11 +444,11 @@ public class ClusterModel {
                 return nodeRepository.resourcesCalculator().requestToReal(initialResources,
                                                                           cloudAccount(),
                                                                           nodeRepository.exclusivity().allocation(clusterSpec),
-                                                                          false).memoryGb();
+                                                                          false).memoryGiB();
             }
             else {
                 return nodes.stream()
-                            .mapToDouble(node -> nodeRepository.resourcesCalculator().realResourcesOf(node, nodeRepository).memoryGb())
+                            .mapToDouble(node -> nodeRepository.resourcesCalculator().realResourcesOf(node, nodeRepository).memoryGiB())
                             .average()
                             .getAsDouble();
             }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Limits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Limits.java
index 51046df90af..960913e9e46 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Limits.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Limits.java
@@ -59,7 +59,7 @@ public class Limits {
         if (isEmpty()) return resources;
         if (min.nodeResources().isUnspecified()) return resources; // means max is also unspecified
         resources = resources.withVcpu(between(min.nodeResources().vcpu(), max.nodeResources().vcpu(), resources.vcpu()));
-        resources = resources.withMemoryGb(between(min.nodeResources().memoryGb(), max.nodeResources().memoryGb(), resources.memoryGb()));
+        resources = resources.withMemoryGiB(between(min.nodeResources().memoryGiB(), max.nodeResources().memoryGiB(), resources.memoryGiB()));
         resources = resources.withDiskGb(between(min.nodeResources().diskGb(), max.nodeResources().diskGb(), resources.diskGb()));
         return resources;
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Load.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Load.java
index e00bf17c89f..e83016cc6f1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Load.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Load.java
@@ -41,7 +41,7 @@ public record Load(double cpu, double memory, double disk, double gpu, double gp
     }
 
     public Load multiply(NodeResources resources) {
-        return new Load(cpu * resources.vcpu(), memory * resources.memoryGb(), disk * resources.diskGb(), gpu * resources.gpuResources().count(), gpu * resources.gpuResources().memoryGb());
+        return new Load(cpu * resources.vcpu(), memory * resources.memoryGiB(), disk * resources.diskGb(), gpu * resources.gpuResources().count(), gpu * resources.gpuResources().memoryGiB());
     }
     public Load multiply(double factor) {
         return map(v -> v * factor);
@@ -57,7 +57,7 @@ public record Load(double cpu, double memory, double disk, double gpu, double gp
         return map(v -> divide(v, divisor));
     }
     public Load divide(NodeResources resources) {
-        return new Load(divide(cpu, resources.vcpu()), divide(memory, resources.memoryGb()), divide(disk, resources.diskGb()), divide(gpu, resources.gpuResources().count()), divide(gpuMemory, resources.gpuResources().memoryGb()));
+        return new Load(divide(cpu, resources.vcpu()), divide(memory, resources.memoryGiB()), divide(disk, resources.diskGb()), divide(gpu, resources.gpuResources().count()), divide(gpuMemory, resources.gpuResources().memoryGiB()));
     }
 
     /** Returns the load where the given function is applied to each dimension of this. */
@@ -85,7 +85,7 @@ public record Load(double cpu, double memory, double disk, double gpu, double gp
 
     public NodeResources scaled(NodeResources resources) {
         return resources.withVcpu(cpu * resources.vcpu())
-                        .withMemoryGb(memory * resources.memoryGb())
+                        .withMemoryGiB(memory * resources.memoryGiB())
                         .withDiskGb(disk * resources.diskGb());
     }
 
@@ -122,10 +122,10 @@ public record Load(double cpu, double memory, double disk, double gpu, double gp
 
     public static Load byDividing(NodeResources a, NodeResources b) {
         return new Load(divide(a.vcpu(), b.vcpu()),
-                        divide(a.memoryGb(), b.memoryGb()),
+                        divide(a.memoryGiB(), b.memoryGiB()),
                         divide(a.diskGb(), b.diskGb()),
                         divide(a.gpuResources().count(), b.gpuResources().count()),
-                        divide(a.gpuResources().memoryGb(), b.gpuResources().memoryGb()));
+                        divide(a.gpuResources().memoryGiB(), b.gpuResources().memoryGiB()));
     }
 
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
index 83d5657c1f6..30c3c503cc2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
@@ -56,7 +56,7 @@ public class CapacityChecker {
         List<Node> overcommittedNodes = new ArrayList<>();
         for (var entry : availableResources.entrySet()) {
             var resources = entry.getValue().nodeResources;
-            if (resources.vcpu() < 0 || resources.memoryGb() < 0 || resources.diskGb() < 0) {
+            if (resources.vcpu() < 0 || resources.memoryGiB() < 0 || resources.diskGb() < 0) {
                 overcommittedNodes.add(entry.getKey());
             }
         }
@@ -299,7 +299,7 @@ public class CapacityChecker {
 
             if (l.vcpu() < r.vcpu())
                 reason.insufficientVcpu = true;
-            if (l.memoryGb() < r.memoryGb())
+            if (l.memoryGiB() < r.memoryGiB())
                 reason.insufficientMemoryGb = true;
             if (l.diskGb() < r.diskGb())
                 reason.insufficientDiskGb = true;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
index e3d72d1189e..a2cb27246c6 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
@@ -356,12 +356,12 @@ public class MetricsReporter extends NodeRepositoryMaintainer {
     private void updateContainerMetrics(NodeList nodes) {
         NodeResources totalCapacity = getCapacityTotal(nodes);
         metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_TOTAL_CAPACITY_CPU.baseName(), totalCapacity.vcpu(), null);
-        metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_TOTAL_CAPACITY_MEM.baseName(), totalCapacity.memoryGb(), null);
+        metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_TOTAL_CAPACITY_MEM.baseName(), totalCapacity.memoryGiB(), null);
         metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_TOTAL_CAPACITY_DISK.baseName(), totalCapacity.diskGb(), null);
 
         NodeResources totalFreeCapacity = getFreeCapacityTotal(nodes);
         metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_FREE_CAPACITY_CPU.baseName(), totalFreeCapacity.vcpu(), null);
-        metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_FREE_CAPACITY_MEM.baseName(), totalFreeCapacity.memoryGb(), null);
+        metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_FREE_CAPACITY_MEM.baseName(), totalFreeCapacity.memoryGiB(), null);
         metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_FREE_CAPACITY_DISK.baseName(), totalFreeCapacity.diskGb(), null);
     }
 
@@ -378,7 +378,7 @@ public class MetricsReporter extends NodeRepositoryMaintainer {
                             var context = getContext(dimensions(applicationId));
 
                             metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_ALLOCATED_CAPACITY_CPU.baseName(), allocatedCapacity.vcpu(), context);
-                            metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_ALLOCATED_CAPACITY_MEM.baseName(), allocatedCapacity.memoryGb(), context);
+                            metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_ALLOCATED_CAPACITY_MEM.baseName(), allocatedCapacity.memoryGiB(), context);
                             metric.set(ConfigServerMetrics.HOSTED_VESPA_DOCKER_ALLOCATED_CAPACITY_DISK.baseName(), allocatedCapacity.diskGb(), context);
                         }
                 );
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeResourcesSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeResourcesSerializer.java
index 01eb24ec2ac..a8384faf97d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeResourcesSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeResourcesSerializer.java
@@ -26,7 +26,7 @@ public class NodeResourcesSerializer {
     static void toSlime(NodeResources resources, Cursor resourcesObject) {
         if (resources.isUnspecified()) return;
         resourcesObject.setDouble(vcpuKey, resources.vcpu());
-        resourcesObject.setDouble(memoryKey, resources.memoryGb());
+        resourcesObject.setDouble(memoryKey, resources.memoryGiB());
         resourcesObject.setDouble(diskKey, resources.diskGb());
         resourcesObject.setDouble(bandwidthKey, resources.bandwidthGbps());
         resourcesObject.setString(diskSpeedKey, diskSpeedToString(resources.diskSpeed()));
@@ -35,7 +35,7 @@ public class NodeResourcesSerializer {
         if (!resources.gpuResources().isDefault()) {
             Cursor gpuObject = resourcesObject.setObject(gpuKey);
             gpuObject.setLong(gpuCountKey, resources.gpuResources().count());
-            gpuObject.setDouble(gpuMemoryKey, resources.gpuResources().memoryGb());
+            gpuObject.setDouble(gpuMemoryKey, resources.gpuResources().memoryGiB());
         }
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeCandidate.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeCandidate.java
index fa0421555d4..2f5ecd32e8d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeCandidate.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeCandidate.java
@@ -247,7 +247,7 @@ public abstract class NodeCandidate implements Nodelike, Comparable<NodeCandidat
         var n = node.resources();
         var h = node.parent.get().resources();
         if (h.vcpu()     < n.vcpu()     * 2) return false;
-        if (h.memoryGb() < n.memoryGb() * 2) return false;
+        if (h.memoryGiB() < n.memoryGiB() * 2) return false;
         if (h.diskGb()   < n.diskGb()   * 2) return false;
         return true;
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceComparator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceComparator.java
index 11a5ee39a3d..d7a382165a5 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceComparator.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceComparator.java
@@ -24,8 +24,8 @@ public class NodeResourceComparator {
 
         @Override
         public int compare(NodeResources a, NodeResources b) {
-            if (a.memoryGb() > b.memoryGb()) return 1;
-            if (a.memoryGb() < b.memoryGb()) return -1;
+            if (a.memoryGiB() > b.memoryGiB()) return 1;
+            if (a.memoryGiB() < b.memoryGiB()) return -1;
             if (a.diskGb() > b.diskGb()) return 1;
             if (a.diskGb() < b.diskGb()) return -1;
             if (a.vcpu() > b.vcpu()) return 1;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
index 5eb8c2e7fd7..fb3671a74ff 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
@@ -31,15 +31,15 @@ public class NodeResourceLimits {
         boolean exclusive = nodeRepository.exclusivity().allocation(cluster);
         if (! requested.vcpuIsUnspecified() && requested.vcpu() < minAdvertisedVcpu(cluster, exclusive))
             illegal(type, "vcpu", "", cluster, requested.vcpu(), minAdvertisedVcpu(cluster, exclusive));
-        if (! requested.memoryGbIsUnspecified() && requested.memoryGb() < minAdvertisedMemoryGb(cluster, exclusive))
-            illegal(type, "memoryGb", "Gb", cluster, requested.memoryGb(), minAdvertisedMemoryGb(cluster, exclusive));
-        if (! requested.diskGbIsUnspecified() && requested.diskGb() < minAdvertisedDiskGb(requested, exclusive))
+        if (! requested.memoryIsUnspecified() && requested.memoryGiB() < minAdvertisedMemoryGb(cluster, exclusive))
+            illegal(type, "memoryGb", "Gb", cluster, requested.memoryGiB(), minAdvertisedMemoryGb(cluster, exclusive));
+        if (! requested.diskIsUnspecified() && requested.diskGb() < minAdvertisedDiskGb(requested, exclusive))
             illegal(type, "diskGb", "Gb", cluster, requested.diskGb(), minAdvertisedDiskGb(requested, exclusive));
     }
 
     // TODO: Remove this when we are ready to fail, not just warn on this. */
     public boolean isWithinAdvertisedDiskLimits(NodeResources requested, ClusterSpec cluster) {
-        if (requested.diskGbIsUnspecified() || requested.memoryGbIsUnspecified()) return true;
+        if (requested.diskIsUnspecified() || requested.memoryIsUnspecified()) return true;
         return requested.diskGb() >= minAdvertisedDiskGb(requested, cluster);
     }
 
@@ -55,7 +55,7 @@ public class NodeResourceLimits {
         if (realResources.isUnspecified()) return true;
 
         if (realResources.vcpu() < minRealVcpu(cluster)) return false;
-        if (realResources.memoryGb() < minRealMemoryGb(cluster)) return false;
+        if (realResources.memoryGiB() < minRealMemoryGb(cluster)) return false;
         if (realResources.diskGb() < minRealDiskGb()) return false;
        return true;
     }
@@ -67,7 +67,7 @@ public class NodeResourceLimits {
             requested = requested.withDiskGb(Math.max(minAdvertisedDiskGb(requested, cluster), requested.diskGb()));
 
         return requested.withVcpu(Math.max(minAdvertisedVcpu(cluster, exclusive), requested.vcpu()))
-                        .withMemoryGb(Math.max(minAdvertisedMemoryGb(cluster, exclusive), requested.memoryGb()))
+                        .withMemoryGiB(Math.max(minAdvertisedMemoryGb(cluster, exclusive), requested.memoryGiB()))
                         .withDiskGb(Math.max(minAdvertisedDiskGb(requested, exclusive), requested.diskGb()));
     }
 
@@ -89,7 +89,7 @@ public class NodeResourceLimits {
 
     // TODO: Move this check into the above when we are ready to fail, not just warn on this. */
     private static double minAdvertisedDiskGb(NodeResources requested, ClusterSpec cluster) {
-        return requested.memoryGb() * switch (cluster.type()) {
+        return requested.memoryGiB() * switch (cluster.type()) {
             case combined, content -> 3;
             case container -> 2;
             default -> 0; // No constraint on other types
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
index dc70af9a84f..7c31f8bfda0 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodePatcher.java
@@ -244,7 +244,7 @@ public class NodePatcher {
             case "diskGb":
                 return node.with(node.flavor().with(node.flavor().resources().withDiskGb(value.asDouble())), Agent.operator, clock.instant());
             case "memoryGb":
-                return node.with(node.flavor().with(node.flavor().resources().withMemoryGb(value.asDouble())), Agent.operator, clock.instant());
+                return node.with(node.flavor().with(node.flavor().resources().withMemoryGiB(value.asDouble())), Agent.operator, clock.instant());
             case "vcpu":
                 return node.with(node.flavor().with(node.flavor().resources().withVcpu(value.asDouble())), Agent.operator, clock.instant());
             case "fastDisk":
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeResourcesSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeResourcesSerializer.java
index 518474c3711..adbd83158a1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeResourcesSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeResourcesSerializer.java
@@ -12,7 +12,7 @@ public class NodeResourcesSerializer {
 
     static void toSlime(NodeResources resources, Cursor object) {
         object.setDouble("vcpu", resources.vcpu());
-        object.setDouble("memoryGb", resources.memoryGb());
+        object.setDouble("memoryGb", resources.memoryGiB());
         object.setDouble("diskGb", resources.diskGb());
         object.setDouble("bandwidthGbps", resources.bandwidthGbps());
         object.setString("diskSpeed", toString(resources.diskSpeed()));
@@ -20,7 +20,7 @@ public class NodeResourcesSerializer {
         object.setString("architecture", toString(resources.architecture()));
         if (!resources.gpuResources().isDefault()) {
             object.setLong("gpuCount", resources.gpuResources().count());
-            object.setDouble("gpuMemoryGb", resources.gpuResources().memoryGb());
+            object.setDouble("gpuMemoryGb", resources.gpuResources().memoryGiB());
         }
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
index cef28045a8b..c1d8d250ce8 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesV2ApiHandler.java
@@ -332,7 +332,7 @@ public class NodesV2ApiHandler extends ThreadedHttpRequestHandler {
             if (resourcesInspector.field("vcpu").valid())
                 flavor = flavor.with(flavor.resources().withVcpu(resourcesInspector.field("vcpu").asDouble()));
             if (resourcesInspector.field("memoryGb").valid())
-                flavor = flavor.with(flavor.resources().withMemoryGb(resourcesInspector.field("memoryGb").asDouble()));
+                flavor = flavor.with(flavor.resources().withMemoryGiB(resourcesInspector.field("memoryGb").asDouble()));
             if (resourcesInspector.field("diskGb").valid())
                 flavor = flavor.with(flavor.resources().withDiskGb(resourcesInspector.field("diskGb").asDouble()));
             if (resourcesInspector.field("bandwidthGbps").valid())
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
index 6a48323cea4..de9e241bbfd 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockHostProvisioner.java
@@ -229,7 +229,7 @@ public class MockHostProvisioner implements HostProvisioner {
     }
 
     public boolean compatible(Flavor flavor, NodeResources resources) {
-        NodeResources resourcesToVerify = resources.withMemoryGb(resources.memoryGb() - memoryTaxGb);
+        NodeResources resourcesToVerify = resources.withMemoryGiB(resources.memoryGiB() - memoryTaxGb);
 
         if (flavor.resources().storageType() == NodeResources.StorageType.remote
             && flavor.resources().diskGb() >= resources.diskGb())
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
index 17116784c8b..c4327098378 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
@@ -415,7 +415,7 @@ public class AutoscalingTest {
         fixture.loader().applyLoad(new Load(0.25, 0.95, 0.95, 0, 0), 120);
         fixture.tester().assertResources("Scaling up",
                                          5, 1,
-                                         defaultResources.vcpu(), defaultResources.memoryGb(), defaultResources.diskGb(),
+                                         defaultResources.vcpu(), defaultResources.memoryGiB(), defaultResources.diskGb(),
                                          fixture.autoscale());
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsHostResourcesCalculatorImpl.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsHostResourcesCalculatorImpl.java
index f2507786a8b..47793385eb8 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsHostResourcesCalculatorImpl.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsHostResourcesCalculatorImpl.java
@@ -52,7 +52,7 @@ public class AwsHostResourcesCalculatorImpl implements HostResourcesCalculator {
         double diskOverhead   = consideredFlavors.stream()
                                                  .mapToDouble(flavor -> resourcesCalculator.diskOverhead(flavor, advertisedResources, false, exclusive))
                                                  .reduce(bestCase ? Double::min : Double::max).orElse(0);
-        return advertisedResources.withMemoryGb(advertisedResources.memoryGb() - memoryOverhead)
+        return advertisedResources.withMemoryGiB(advertisedResources.memoryGiB() - memoryOverhead)
                                   .withDiskGb(advertisedResources.diskGb() - diskOverhead);
     }
 
@@ -63,7 +63,7 @@ public class AwsHostResourcesCalculatorImpl implements HostResourcesCalculator {
         for (VespaFlavor flavor : consideredFlavorsGivenReal(realResources)) {
             double memoryOverhead = resourcesCalculator.memoryOverhead(flavor, realResources, true);
             double diskOverhead = resourcesCalculator.diskOverhead(flavor, realResources, true, exclusive);
-            NodeResources advertised = realResources.withMemoryGb(realResources.memoryGb() + memoryOverhead)
+            NodeResources advertised = realResources.withMemoryGiB(realResources.memoryGiB() + memoryOverhead)
                                                     .withDiskGb(realResources.diskGb() + diskOverhead);
             if ( ! flavor.advertisedResources().satisfies(advertised)) continue;
             if (bestCase ? memoryOverhead < chosenMemoryOverhead : memoryOverhead > chosenDiskOverhead)
@@ -71,7 +71,7 @@ public class AwsHostResourcesCalculatorImpl implements HostResourcesCalculator {
             if (bestCase ? diskOverhead < chosenDiskOverhead : diskOverhead > chosenDiskOverhead)
                 chosenDiskOverhead = diskOverhead;
         }
-        return realResources.withMemoryGb(realResources.memoryGb() + chosenMemoryOverhead)
+        return realResources.withMemoryGiB(realResources.memoryGiB() + chosenMemoryOverhead)
                             .withDiskGb(realResources.diskGb() + chosenDiskOverhead);
     }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsResourcesCalculator.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsResourcesCalculator.java
index 0e62faef2c1..ec62a10b293 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsResourcesCalculator.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsResourcesCalculator.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.provision.autoscale.awsnodes;
 
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.NodeType;
-import com.yahoo.config.provision.Zone;
 
 /**
  * Calculations and logic on node resources common to provision-service and host-admin (at least).
@@ -28,7 +27,7 @@ public class AwsResourcesCalculator {
     public NodeResources realResourcesOfChildContainer(NodeResources resources, VespaFlavor hostFlavor) {
         // This must match realResourcesOfChildSaturatingHost() if exclusive is true, and vice versa
         boolean exclusive = saturates(hostFlavor, resources);
-        return resources.withMemoryGb(resources.memoryGb() - memoryOverhead(hostFlavor, resources, false))
+        return resources.withMemoryGiB(resources.memoryGiB() - memoryOverhead(hostFlavor, resources, false))
                         .withDiskGb(resources.diskGb() - diskOverhead(hostFlavor, resources, false, exclusive));
     }
 
@@ -39,13 +38,13 @@ public class AwsResourcesCalculator {
      */
     public double memoryOverhead(VespaFlavor hostFlavor, NodeResources resources, boolean real) {
         double hostMemoryOverhead =
-                hostFlavor.advertisedResources().memoryGb() - hostFlavor.realResources().memoryGb()
+                hostFlavor.advertisedResources().memoryGiB() - hostFlavor.realResources().memoryGiB()
                 + hostMemory; // Approximate cost of host administration processes
 
-        if (hostMemoryOverhead > hostFlavor.advertisedResources().memoryGb()) // An unusably small flavor,
-            return resources.memoryGb(); // all will be overhead
-        double memoryShare = resources.memoryGb() /
-                             ( hostFlavor.advertisedResources().memoryGb() - ( real ? hostMemoryOverhead : 0));
+        if (hostMemoryOverhead > hostFlavor.advertisedResources().memoryGiB()) // An unusably small flavor,
+            return resources.memoryGiB(); // all will be overhead
+        double memoryShare = resources.memoryGiB() /
+                             ( hostFlavor.advertisedResources().memoryGiB() - ( real ? hostMemoryOverhead : 0));
         if (memoryShare > 1) // The real resources of the host cannot fit the requested real resources after overhead
             memoryShare = 1;
 
@@ -69,7 +68,7 @@ public class AwsResourcesCalculator {
     private boolean saturates(VespaFlavor hostFlavor, NodeResources nodeResources) {
         NodeResources hostResources = hostFlavor.advertisedResources();
         return equal(hostResources.vcpu(), nodeResources.vcpu()) ||
-               equal(hostResources.memoryGb(), nodeResources.memoryGb()) ||
+               equal(hostResources.memoryGiB(), nodeResources.memoryGiB()) ||
                equal(hostResources.diskGb(), nodeResources.diskGb()) ||
                equal(hostResources.bandwidthGbps(), nodeResources.bandwidthGbps());
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java
index 0da8750ee1b..9090716cf57 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java
@@ -1,8 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.maintenance;
 
-import com.yahoo.config.provision.Exclusivity;
-import com.yahoo.config.provision.SharedHosts;
 import com.yahoo.json.Jackson;
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -105,7 +103,7 @@ public class CapacityCheckerTester {
                         child.type = NodeType.tenant;
                         NodeResources cnr = childResources.get(j % childResources.size());
                         child.minCpuCores = cnr.vcpu();
-                        child.minMainMemoryAvailableGb = cnr.memoryGb();
+                        child.minMainMemoryAvailableGb = cnr.memoryGiB();
                         child.minDiskAvailableGb = cnr.diskGb();
                         child.fastDisk = true;
                         child.ipAddresses = List.of();
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java
index 874db8c961d..c91564244de 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainerTest.java
@@ -24,7 +24,6 @@ import com.yahoo.config.provision.Zone;
 import com.yahoo.docproc.jdisc.metric.NullMetric;
 import com.yahoo.net.HostName;
 import com.yahoo.test.ManualClock;
-import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.flags.custom.ClusterCapacity;
@@ -285,11 +284,11 @@ public class HostCapacityMaintainerTest {
         tester = new DynamicProvisioningTester(Cloud.builder().name(CloudName.AWS).dynamicProvisioning(true).allowHostSharing(false).build(), new MockNameResolver());
         NodeResources resources1 = new NodeResources(24, 64, 100, 10);
         setPreprovisionCapacityFlag(tester,
-                                    new ClusterCapacity(1, resources1.vcpu(), resources1.memoryGb(), resources1.diskGb(),
+                                    new ClusterCapacity(1, resources1.vcpu(), resources1.memoryGiB(), resources1.diskGb(),
                                                         resources1.bandwidthGbps(), resources1.diskSpeed().name(),
                                                         resources1.storageType().name(), resources1.architecture().name(),
                                                         "container"),
-                                    new ClusterCapacity(1, resources1.vcpu(), resources1.memoryGb(), resources1.diskGb(),
+                                    new ClusterCapacity(1, resources1.vcpu(), resources1.memoryGiB(), resources1.diskGb(),
                                                         resources1.bandwidthGbps(), resources1.diskSpeed().name(),
                                                         resources1.storageType().name(), resources1.architecture().name(),
                                                         null));
@@ -325,7 +324,7 @@ public class HostCapacityMaintainerTest {
         tester = new DynamicProvisioningTester(Cloud.builder().name(CloudName.AWS).dynamicProvisioning(true).allowHostSharing(false).build(), new MockNameResolver());
         NodeResources resources1 = new NodeResources(24, 64, 100, 10);
         setPreprovisionCapacityFlag(tester,
-                                    new ClusterCapacity(1, resources1.vcpu(), resources1.memoryGb(), resources1.diskGb(),
+                                    new ClusterCapacity(1, resources1.vcpu(), resources1.memoryGiB(), resources1.diskGb(),
                                                         resources1.bandwidthGbps(), resources1.diskSpeed().name(),
                                                         resources1.storageType().name(), resources1.architecture().name(),
                                                         null));
@@ -362,7 +361,7 @@ public class HostCapacityMaintainerTest {
         tester = new DynamicProvisioningTester();
         NodeResources resources1 = new NodeResources(24, 64, 100, 10);
         setPreprovisionCapacityFlag(tester,
-                                    new ClusterCapacity(2, resources1.vcpu(), resources1.memoryGb(), resources1.diskGb(),
+                                    new ClusterCapacity(2, resources1.vcpu(), resources1.memoryGiB(), resources1.diskGb(),
                                                         resources1.bandwidthGbps(), resources1.diskSpeed().name(),
                                                         resources1.storageType().name(), resources1.architecture().name(),
                                                         null));
@@ -420,7 +419,7 @@ public class HostCapacityMaintainerTest {
         setPreprovisionCapacityFlag(tester,
                                     new ClusterCapacity(3,
                                                         resources1.vcpu() - applicationNodeResources.vcpu(),
-                                                        resources1.memoryGb() - applicationNodeResources.memoryGb(),
+                                                        resources1.memoryGiB() - applicationNodeResources.memoryGiB(),
                                                         resources1.diskGb() - applicationNodeResources.diskGb(),
                                                         resources1.bandwidthGbps() - applicationNodeResources.bandwidthGbps(),
                                                         resources1.diskSpeed().name(),
@@ -433,7 +432,7 @@ public class HostCapacityMaintainerTest {
         setPreprovisionCapacityFlag(tester,
                                     new ClusterCapacity(3,
                                                         resources1.vcpu() - applicationNodeResources.vcpu() + 1,
-                                                        resources1.memoryGb() - applicationNodeResources.memoryGb() + 1,
+                                                        resources1.memoryGiB() - applicationNodeResources.memoryGiB() + 1,
                                                         resources1.diskGb() - applicationNodeResources.diskGb() + 1,
                                                         resources1.bandwidthGbps(),
                                                         resources1.diskSpeed().name(),
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java
index 6f58ecd2de3..240cf6bb08b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java
@@ -101,13 +101,13 @@ public class AllocationVisualizer extends JPanel {
 
         if (isHost) {
             g.setColor(Color.GRAY);
-            for (int i = 0; i < node.resources().memoryGb(); i++) {
+            for (int i = 0; i < node.resources().memoryGiB(); i++) {
                 g.fillRect(x, y - nodeHeight, nodeWidth, nodeHeight);
                 y = y - (nodeHeight + 2);
             }
         } else {
             g.setColor(Color.YELLOW);
-            int multi = (int) node.resources().memoryGb();
+            int multi = (int) node.resources().memoryGiB();
             int height = multi * nodeHeight + ((multi - 1) * 2);
             g.fillRect(x, y - height, nodeWidth, height);
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTester.java
index 76fc4078927..cb40a135af9 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTester.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.hosted.provision.provisioning;
 
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Capacity;
-import com.yahoo.config.provision.CapacityPolicies;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.ClusterResources;
 import com.yahoo.config.provision.ClusterSpec;
@@ -11,7 +10,6 @@ import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.NodeType;
-import com.yahoo.config.provision.SharedHosts;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.test.ManualClock;
 import com.yahoo.transaction.Mutex;
@@ -185,7 +183,7 @@ public class DynamicProvisioningTester {
                                 NodeResources expectedResources,
                                 ClusterResources resources) {
         assertResources(message, nodeCount, groupCount,
-                        expectedResources.vcpu(), expectedResources.memoryGb(), expectedResources.diskGb(),
+                        expectedResources.vcpu(), expectedResources.memoryGiB(), expectedResources.diskGb(),
                         resources);
     }
 
@@ -196,7 +194,7 @@ public class DynamicProvisioningTester {
         assertTrue("Resources are present: " + message + " (" + autoscaling + ": " + autoscaling.status() + ")",
                    autoscaling.resources().isPresent());
         assertResources(message, nodeCount, groupCount,
-                        expectedResources.vcpu(), expectedResources.memoryGb(), expectedResources.diskGb(),
+                        expectedResources.vcpu(), expectedResources.memoryGiB(), expectedResources.diskGb(),
                         autoscaling.resources().get());
     }
 
@@ -228,7 +226,7 @@ public class DynamicProvisioningTester {
         assertEquals("Node count in " + resources + ": " + message, nodeCount, resources.nodes());
         assertEquals("Group count in " + resources+ ": " + message, groupCount, resources.groups());
         assertEquals("Cpu in " + resources + ": " + message, approxCpu, Math.round(nodeResources.vcpu() * 10) / 10.0, delta);
-        assertEquals("Memory in " + resources + ": " + message, approxMemory, Math.round(nodeResources.memoryGb() * 10) / 10.0, delta);
+        assertEquals("Memory in " + resources + ": " + message, approxMemory, Math.round(nodeResources.memoryGiB() * 10) / 10.0, delta);
         assertEquals("Disk in: " + resources + ": "  + message, approxDisk, Math.round(nodeResources.diskGb() * 10) / 10.0, delta);
     }
 
@@ -254,7 +252,7 @@ public class DynamicProvisioningTester {
         @Override
         public NodeResources realResourcesOf(Nodelike node, NodeRepository nodeRepository) {
             if (zone.cloud().dynamicProvisioning())
-                return node.resources().withMemoryGb(node.resources().memoryGb());
+                return node.resources().withMemoryGiB(node.resources().memoryGiB());
             else
                 return node.resources();
         }
@@ -262,19 +260,19 @@ public class DynamicProvisioningTester {
         @Override
         public NodeResources advertisedResourcesOf(Flavor flavor) {
             if (zone.cloud().dynamicProvisioning())
-                return flavor.resources().withMemoryGb(flavor.resources().memoryGb());
+                return flavor.resources().withMemoryGiB(flavor.resources().memoryGiB());
             else
                 return flavor.resources();
         }
 
         @Override
         public NodeResources requestToReal(NodeResources resources, CloudAccount cloudAccount, boolean exclusive, boolean bestCase) {
-            return resources.withMemoryGb(resources.memoryGb());
+            return resources.withMemoryGiB(resources.memoryGiB());
         }
 
         @Override
         public NodeResources realToRequest(NodeResources resources, CloudAccount cloudAccount, boolean exclusive, boolean bestCase) {
-            return resources.withMemoryGb(resources.memoryGb());
+            return resources.withMemoryGiB(resources.memoryGiB());
         }
 
         @Override
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
index 7c5859ad686..81ec7861cbb 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java
@@ -8,14 +8,12 @@ import com.yahoo.config.provision.ApplicationMutex;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.ApplicationTransaction;
 import com.yahoo.config.provision.Capacity;
-import com.yahoo.config.provision.CapacityPolicies;
 import com.yahoo.config.provision.Cloud;
 import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.ClusterResources;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.DockerImage;
 import com.yahoo.config.provision.Environment;
-import com.yahoo.config.provision.Exclusivity;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.HostFilter;
 import com.yahoo.config.provision.HostSpec;
@@ -26,7 +24,6 @@ import com.yahoo.config.provision.NodeResources.DiskSpeed;
 import com.yahoo.config.provision.NodeResources.StorageType;
 import com.yahoo.config.provision.NodeType;
 import com.yahoo.config.provision.RegionName;
-import com.yahoo.config.provision.SharedHosts;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.Zone;
@@ -332,8 +329,8 @@ public class ProvisioningTester {
                        expected.justNonNumbers().compatibleWith(node.resources().justNonNumbers()));
             assertEquals(explanation + ": Vcpu: Expected " + expected.vcpu() + " but was " + node.resources().vcpu(),
                          expected.vcpu(), node.resources().vcpu(), 0.05);
-            assertEquals(explanation + ": Memory: Expected " + expected.memoryGb() + " but was " + node.resources().memoryGb(),
-                         expected.memoryGb(), node.resources().memoryGb(), 0.05);
+            assertEquals(explanation + ": Memory: Expected " + expected.memoryGiB() + " but was " + node.resources().memoryGiB(),
+                         expected.memoryGiB(), node.resources().memoryGiB(), 0.05);
             assertEquals(explanation + ": Disk: Expected " + expected.diskGb() + " but was " + node.resources().diskGb(),
                          expected.diskGb(), node.resources().diskGb(), 0.05);
         }
@@ -772,14 +769,14 @@ public class ProvisioningTester {
             FlavorsConfig.Flavor.Builder flavor = new FlavorsConfig.Flavor.Builder();
             flavor.name(flavorName);
             flavor.minCpuCores(resources.vcpu());
-            flavor.minMainMemoryAvailableGb(resources.memoryGb());
+            flavor.minMainMemoryAvailableGb(resources.memoryGiB());
             flavor.minDiskAvailableGb(resources.diskGb());
             flavor.bandwidth(resources.bandwidthGbps() * 1000);
             flavor.fastDisk(resources.diskSpeed().compatibleWith(com.yahoo.config.provision.NodeResources.DiskSpeed.fast));
             flavor.remoteStorage(resources.storageType().compatibleWith(com.yahoo.config.provision.NodeResources.StorageType.remote));
             flavor.architecture(resources.architecture().toString());
             flavor.gpuCount(resources.gpuResources().count());
-            flavor.gpuMemoryGb(resources.gpuResources().memoryGb());
+            flavor.gpuMemoryGb(resources.gpuResources().memoryGiB());
             return flavor;
         }
 
@@ -799,7 +796,7 @@ public class ProvisioningTester {
         public NodeResources realResourcesOf(Nodelike node, NodeRepository nodeRepository) {
             NodeResources resources = node.resources();
             if (node.type() == NodeType.host) return resources;
-            return resources.withMemoryGb(resources.memoryGb() - memoryTaxGb)
+            return resources.withMemoryGiB(resources.memoryGiB() - memoryTaxGb)
                             .withDiskGb(resources.diskGb() - ( resources.storageType() == local ? localDiskTax : 0));
         }
 
@@ -807,18 +804,18 @@ public class ProvisioningTester {
         public NodeResources advertisedResourcesOf(Flavor flavor) {
             NodeResources resources = flavor.resources();
             if ( ! flavor.isConfigured()) return resources;
-            return resources.withMemoryGb(resources.memoryGb() + memoryTaxGb);
+            return resources.withMemoryGiB(resources.memoryGiB() + memoryTaxGb);
         }
 
         @Override
         public NodeResources requestToReal(NodeResources resources, CloudAccount cloudAccount, boolean exclusive, boolean bestCase) {
-            return resources.withMemoryGb(resources.memoryGb() - memoryTaxGb)
+            return resources.withMemoryGiB(resources.memoryGiB() - memoryTaxGb)
                             .withDiskGb(resources.diskGb() - ( resources.storageType() == local ? localDiskTax : 0) );
         }
 
         @Override
         public NodeResources realToRequest(NodeResources resources, CloudAccount cloudAccount, boolean exclusive, boolean bestCase) {
-            return resources.withMemoryGb(resources.memoryGb() + memoryTaxGb)
+            return resources.withMemoryGiB(resources.memoryGiB() + memoryTaxGb)
                             .withDiskGb(resources.diskGb() + ( resources.storageType() == local ? localDiskTax : 0) );
         }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningCompleteHostCalculatorTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningCompleteHostCalculatorTest.java
index 1bf42d72180..9310511e687 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningCompleteHostCalculatorTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningCompleteHostCalculatorTest.java
@@ -87,8 +87,8 @@ public class VirtualNodeProvisioningCompleteHostCalculatorTest {
         }
 
         NodeResources realResourcesOf(NodeResources advertisedResources) {
-            return advertisedResources.withMemoryGb(advertisedResources.memoryGb() -
-                                                    memoryOverhead(advertisedResourcesOf(hostFlavor).memoryGb(), advertisedResources, false))
+            return advertisedResources.withMemoryGiB(advertisedResources.memoryGiB() -
+                                                    memoryOverhead(advertisedResourcesOf(hostFlavor).memoryGiB(), advertisedResources, false))
                                       .withDiskGb(advertisedResources.diskGb() -
                                                   diskOverhead(advertisedResourcesOf(hostFlavor).diskGb(), advertisedResources, false));
         }
@@ -96,25 +96,25 @@ public class VirtualNodeProvisioningCompleteHostCalculatorTest {
         @Override
         public NodeResources requestToReal(NodeResources advertisedResources, CloudAccount cloudAccount,
                                            boolean exclusive, boolean bestCase) {
-            double memoryOverhead = memoryOverhead(advertisedResourcesOf(hostFlavor).memoryGb(), advertisedResources, false);
+            double memoryOverhead = memoryOverhead(advertisedResourcesOf(hostFlavor).memoryGiB(), advertisedResources, false);
             double diskOverhead = diskOverhead(advertisedResourcesOf(hostFlavor).diskGb(), advertisedResources, false);
-            return advertisedResources.withMemoryGb(advertisedResources.memoryGb() - memoryOverhead)
+            return advertisedResources.withMemoryGiB(advertisedResources.memoryGiB() - memoryOverhead)
                                       .withDiskGb(advertisedResources.diskGb() - diskOverhead);
         }
 
         @Override
         public NodeResources advertisedResourcesOf(Flavor flavor) {
             if ( ! flavor.equals(hostFlavor)) return flavor.resources(); // Node 'flavors' just wrap the advertised resources
-            return hostFlavor.resources().withMemoryGb(hostFlavor.resources().memoryGb() + memoryOverhead)
+            return hostFlavor.resources().withMemoryGiB(hostFlavor.resources().memoryGiB() + memoryOverhead)
                              .withDiskGb(hostFlavor.resources().diskGb() + diskOverhead);
         }
 
         @Override
         public NodeResources realToRequest(NodeResources realResources, CloudAccount cloudAccount,
                                            boolean exclusive, boolean bestCase) {
-            double memoryOverhead = memoryOverhead(advertisedResourcesOf(hostFlavor).memoryGb(), realResources, true);
+            double memoryOverhead = memoryOverhead(advertisedResourcesOf(hostFlavor).memoryGiB(), realResources, true);
             double diskOverhead = diskOverhead(advertisedResourcesOf(hostFlavor).diskGb(), realResources, true);
-            return realResources.withMemoryGb(realResources.memoryGb() + memoryOverhead)
+            return realResources.withMemoryGiB(realResources.memoryGiB() + memoryOverhead)
                                 .withDiskGb(realResources.diskGb() + diskOverhead);
         }
 
@@ -127,7 +127,7 @@ public class VirtualNodeProvisioningCompleteHostCalculatorTest {
          * @param real true if the given resources are in real values, false if they are in advertised
          */
         private double memoryOverhead(double hostAdvertisedMemoryGb, NodeResources resources, boolean real) {
-            double memoryShare = resources.memoryGb() /
+            double memoryShare = resources.memoryGiB() /
                                  ( hostAdvertisedMemoryGb - (real ? memoryOverhead : 0));
             return memoryOverhead * memoryShare;
         }