From 3a40d31c678fd10c7611e97dd7604fede9c78c29 Mon Sep 17 00:00:00 2001
From: Everett Toews <everett.toews@rackspace.com>
Date: Wed, 13 Mar 2013 15:51:13 -0500
Subject: [PATCH] Renamed classes that create and update to be consistent with
 other Rackspace APIs.

---
 ...erRequest.java => LoadBalancerCreate.java} | 26 ++++++------
 ...ttributes.java => LoadBalancerUpdate.java} | 42 +++++++++----------
 .../domain/{NodeRequest.java => NodeAdd.java} | 16 +++----
 .../{NodeAttributes.java => NodeUpdate.java}  | 24 +++++------
 .../v1/features/LoadBalancerApi.java          |  8 ++--
 .../v1/features/LoadBalancerAsyncApi.java     | 12 +++---
 .../v1/features/NodeApi.java                  |  8 ++--
 .../v1/features/NodeAsyncApi.java             | 10 ++---
 ...LoadBalancersLoadBalanceNodesStrategy.java | 12 +++---
 .../v1/features/AccessRuleApiLiveTest.java    | 12 +++---
 .../v1/features/ConnectionApiLiveTest.java    | 12 +++---
 .../features/ContentCachingApiLiveTest.java   | 12 +++---
 .../v1/features/ErrorPageApiLiveTest.java     | 12 +++---
 .../v1/features/HealthMonitorApiLiveTest.java | 12 +++---
 .../features/LoadBalancerApiExpectTest.java   | 27 ++++++------
 .../v1/features/LoadBalancerApiLiveTest.java  | 12 +++---
 .../v1/features/NodeApiExpectTest.java        | 28 ++++++-------
 .../v1/features/NodeApiLiveTest.java          | 14 +++----
 .../v1/features/ReportApiLiveTest.java        | 12 +++---
 .../features/SSLTerminationApiLiveTest.java   | 12 +++---
 .../SessionPersistenceApiLiveTest.java        | 12 +++---
 .../v1/features/VirtualIPApiLiveTest.java     | 12 +++---
 22 files changed, 174 insertions(+), 173 deletions(-)
 rename apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/{LoadBalancerRequest.java => LoadBalancerCreate.java} (87%)
 rename apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/{LoadBalancerAttributes.java => LoadBalancerUpdate.java} (72%)
 rename apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/{NodeRequest.java => NodeAdd.java} (91%)
 rename apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/{NodeAttributes.java => NodeUpdate.java} (79%)

diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerRequest.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerCreate.java
similarity index 87%
rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerRequest.java
rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerCreate.java
index 578423dab6..6d9eb8e8f1 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerRequest.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerCreate.java
@@ -37,30 +37,30 @@ import com.google.common.collect.ImmutableSet;
  * 
  * @author Adrian Cole
  */
-public class LoadBalancerRequest extends BaseLoadBalancer<NodeRequest, LoadBalancerRequest> {
+public class LoadBalancerCreate extends BaseLoadBalancer<NodeAdd, LoadBalancerCreate> {
 
    private final Set<Map<String, String>> virtualIps;
    private final Set<AccessRule> accessRules;
    private final Map<String, String> metadata;
 
-   public LoadBalancerRequest(String name, String protocol, @Nullable Integer port, Set<NodeRequest> nodes,
+   public LoadBalancerCreate(String name, String protocol, @Nullable Integer port, Set<NodeAdd> nodeAdds,
          @Nullable Algorithm algorithm, @Nullable Integer timeout, @Nullable Boolean halfClosed,
          @Nullable Map<String, SessionPersistence> sessionPersistenceType,
          @Nullable Map<String, Boolean> connectionLogging, @Nullable ConnectionThrottle connectionThrottle,
          @Nullable HealthMonitor healthMonitor, @Nullable Set<AccessRule> accessRules,
          @Nullable Map<String, String> metadata, VirtualIP.Type virtualIPType, Integer virtualIPId) {
-      this(name, protocol, port, nodes, algorithm, timeout, halfClosed, sessionPersistenceType, connectionLogging,
+      this(name, protocol, port, nodeAdds, algorithm, timeout, halfClosed, sessionPersistenceType, connectionLogging,
             connectionThrottle, healthMonitor, accessRules, metadata, 
             getVirtualIPsFromOptions(virtualIPType, virtualIPId));
    }
 
-   public LoadBalancerRequest(String name, String protocol, @Nullable Integer port, Set<NodeRequest> nodes,
+   public LoadBalancerCreate(String name, String protocol, @Nullable Integer port, Set<NodeAdd> nodeAdds,
          @Nullable Algorithm algorithm, @Nullable Integer timeout, @Nullable Boolean halfClosed,
          @Nullable Map<String, SessionPersistence> sessionPersistenceType,
          @Nullable Map<String, Boolean> connectionLogging, @Nullable ConnectionThrottle connectionThrottle,
          @Nullable HealthMonitor healthMonitor, @Nullable Set<AccessRule> accessRules,
          @Nullable Map<String, String> metadata, Set<Map<String, String>> virtualIPsFromOptions) {
-      super(name, protocol, port, nodes, algorithm, timeout, halfClosed, sessionPersistenceType, connectionLogging,
+      super(name, protocol, port, nodeAdds, algorithm, timeout, halfClosed, sessionPersistenceType, connectionLogging,
             connectionThrottle, healthMonitor);
       this.virtualIps = checkNotNull(virtualIPsFromOptions, "virtualIPsFromOptions");
       this.accessRules = accessRules;
@@ -100,7 +100,7 @@ public class LoadBalancerRequest extends BaseLoadBalancer<NodeRequest, LoadBalan
       return string().toString();
    }
 
-   public static class Builder extends BaseLoadBalancer.Builder<NodeRequest, LoadBalancerRequest> {
+   public static class Builder extends BaseLoadBalancer.Builder<NodeAdd, LoadBalancerCreate> {
       private VirtualIP.Type virtualIPType;
       private Integer virtualIPId;
       private Set<Map<String, String>> virtualIps;
@@ -150,14 +150,14 @@ public class LoadBalancerRequest extends BaseLoadBalancer<NodeRequest, LoadBalan
          return this;
       }
 
-      public LoadBalancerRequest build() {
+      public LoadBalancerCreate build() {
          if (virtualIps == null) {
-            return new LoadBalancerRequest(name, protocol, port, nodes, algorithm, timeout, halfClosed,
+            return new LoadBalancerCreate(name, protocol, port, nodes, algorithm, timeout, halfClosed,
                   sessionPersistence, connectionLogging, connectionThrottle, healthMonitor, accessRules, metadata,
                   virtualIPType, virtualIPId);
          }
          else {
-            return new LoadBalancerRequest(name, protocol, port, nodes, algorithm, timeout, halfClosed,
+            return new LoadBalancerCreate(name, protocol, port, nodes, algorithm, timeout, halfClosed,
                   sessionPersistence, connectionLogging, connectionThrottle, healthMonitor, accessRules, metadata,
                   virtualIps);
          }
@@ -167,8 +167,8 @@ public class LoadBalancerRequest extends BaseLoadBalancer<NodeRequest, LoadBalan
        * {@inheritDoc}
        */
       @Override
-      public Builder nodes(Iterable<NodeRequest> nodes) {
-         this.nodes = ImmutableSet.<NodeRequest> copyOf(checkNotNull(nodes, "nodes"));
+      public Builder nodes(Iterable<NodeAdd> nodeAdds) {
+         this.nodes = ImmutableSet.<NodeAdd> copyOf(checkNotNull(nodeAdds, "nodes"));
          return this;
       }
 
@@ -176,7 +176,7 @@ public class LoadBalancerRequest extends BaseLoadBalancer<NodeRequest, LoadBalan
        * {@inheritDoc}
        */
       @Override
-      public Builder node(NodeRequest nodes) {
+      public Builder node(NodeAdd nodes) {
          this.nodes.add(checkNotNull(nodes, "nodes"));
          return this;
       }
@@ -217,7 +217,7 @@ public class LoadBalancerRequest extends BaseLoadBalancer<NodeRequest, LoadBalan
        * {@inheritDoc}
        */
       @Override
-      public Builder from(LoadBalancerRequest in) {
+      public Builder from(LoadBalancerCreate in) {
          return Builder.class.cast(super.from(in)).virtualIPs(in.virtualIps);
       }
    }
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerAttributes.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUpdate.java
similarity index 72%
rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerAttributes.java
rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUpdate.java
index e3500ffff3..19b09814c4 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerAttributes.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUpdate.java
@@ -29,7 +29,7 @@ import com.google.common.base.Objects.ToStringHelper;
  * 
  * @author Adrian Cole
  */
-public class LoadBalancerAttributes {
+public class LoadBalancerUpdate {
 
    protected String name;
    protected String protocol;
@@ -38,32 +38,32 @@ public class LoadBalancerAttributes {
    protected Integer timeout;
    protected Boolean halfClosed;
 
-   public LoadBalancerAttributes name(String name) {
+   public LoadBalancerUpdate name(String name) {
       this.name = name;
       return this;
    }
 
-   public LoadBalancerAttributes protocol(String protocol) {
+   public LoadBalancerUpdate protocol(String protocol) {
       this.protocol = protocol;
       return this;
    }
 
-   public LoadBalancerAttributes port(Integer port) {
+   public LoadBalancerUpdate port(Integer port) {
       this.port = port;
       return this;
    }
 
-   public LoadBalancerAttributes algorithm(Algorithm algorithm) {
+   public LoadBalancerUpdate algorithm(Algorithm algorithm) {
       this.algorithm = algorithm;
       return this;
    }
 
-   public LoadBalancerAttributes timeout(Integer timeout) {
+   public LoadBalancerUpdate timeout(Integer timeout) {
       this.timeout = timeout;
       return this;
    }
 
-   public LoadBalancerAttributes halfClosed(Boolean halfClosed) {
+   public LoadBalancerUpdate halfClosed(Boolean halfClosed) {
       this.halfClosed = halfClosed;
       return this;
    }
@@ -90,7 +90,7 @@ public class LoadBalancerAttributes {
       if (obj == null || getClass() != obj.getClass())
          return false;
 
-      LoadBalancerAttributes that = LoadBalancerAttributes.class.cast(obj);
+      LoadBalancerUpdate that = LoadBalancerUpdate.class.cast(obj);
       return Objects.equal(this.name, that.name) && Objects.equal(this.algorithm, that.algorithm)
             && Objects.equal(this.port, that.port) && Objects.equal(this.protocol, that.protocol)
             && Objects.equal(this.timeout, that.timeout) && Objects.equal(this.halfClosed, that.halfClosed);
@@ -100,47 +100,47 @@ public class LoadBalancerAttributes {
       /**
        * @see BaseLoadBalancer.Builder#name(String)
        */
-      public static LoadBalancerAttributes name(String name) {
-         return new LoadBalancerAttributes().name(name);
+      public static LoadBalancerUpdate name(String name) {
+         return new LoadBalancerUpdate().name(name);
       }
 
       /**
        * @see BaseLoadBalancer.Builder#protocol(String)
        */
-      public static LoadBalancerAttributes protocol(String protocol) {
-         return new LoadBalancerAttributes().protocol(protocol);
+      public static LoadBalancerUpdate protocol(String protocol) {
+         return new LoadBalancerUpdate().protocol(protocol);
       }
 
       /**
        * @see BaseLoadBalancer.Builder#port(Integer)
        */
-      public static LoadBalancerAttributes port(Integer port) {
-         return new LoadBalancerAttributes().port(port);
+      public static LoadBalancerUpdate port(Integer port) {
+         return new LoadBalancerUpdate().port(port);
       }
 
       /**
        * @see BaseLoadBalancer.Builder#algorithm(Algorithm)
        */
-      public static LoadBalancerAttributes algorithm(Algorithm algorithm) {
-         return new LoadBalancerAttributes().algorithm(algorithm);
+      public static LoadBalancerUpdate algorithm(Algorithm algorithm) {
+         return new LoadBalancerUpdate().algorithm(algorithm);
       }
 
       /**
        * @see BaseLoadBalancer.Builder#timeout(Integer)
        */
-      public static LoadBalancerAttributes timeout(Integer timeout) {
-         return new LoadBalancerAttributes().timeout(timeout);
+      public static LoadBalancerUpdate timeout(Integer timeout) {
+         return new LoadBalancerUpdate().timeout(timeout);
       }
 
       /**
        * @see BaseLoadBalancer.Builder#halfClosed(Boolean)
        */
-      public static LoadBalancerAttributes halfClosed(Boolean halfClosed) {
-         return new LoadBalancerAttributes().halfClosed(halfClosed);
+      public static LoadBalancerUpdate halfClosed(Boolean halfClosed) {
+         return new LoadBalancerUpdate().halfClosed(halfClosed);
       }
    }
 
-   public static <T extends BaseLoadBalancer<?, T>> LoadBalancerAttributes fromLoadBalancer(T lb) {
+   public static <T extends BaseLoadBalancer<?, T>> LoadBalancerUpdate fromLoadBalancer(T lb) {
       return Builder.name(lb.getName()).port(lb.getPort()).protocol(lb.getProtocol()).algorithm(lb.getAlgorithm())
             .timeout(lb.getTimeout()).halfClosed(lb.isHalfClosed());
    }
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeRequest.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeAdd.java
similarity index 91%
rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeRequest.java
rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeAdd.java
index 5142492ff5..8ab085d3af 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeRequest.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeAdd.java
@@ -49,13 +49,13 @@ import com.google.common.base.Objects.ToStringHelper;
  * 
  * @author Adrian Cole
  */
-public class NodeRequest extends BaseNode<NodeRequest> {
+public class NodeAdd extends BaseNode<NodeAdd> {
 
    // for serialization only
-   NodeRequest() {
+   NodeAdd() {
    }
 
-   public NodeRequest(String address, int port, Condition condition, Type type, Integer weight) {
+   public NodeAdd(String address, int port, Condition condition, Type type, Integer weight) {
       super(address, port, condition, type, weight);
    }
 
@@ -79,16 +79,16 @@ public class NodeRequest extends BaseNode<NodeRequest> {
       if (this == obj) return true;
       if (obj == null || getClass() != obj.getClass()) return false;
 
-      NodeRequest that = NodeRequest.class.cast(obj);
+      NodeAdd that = NodeAdd.class.cast(obj);
       return Objects.equal(this.address, that.address)
             && Objects.equal(this.port, that.port);
    }
 
-   public static class Builder extends BaseNode.Builder<NodeRequest> {
+   public static class Builder extends BaseNode.Builder<NodeAdd> {
 
       @Override
-      public NodeRequest build() {
-         return new NodeRequest(address, port, condition, type, weight);
+      public NodeAdd build() {
+         return new NodeAdd(address, port, condition, type, weight);
       }
 
       /**
@@ -131,7 +131,7 @@ public class NodeRequest extends BaseNode<NodeRequest> {
          return Builder.class.cast(super.weight(weight));
       }
       @Override
-      public Builder from(NodeRequest in) {
+      public Builder from(NodeAdd in) {
          return Builder.class.cast(super.from(in));
       }
    }
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeAttributes.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeUpdate.java
similarity index 79%
rename from apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeAttributes.java
rename to apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeUpdate.java
index b5366114ee..4036a8bdd5 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeAttributes.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/NodeUpdate.java
@@ -30,23 +30,23 @@ import com.google.common.base.Objects.ToStringHelper;
  * 
  * @author Dan Lo Bianco
  */
-public class NodeAttributes {
+public class NodeUpdate {
 
    protected Condition condition;
    protected Type type;
    protected Integer weight;
 
-   public NodeAttributes condition(Condition condition) {
+   public NodeUpdate condition(Condition condition) {
       this.condition = condition;
       return this;
    }
 
-   public NodeAttributes type(Type type) {
+   public NodeUpdate type(Type type) {
       this.type = type;
       return this;
    }
 
-   public NodeAttributes weight(Integer weight) {
+   public NodeUpdate weight(Integer weight) {
       this.weight = weight;
       return this;
    }
@@ -71,7 +71,7 @@ public class NodeAttributes {
       if (this == obj) return true;
       if (obj == null || getClass() != obj.getClass()) return false;
 
-      NodeAttributes that = NodeAttributes.class.cast(obj);
+      NodeUpdate that = NodeUpdate.class.cast(obj);
       return Objects.equal(this.condition, that.condition)
             && Objects.equal(this.type, that.type)
             && Objects.equal(this.weight, that.weight);
@@ -81,26 +81,26 @@ public class NodeAttributes {
       /**
        * @see BaseNode.Builder#condition(Condition)
        */
-      public static NodeAttributes condition(Condition condition) {
-         return new NodeAttributes().condition(condition);
+      public static NodeUpdate condition(Condition condition) {
+         return new NodeUpdate().condition(condition);
       }
 
       /**
        * @see BaseNode.Builder#type(Type)
        */
-      public static NodeAttributes type(Type type) {
-         return new NodeAttributes().type(type);
+      public static NodeUpdate type(Type type) {
+         return new NodeUpdate().type(type);
       }
 
       /**
        * @see BaseNode.Builder#weight(Integer)
        */
-      public static NodeAttributes weight(Integer weight) {
-         return new NodeAttributes().weight(weight);
+      public static NodeUpdate weight(Integer weight) {
+         return new NodeUpdate().weight(weight);
       }
    }
 
-   public static <T extends BaseNode<T>> NodeAttributes fromNode(T n) {
+   public static <T extends BaseNode<T>> NodeUpdate fromNode(T n) {
       return Builder.condition(n.getCondition()).type(n.getType()).weight(n.getWeight());
    }
 }
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java
index e8c8a420ba..b0ca139df4 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApi.java
@@ -24,8 +24,8 @@ import org.jclouds.collect.IterableWithMarker;
 import org.jclouds.collect.PagedIterable;
 import org.jclouds.openstack.v2_0.options.PaginationOptions;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerAttributes;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerUpdate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata;
 
 /**
@@ -43,7 +43,7 @@ public interface LoadBalancerApi {
     *         identifier, the caller can check on the progress of the operation by performing a
     *         {@link LoadBalancerApi#get}.
     */
-   LoadBalancer create(LoadBalancerRequest lb);
+   LoadBalancer create(LoadBalancerCreate lbCreate);
 
    /**
     * Update the properties of a load balancer.
@@ -52,7 +52,7 @@ public interface LoadBalancerApi {
     *         identifier, the caller can check on the progress of the operation by performing a
     *         {@link LoadBalancerApi#get}.
     */
-   void update(int id, LoadBalancerAttributes attrs);
+   void update(int id, LoadBalancerUpdate lbUpdate);
 
    /**
     * List the load balancers.
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerAsyncApi.java
index 9034ebef2f..a1f67f49eb 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerAsyncApi.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerAsyncApi.java
@@ -44,8 +44,8 @@ import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
 import org.jclouds.openstack.v2_0.options.PaginationOptions;
 import org.jclouds.rackspace.cloudloadbalancers.v1.binders.BindMetadataToJsonPayload;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerAttributes;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerUpdate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata;
 import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancer;
 import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancers;
@@ -72,7 +72,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 public interface LoadBalancerAsyncApi {
 
    /**
-    * @see LoadBalancerApi#create(LoadBalancerRequest)
+    * @see LoadBalancerApi#create(LoadBalancerCreate)
     */
    @Named("lb:create")
    @POST
@@ -80,17 +80,17 @@ public interface LoadBalancerAsyncApi {
    @Consumes(MediaType.APPLICATION_JSON)
    @Fallback(NullOnNotFoundOr404.class)
    @Path("/loadbalancers")
-   ListenableFuture<LoadBalancer> create(@WrapWith("loadBalancer") LoadBalancerRequest lb);
+   ListenableFuture<LoadBalancer> create(@WrapWith("loadBalancer") LoadBalancerCreate lbCreate);
 
    /**
-    * @see LoadBalancerApi#update(int, LoadBalancerAttributes)
+    * @see LoadBalancerApi#update(int, LoadBalancerUpdate)
     */
    @Named("lb:update")
    @PUT
    @ResponseParser(ParseLoadBalancer.class)
    @Consumes(MediaType.APPLICATION_JSON)
    @Path("/loadbalancers/{id}")
-   ListenableFuture<Void> update(@PathParam("id") int id, @WrapWith("loadBalancer") LoadBalancerAttributes attrs);
+   ListenableFuture<Void> update(@PathParam("id") int id, @WrapWith("loadBalancer") LoadBalancerUpdate lbUpdate);
 
    /**
     * @see LoadBalancerApi#list()
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java
index d83808a7a1..0c5c7e207e 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApi.java
@@ -26,8 +26,8 @@ import org.jclouds.collect.PagedIterable;
 import org.jclouds.openstack.v2_0.options.PaginationOptions;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAttributes;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeUpdate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 
 /**
  * Provides synchronous access to CloudLoadBalancers Node features.
@@ -40,12 +40,12 @@ public interface NodeApi {
    /**
     * Create a new node with the configuration defined by the request.
     */
-	Set<Node> add(Iterable<NodeRequest> nodes);
+	Set<Node> add(Iterable<NodeAdd> nodeAdds);
 
    /**
     * Update the attributes of a node.
     */
-   void update(int id, NodeAttributes attrs);
+   void update(int id, NodeUpdate nodeUpdate);
 
    /**
     * List the nodes.
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeAsyncApi.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeAsyncApi.java
index 30995b2656..c160ea7aaa 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeAsyncApi.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeAsyncApi.java
@@ -47,8 +47,8 @@ import org.jclouds.rackspace.cloudloadbalancers.v1.binders.BindMetadataToJsonPay
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAttributes;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeUpdate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseMetadata;
 import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseNode;
 import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseNodes;
@@ -83,16 +83,16 @@ public interface NodeAsyncApi {
    @Consumes(MediaType.APPLICATION_JSON)
    @Fallback(NullOnNotFoundOr404.class)
    @Path("/nodes")
-   ListenableFuture<Set<Node>> add(@WrapWith("nodes") Iterable<NodeRequest> nodes);
+   ListenableFuture<Set<Node>> add(@WrapWith("nodes") Iterable<NodeAdd> nodeAdds);
 
    /**
-    * @see NodeApi#update(int, NodeAttributes)
+    * @see NodeApi#update(int, NodeUpdate)
     */
    @Named("node:update")
    @PUT
    @Consumes(MediaType.APPLICATION_JSON)
    @Path("/nodes/{id}")
-   ListenableFuture<Void> update(@PathParam("id") int id, @WrapWith("node") NodeAttributes attrs);
+   ListenableFuture<Void> update(@PathParam("id") int id, @WrapWith("node") NodeUpdate nodeUpdate);
    
    /**
     * @see NodeApi#list()
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java
index 8fc07ed84f..03e2b7f07e 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java
@@ -34,8 +34,8 @@ import org.jclouds.loadbalancer.strategy.LoadBalanceNodesStrategy;
 import org.jclouds.logging.Logger;
 import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
 
 import com.google.common.base.Function;
@@ -67,13 +67,13 @@ public class CloudLoadBalancersLoadBalanceNodesStrategy implements LoadBalanceNo
 
       // TODO need to query and update the LB per current design.
       LoadBalancer lb = client.getLoadBalancerApiForZone(region).create(
-               LoadBalancerRequest.builder().name(name).protocol(protocol.toUpperCase()).port(loadBalancerPort)
+               LoadBalancerCreate.builder().name(name).protocol(protocol.toUpperCase()).port(loadBalancerPort)
                         .virtualIPType(Type.PUBLIC).nodes(
-                                 Iterables.transform(nodes, new Function<NodeMetadata, NodeRequest>() {
+                                 Iterables.transform(nodes, new Function<NodeMetadata, NodeAdd>() {
 
                                     @Override
-                                    public NodeRequest apply(NodeMetadata arg0) {
-                                       return NodeRequest.builder().address(
+                                    public NodeAdd apply(NodeMetadata arg0) {
+                                       return NodeAdd.builder().address(
                                                 Iterables.get(arg0.getPrivateAddresses(), 0)).port(instancePort)
                                                 .build();
 
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java
index e5b086cba9..6ac2051c1a 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/AccessRuleApiLiveTest.java
@@ -30,8 +30,8 @@ import java.util.Map;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRule;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.AccessRuleWithId;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
 import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest;
 import org.testng.annotations.AfterGroups;
@@ -72,12 +72,12 @@ public class AccessRuleApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
    }
 
    public void testCreateLoadBalancer() {
-      NodeRequest nodeRequest = NodeRequest.builder().address("192.168.1.1").port(8080).build();
-      LoadBalancerRequest lbRequest = LoadBalancerRequest.builder()
-            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeRequest).build(); 
+      NodeAdd nodeAdd = NodeAdd.builder().address("192.168.1.1").port(8080).build();
+      LoadBalancerCreate lbCreate = LoadBalancerCreate.builder()
+            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeAdd).build(); 
 
       zone = "ORD";//Iterables.getFirst(clbApi.getConfiguredZones(), null);
-      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbRequest);
+      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbCreate);
       
       assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb));
    }
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java
index 75acc292bb..79a409a381 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ConnectionApiLiveTest.java
@@ -27,8 +27,8 @@ import static org.testng.Assert.assertTrue;
 
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.ConnectionThrottle;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
 import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest;
 import org.testng.annotations.AfterGroups;
@@ -45,12 +45,12 @@ public class ConnectionApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
    private String zone;
 
    public void testCreateLoadBalancer() {
-      NodeRequest nodeRequest = NodeRequest.builder().address("192.168.1.1").port(8080).build();
-      LoadBalancerRequest lbRequest = LoadBalancerRequest.builder()
-            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeRequest).build(); 
+      NodeAdd nodeAdd = NodeAdd.builder().address("192.168.1.1").port(8080).build();
+      LoadBalancerCreate lbCreate = LoadBalancerCreate.builder()
+            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeAdd).build(); 
 
       zone = Iterables.getFirst(clbApi.getConfiguredZones(), null);
-      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbRequest);
+      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbCreate);
       
       assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb));
    }
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java
index cc94b9797e..ce08591498 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ContentCachingApiLiveTest.java
@@ -24,8 +24,8 @@ import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
 import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest;
 import org.testng.annotations.AfterGroups;
@@ -42,12 +42,12 @@ public class ContentCachingApiLiveTest extends BaseCloudLoadBalancersApiLiveTest
    private String zone;
 
    public void testCreateLoadBalancer() {
-      NodeRequest nodeRequest = NodeRequest.builder().address("192.168.1.1").port(8080).build();
-      LoadBalancerRequest lbRequest = LoadBalancerRequest.builder()
-            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeRequest).build(); 
+      NodeAdd nodeAdd = NodeAdd.builder().address("192.168.1.1").port(8080).build();
+      LoadBalancerCreate lbCreate = LoadBalancerCreate.builder()
+            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeAdd).build(); 
 
       zone = Iterables.getFirst(clbApi.getConfiguredZones(), null);
-      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbRequest);
+      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbCreate);
       
       assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb));
    }
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java
index cd2529d077..d00066200a 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ErrorPageApiLiveTest.java
@@ -24,8 +24,8 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
 import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest;
 import org.testng.annotations.AfterGroups;
@@ -54,12 +54,12 @@ public class ErrorPageApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
    }
 
    public void testCreateLoadBalancer() {
-      NodeRequest nodeRequest = NodeRequest.builder().address("192.168.1.1").port(8080).build();
-      LoadBalancerRequest lbRequest = LoadBalancerRequest.builder()
-            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeRequest).build(); 
+      NodeAdd nodeAdd = NodeAdd.builder().address("192.168.1.1").port(8080).build();
+      LoadBalancerCreate lbCreate = LoadBalancerCreate.builder()
+            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeAdd).build(); 
 
       zone = Iterables.getFirst(clbApi.getConfiguredZones(), null);
-      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbRequest);
+      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbCreate);
       
       assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb));
    }
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java
index f30bb433c7..12b200239f 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/HealthMonitorApiLiveTest.java
@@ -26,8 +26,8 @@ import static org.testng.Assert.assertTrue;
 
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HealthMonitor;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
 import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest;
 import org.testng.annotations.AfterGroups;
@@ -44,12 +44,12 @@ public class HealthMonitorApiLiveTest extends BaseCloudLoadBalancersApiLiveTest
    private String zone;
 
    public void testCreateLoadBalancer() {
-      NodeRequest nodeRequest = NodeRequest.builder().address("192.168.1.1").port(8080).build();
-      LoadBalancerRequest lbRequest = LoadBalancerRequest.builder()
-            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeRequest).build(); 
+      NodeAdd nodeAdd = NodeAdd.builder().address("192.168.1.1").port(8080).build();
+      LoadBalancerCreate lbCreate = LoadBalancerCreate.builder()
+            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeAdd).build(); 
 
       zone = Iterables.getFirst(clbApi.getConfiguredZones(), null);
-      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbRequest);
+      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbCreate);
       
       assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb));
    }
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java
index 2094b48f3d..5c296994b6 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiExpectTest.java
@@ -29,10 +29,11 @@ import javax.ws.rs.core.MediaType;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerAttributes;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerUpdate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP;
 import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi;
 import org.jclouds.rackspace.cloudloadbalancers.v1.functions.ParseLoadBalancerTest;
@@ -88,30 +89,30 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
             HttpResponse.builder().statusCode(200).payload(payloadFromResource("/loadbalancer-get.json")).build()
       ).getLoadBalancerApiForZone("DFW");
 
-      NodeRequest nodeRequest1 = NodeRequest.builder()
+      NodeAdd nodeAdd1 = NodeAdd.builder()
             .address("10.1.1.1")
-            .condition(NodeRequest.Condition.ENABLED)
+            .condition(Node.Condition.ENABLED)
             .port(80)
             .build();
       
-      NodeRequest nodeRequest2 = NodeRequest.builder()
+      NodeAdd nodeAdd2 = NodeAdd.builder()
             .address("10.1.1.2")
-            .condition(NodeRequest.Condition.ENABLED)
+            .condition(Node.Condition.ENABLED)
             .port(80)
             .build();
       
-      Set<NodeRequest> nodeRequests = Sets.newHashSet(nodeRequest1, nodeRequest2);
+      Set<NodeAdd> nodeAdds = Sets.newHashSet(nodeAdd1, nodeAdd2);
 
-      LoadBalancerRequest lbRequest = LoadBalancerRequest.builder()
+      LoadBalancerCreate lbCreate = LoadBalancerCreate.builder()
             .name("sample-loadbalancer")
             .protocol("HTTP")
             .port(80)
             .algorithm(LoadBalancer.Algorithm.RANDOM)
             .virtualIPType(VirtualIP.Type.PUBLIC)
-            .nodes(nodeRequests)
+            .nodes(nodeAdds)
             .build();
       
-      LoadBalancer loadBalancer = api.create(lbRequest);
+      LoadBalancer loadBalancer = api.create(lbCreate);
       
       assertEquals(loadBalancer, getExpectedLoadBalancer());
    }
@@ -125,13 +126,13 @@ public class LoadBalancerApiExpectTest extends BaseCloudLoadBalancerApiExpectTes
             HttpResponse.builder().statusCode(202).payload("").build()
       ).getLoadBalancerApiForZone("DFW");
 
-      LoadBalancerAttributes lbAttrs = LoadBalancerAttributes.Builder
+      LoadBalancerUpdate lbUpdate = LoadBalancerUpdate.Builder
             .name("foo")
             .protocol("HTTPS")
             .port(443)
             .algorithm(LoadBalancer.Algorithm.RANDOM);
 
-      api.update(2000, lbAttrs);
+      api.update(2000, lbUpdate);
    }
 
    public void testRemoveLoadBalancer() {
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java
index fcf5a1ceb4..12f1b6f863 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/LoadBalancerApiLiveTest.java
@@ -30,10 +30,10 @@ import java.util.Set;
 import java.util.logging.Logger;
 
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerAttributes;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerUpdate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
 import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest;
 import org.testng.annotations.AfterGroups;
@@ -67,12 +67,12 @@ public class LoadBalancerApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
          Logger.getAnonymousLogger().info("starting lb in region " + zone);
          
          LoadBalancer lb = clbApi.getLoadBalancerApiForZone(zone).create(
-               LoadBalancerRequest.builder()
+               LoadBalancerCreate.builder()
                      .name(prefix + "-" + zone)
                      .protocol("HTTP")
                      .port(80)
                      .virtualIPType(Type.PUBLIC)
-                     .node(NodeRequest.builder()
+                     .node(NodeAdd.builder()
                            .address("192.168.1.1")
                            .port(8080)
                            .build())
@@ -96,7 +96,7 @@ public class LoadBalancerApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
    public void testUpdateLoadBalancer() throws Exception {
       for (LoadBalancer lb: lbs) {
          clbApi.getLoadBalancerApiForZone(lb.getRegion()).update(lb.getId(),
-               LoadBalancerAttributes.Builder.name("foo" + "-" + lb.getRegion()));
+               LoadBalancerUpdate.Builder.name("foo" + "-" + lb.getRegion()));
          
          assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(lb.getRegion())).apply(lb));
 
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java
index 8ad1848c79..0fc1a268a9 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiExpectTest.java
@@ -30,8 +30,8 @@ import org.jclouds.http.HttpResponse;
 import org.jclouds.rackspace.cloudloadbalancers.v1.CloudLoadBalancersApi;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAttributes;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeUpdate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.features.NodeApi;
 import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancerApiExpectTest;
 import org.testng.annotations.Test;
@@ -84,31 +84,31 @@ public class NodeApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<CloudL
             HttpResponse.builder().statusCode(200).payload(payloadFromResource("/nodes-list.json")).build()
       ).getNodeApiForZoneAndLoadBalancer("DFW", 2000);
 
-      NodeRequest nodeRequest1 = NodeRequest.builder()
+      NodeAdd nodeAdd1 = NodeAdd.builder()
             .address("10.1.1.1")
-            .condition(NodeRequest.Condition.ENABLED)
+            .condition(Node.Condition.ENABLED)
             .port(80)
             .weight(3)
             .build();
       
-      NodeRequest nodeRequest2 = NodeRequest.builder()
+      NodeAdd nodeAdd2 = NodeAdd.builder()
             .address("10.1.1.2")
-            .condition(NodeRequest.Condition.ENABLED)
+            .condition(Node.Condition.ENABLED)
             .type(Node.Type.SECONDARY)
             .port(80)
             .weight(8)
             .build();
 
-      NodeRequest nodeRequest3 = NodeRequest.builder()
+      NodeAdd nodeAdd3 = NodeAdd.builder()
             .address("10.1.1.3")
-            .condition(NodeRequest.Condition.DISABLED)
+            .condition(Node.Condition.DISABLED)
             .port(80)
             .weight(12)
             .build();
 
-      Set<NodeRequest> nodeRequests = ImmutableSortedSet.<NodeRequest> of(nodeRequest1, nodeRequest2, nodeRequest3);
+      Set<NodeAdd> nodeAdds = ImmutableSortedSet.<NodeAdd> of(nodeAdd1, nodeAdd2, nodeAdd3);
       
-      Set<Node> nodes = api.add(nodeRequests);
+      Set<Node> nodes = api.add(nodeAdds);
       assertEquals(nodes, getExpectedNodes());
    }
 
@@ -121,12 +121,12 @@ public class NodeApiExpectTest extends BaseCloudLoadBalancerApiExpectTest<CloudL
             HttpResponse.builder().statusCode(200).build()
       ).getNodeApiForZoneAndLoadBalancer("DFW", 2000);
 
-      NodeAttributes nodeAttributes = NodeAttributes.Builder
-            .condition(NodeRequest.Condition.DISABLED)
-            .type(NodeRequest.Type.SECONDARY)
+      NodeUpdate nodeUpdate = NodeUpdate.Builder
+            .condition(Node.Condition.DISABLED)
+            .type(Node.Type.SECONDARY)
             .weight(20);
 
-      api.update(410, nodeAttributes);
+      api.update(410, nodeUpdate);
    }
 
    public void testRemoveNodeFromLoadBalancer() {
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java
index 0df9d707a2..29d6ad9b80 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/NodeApiLiveTest.java
@@ -37,11 +37,11 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Metadata;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Node;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAttributes;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeUpdate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer.Status;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
 import org.jclouds.rackspace.cloudloadbalancers.v1.features.LoadBalancerApi;
@@ -62,8 +62,8 @@ public class NodeApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
       for (String zone : clbApi.getConfiguredZones()) {
          Logger.getAnonymousLogger().info("starting lb in zone " + zone);
          LoadBalancer lb = clbApi.getLoadBalancerApiForZone(zone).create(
-                  LoadBalancerRequest.builder().name(prefix + "-" + zone).protocol("HTTP").port(80).virtualIPType(
-                           Type.PUBLIC).node(NodeRequest.builder().address("192.168.1.1").port(8080).build()).build());
+                  LoadBalancerCreate.builder().name(prefix + "-" + zone).protocol("HTTP").port(80).virtualIPType(
+                           Type.PUBLIC).node(NodeAdd.builder().address("192.168.1.1").port(8080).build()).build());
          nodes.put(lb, new HashSet<Node>());
 
          assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(lb.getRegion())).apply(lb));
@@ -78,7 +78,7 @@ public class NodeApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
          String region = lb.getRegion();
          Logger.getAnonymousLogger().info("starting node on loadbalancer " + lb.getId() + " in region " + region);
          Set<Node> newNodes = clbApi.getNodeApiForZoneAndLoadBalancer(region, lb.getId()).add(
-                  ImmutableSet.<NodeRequest> of(NodeRequest.builder().address("192.168.1.2").port(8080).build()));
+                  ImmutableSet.<NodeAdd> of(NodeAdd.builder().address("192.168.1.2").port(8080).build()));
 
          for (Node n : newNodes) {
             assertEquals(n.getStatus(), Node.Status.ONLINE);
@@ -97,7 +97,7 @@ public class NodeApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
          for (Node n : entry.getValue()) {
             String region = entry.getKey().getRegion();
             clbApi.getNodeApiForZoneAndLoadBalancer(region, entry.getKey().getId()).update(n.getId(),
-                     NodeAttributes.Builder.weight(23));
+                     NodeUpdate.Builder.weight(23));
             assertEquals(clbApi.getNodeApiForZoneAndLoadBalancer(region, entry.getKey().getId()).get(n.getId())
                      .getStatus(), Node.Status.ONLINE);
 
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiLiveTest.java
index f72f28e042..f5d2f657bf 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/ReportApiLiveTest.java
@@ -30,10 +30,10 @@ import java.util.Date;
 import org.jclouds.http.HttpResponseException;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HistoricalUsage;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerStats;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerUsage;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.Protocol;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
 import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest;
@@ -52,12 +52,12 @@ public class ReportApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
    private String zone;
 
    public void testCreateLoadBalancer() {
-      NodeRequest nodeRequest = NodeRequest.builder().address("192.168.1.1").port(8080).build();
-      LoadBalancerRequest lbRequest = LoadBalancerRequest.builder()
-            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeRequest).build(); 
+      NodeAdd nodeAdd = NodeAdd.builder().address("192.168.1.1").port(8080).build();
+      LoadBalancerCreate lbCreate = LoadBalancerCreate.builder()
+            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeAdd).build(); 
 
       zone = Iterables.getFirst(clbApi.getConfiguredZones(), null);
-      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbRequest);
+      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbCreate);
       
       assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb));
    }
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiLiveTest.java
index 1ad43b9c9d..e053a583f2 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SSLTerminationApiLiveTest.java
@@ -25,8 +25,8 @@ import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SSLTermination;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
 import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest;
@@ -44,12 +44,12 @@ public class SSLTerminationApiLiveTest extends BaseCloudLoadBalancersApiLiveTest
    private String zone;
 
    public void testCreateLoadBalancer() {
-      NodeRequest nodeRequest = NodeRequest.builder().address("192.168.1.1").port(8080).build();
-      LoadBalancerRequest lbRequest = LoadBalancerRequest.builder()
-            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeRequest).build(); 
+      NodeAdd nodeAdd = NodeAdd.builder().address("192.168.1.1").port(8080).build();
+      LoadBalancerCreate lbCreate = LoadBalancerCreate.builder()
+            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeAdd).build(); 
 
       zone = Iterables.getFirst(clbApi.getConfiguredZones(), null);
-      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbRequest);
+      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbCreate);
       
       assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb));
    }
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiLiveTest.java
index bedd2fae01..1e8be080f6 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/SessionPersistenceApiLiveTest.java
@@ -25,8 +25,8 @@ import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SessionPersistence;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
 import org.jclouds.rackspace.cloudloadbalancers.v1.internal.BaseCloudLoadBalancersApiLiveTest;
@@ -44,12 +44,12 @@ public class SessionPersistenceApiLiveTest extends BaseCloudLoadBalancersApiLive
    private String zone;
 
    public void testCreateLoadBalancer() {
-      NodeRequest nodeRequest = NodeRequest.builder().address("192.168.1.1").port(8080).build();
-      LoadBalancerRequest lbRequest = LoadBalancerRequest.builder()
-            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeRequest).build(); 
+      NodeAdd nodeAdd = NodeAdd.builder().address("192.168.1.1").port(8080).build();
+      LoadBalancerCreate lbCreate = LoadBalancerCreate.builder()
+            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeAdd).build(); 
 
       zone = Iterables.getFirst(clbApi.getConfiguredZones(), null);
-      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbRequest);
+      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbCreate);
       
       assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb));
    }
diff --git a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiLiveTest.java b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiLiveTest.java
index cee12ae83b..95614027ac 100644
--- a/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiLiveTest.java
+++ b/apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/v1/features/VirtualIPApiLiveTest.java
@@ -26,8 +26,8 @@ import static org.testng.Assert.assertTrue;
 import java.util.List;
 
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerRequest;
-import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancerCreate;
+import org.jclouds.rackspace.cloudloadbalancers.v1.domain.NodeAdd;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIPWithId;
 import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
@@ -48,12 +48,12 @@ public class VirtualIPApiLiveTest extends BaseCloudLoadBalancersApiLiveTest {
    private String zone;
 
    public void testCreateLoadBalancer() {
-      NodeRequest nodeRequest = NodeRequest.builder().address("192.168.1.1").port(8080).build();
-      LoadBalancerRequest lbRequest = LoadBalancerRequest.builder()
-            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeRequest).build(); 
+      NodeAdd nodeAdd = NodeAdd.builder().address("192.168.1.1").port(8080).build();
+      LoadBalancerCreate lbCreate = LoadBalancerCreate.builder()
+            .name(prefix+"-jclouds").protocol("HTTP").port(80).virtualIPType(Type.PUBLIC).node(nodeAdd).build(); 
 
       zone = Iterables.getFirst(clbApi.getConfiguredZones(), null);
-      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbRequest);
+      lb = clbApi.getLoadBalancerApiForZone(zone).create(lbCreate);
       
       assertTrue(awaitAvailable(clbApi.getLoadBalancerApiForZone(zone)).apply(lb));
    }