Renamed cloudloadbalancers to rackspace-cloudloadbalancers.

allloadbalancer/pom.xml

@@ -32,12 +32,12 @@
     <dependencies>
         <dependency>
             <groupId>org.jclouds.provider</groupId>
-            <artifactId>cloudloadbalancers-uk</artifactId>
+            <artifactId>rackspace-cloudloadbalancers-uk</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jclouds.provider</groupId>
-            <artifactId>cloudloadbalancers-us</artifactId>
+            <artifactId>rackspace-cloudloadbalancers-us</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

apis/cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata

@@ -1 +0,0 @@
-org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata

apis/pom.xml

@@ -32,29 +32,29 @@
     <packaging>pom</packaging>
     <name>jclouds apis project</name>
     <modules>
+       <module>cloudwatch</module>
+       <module>cloudsigma</module>
+       <module>cloudstack</module>
        <module>filesystem</module>
        <module>byon</module>
        <module>s3</module>
        <module>ec2</module>
+       <module>sqs</module>
        <module>deltacloud</module>
        <module>walrus</module>
        <module>eucalyptus</module>
-       <module>swift</module>
-       <module>cloudfiles</module>
-       <module>cloudservers</module>
-       <module>cloudloadbalancers</module>
        <module>vcloud</module>
        <module>elasticstack</module>
        <module>atmos</module>
        <module>nova</module>
+       <module>swift</module>
        <module>openstack-keystone</module>
        <module>openstack-cinder</module>
        <module>openstack-nova</module>
        <module>openstack-nova-ec2</module>
-       <module>cloudwatch</module>
+       <module>cloudfiles</module>
-       <module>cloudsigma</module>
+       <module>cloudservers</module>
-       <module>cloudstack</module>
        <module>rackspace-cloudidentity</module>
-       <module>sqs</module>
+       <module>rackspace-cloudloadbalancers</module>
     </modules>
 </project>

apis/rackspace-cloudloadbalancers/pom.xml

@@ -28,19 +28,19 @@
     <relativePath>../../project/pom.xml</relativePath>
   </parent>
   <groupId>org.jclouds.api</groupId>
-  <artifactId>cloudloadbalancers</artifactId>
+  <artifactId>rackspace-cloudloadbalancers</artifactId>
-  <name>jclouds cloudloadbalancers api</name>
+  <name>jclouds Rackspace Cloud Load Balancers API</name>
-  <description>jclouds components to access a rackspace implementation of LoadBalancer</description>
+  <description>Cloud Load Balancers API for Rackspace</description>
   <packaging>bundle</packaging>
   
    <properties>
-    <test.cloudloadbalancers.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.cloudloadbalancers.endpoint>
+    <test.rackspace-cloudloadbalancers.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudloadbalancers.endpoint>
-    <test.cloudloadbalancers.api-version>1</test.cloudloadbalancers.api-version>
+    <test.rackspace-cloudloadbalancers.api-version>1</test.rackspace-cloudloadbalancers.api-version>
-    <test.cloudloadbalancers.build-version></test.cloudloadbalancers.build-version>
+    <test.rackspace-cloudloadbalancers.build-version></test.rackspace-cloudloadbalancers.build-version>
-    <test.cloudloadbalancers.identity>${test.rackspace.identity}</test.cloudloadbalancers.identity>
+    <test.rackspace-cloudloadbalancers.identity>${test.rackspace.identity}</test.rackspace-cloudloadbalancers.identity>
-    <test.cloudloadbalancers.credential>${test.rackspace.credential}</test.cloudloadbalancers.credential>
+    <test.rackspace-cloudloadbalancers.credential>${test.rackspace.credential}</test.rackspace-cloudloadbalancers.credential>
 
-    <jclouds.osgi.export>org.jclouds.cloudloadbalancers*;version="${project.version}"</jclouds.osgi.export>
+    <jclouds.osgi.export>org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}"</jclouds.osgi.export>
     <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
    </properties>
   <dependencies>
@@ -117,11 +117,11 @@
                 </goals>
                 <configuration>
                   <systemPropertyVariables>
-                    <test.cloudloadbalancers.endpoint>${test.cloudloadbalancers.endpoint}</test.cloudloadbalancers.endpoint>
+                    <test.rackspace-cloudloadbalancers.endpoint>${test.rackspace-cloudloadbalancers.endpoint}</test.rackspace-cloudloadbalancers.endpoint>
-                    <test.cloudloadbalancers.api-version>${test.cloudloadbalancers.api-version}</test.cloudloadbalancers.api-version>
+                    <test.rackspace-cloudloadbalancers.api-version>${test.rackspace-cloudloadbalancers.api-version}</test.rackspace-cloudloadbalancers.api-version>
-                    <test.cloudloadbalancers.build-version>${test.cloudloadbalancers.build-version}</test.cloudloadbalancers.build-version>
+                    <test.rackspace-cloudloadbalancers.build-version>${test.rackspace-cloudloadbalancers.build-version}</test.rackspace-cloudloadbalancers.build-version>
-                    <test.cloudloadbalancers.identity>${test.cloudloadbalancers.identity}</test.cloudloadbalancers.identity>
+                    <test.rackspace-cloudloadbalancers.identity>${test.rackspace-cloudloadbalancers.identity}</test.rackspace-cloudloadbalancers.identity>
-                    <test.cloudloadbalancers.credential>${test.cloudloadbalancers.credential}</test.cloudloadbalancers.credential>
+                    <test.rackspace-cloudloadbalancers.credential>${test.rackspace-cloudloadbalancers.credential}</test.rackspace-cloudloadbalancers.credential>
                     <test.jclouds.keystone.credential-type>${test.jclouds.keystone.credential-type}</test.jclouds.keystone.credential-type>
                   </systemPropertyVariables>
                 </configuration>

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApi.java

@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers;
 
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.jclouds.cloudloadbalancers.features.LoadBalancerClient;
-import org.jclouds.cloudloadbalancers.features.NodeClient;
 import org.jclouds.concurrent.Timeout;
 import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.location.Zone;
 import org.jclouds.location.functions.ZoneToEndpoint;
+import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClient;
+import org.jclouds.rackspace.cloudloadbalancers.features.NodeClient;
 import org.jclouds.rest.annotations.Delegate;
 import org.jclouds.rest.annotations.EndpointParam;
 
@@ -36,11 +36,11 @@ import com.google.inject.Provides;
  * Provides synchronous access to CloudLoadBalancers.
  * <p/>
  * 
- * @see CloudLoadBalancersAsyncClient
+ * @see CloudLoadBalancersAsyncApi 
  * @author Adrian Cole
  */
 @Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
-public interface CloudLoadBalancersClient {
+public interface CloudLoadBalancersApi {
    /**
     * @return the Zone codes configured
     */

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadata.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers;
 
 import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
 import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
@@ -25,13 +25,13 @@ import java.net.URI;
 import java.util.Properties;
 
 import org.jclouds.apis.ApiMetadata;
-import org.jclouds.cloudloadbalancers.config.CloudLoadBalancersRestClientModule;
-import org.jclouds.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule;
 import org.jclouds.loadbalancer.LoadBalancerServiceContext;
 import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
 import org.jclouds.rackspace.cloudidentity.v2_0.ServiceType;
 import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
 import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityCredentialTypes;
+import org.jclouds.rackspace.cloudloadbalancers.config.CloudLoadBalancersRestClientModule;
+import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule;
 import org.jclouds.rest.RestContext;
 import org.jclouds.rest.internal.BaseRestApiMetadata;
 
@@ -46,8 +46,8 @@ import com.google.inject.Module;
  */
 public class CloudLoadBalancersApiMetadata extends BaseRestApiMetadata {
 
-   public static final TypeToken<RestContext<CloudLoadBalancersClient, CloudLoadBalancersAsyncClient>> CONTEXT_TOKEN = 
+   public static final TypeToken<RestContext<CloudLoadBalancersApi, CloudLoadBalancersAsyncApi>> CONTEXT_TOKEN = 
-         new TypeToken<RestContext<CloudLoadBalancersClient, CloudLoadBalancersAsyncClient>>() {};
+         new TypeToken<RestContext<CloudLoadBalancersApi, CloudLoadBalancersAsyncApi>>() {};
 
 
    @Override
@@ -75,7 +75,7 @@ public class CloudLoadBalancersApiMetadata extends BaseRestApiMetadata {
    public static class Builder extends BaseRestApiMetadata.Builder {
 
       protected Builder() {
-         super(CloudLoadBalancersClient.class, CloudLoadBalancersAsyncClient.class);
+         super(CloudLoadBalancersApi.class, CloudLoadBalancersAsyncApi.class);
          id("cloudloadbalancers")
                .name("Rackspace Cloud Load Balancers API")
                .identityName("Username")

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersAsyncApi.java

@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers;
 
 import java.util.Set;
 
-import org.jclouds.cloudloadbalancers.features.LoadBalancerAsyncClient;
-import org.jclouds.cloudloadbalancers.features.NodeAsyncClient;
 import org.jclouds.javax.annotation.Nullable;
 import org.jclouds.location.Zone;
 import org.jclouds.location.functions.ZoneToEndpoint;
+import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerAsyncClient;
+import org.jclouds.rackspace.cloudloadbalancers.features.NodeAsyncClient;
 import org.jclouds.rest.annotations.Delegate;
 import org.jclouds.rest.annotations.EndpointParam;
 
@@ -34,10 +34,10 @@ import com.google.inject.Provides;
  * Provides asynchronous access to CloudLoadBalancers via their REST API.
  * <p/>
  * 
- * @see CloudLoadBalancersClient
+ * @see CloudLoadBalancersApi
  * @author Adrian Cole
  */
-public interface CloudLoadBalancersAsyncClient {
+public interface CloudLoadBalancersAsyncApi {
    /**
     * @return the Zone codes configured
     */

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/LoadBalancer.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -36,4 +36,4 @@ import javax.inject.Qualifier;
 @Qualifier
 public @interface LoadBalancer {
 
-}
+}

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/Node.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -36,4 +36,4 @@ import javax.inject.Qualifier;
 @Qualifier
 public @interface Node {
 
-}
+}

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/config/CloudLoadBalancersRestClientModule.java

@@ -16,24 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.config;
+package org.jclouds.rackspace.cloudloadbalancers.config;
 
 import java.util.Map;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersAsyncClient;
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient;
-import org.jclouds.cloudloadbalancers.features.LoadBalancerAsyncClient;
-import org.jclouds.cloudloadbalancers.features.LoadBalancerClient;
-import org.jclouds.cloudloadbalancers.features.NodeAsyncClient;
-import org.jclouds.cloudloadbalancers.features.NodeClient;
-import org.jclouds.cloudloadbalancers.functions.ConvertLB;
-import org.jclouds.cloudloadbalancers.handlers.ParseCloudLoadBalancersErrorFromHttpResponse;
 import org.jclouds.http.HttpErrorHandler;
 import org.jclouds.http.annotation.ClientError;
 import org.jclouds.http.annotation.Redirection;
 import org.jclouds.http.annotation.ServerError;
 import org.jclouds.json.config.GsonModule.DateAdapter;
 import org.jclouds.json.config.GsonModule.Iso8601DateAdapter;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersAsyncApi;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi;
+import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerAsyncClient;
+import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClient;
+import org.jclouds.rackspace.cloudloadbalancers.features.NodeAsyncClient;
+import org.jclouds.rackspace.cloudloadbalancers.features.NodeClient;
+import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB;
+import org.jclouds.rackspace.cloudloadbalancers.handlers.ParseCloudLoadBalancersErrorFromHttpResponse;
 import org.jclouds.rest.ConfiguresRestClient;
 import org.jclouds.rest.config.RestClientModule;
 
@@ -47,7 +47,7 @@ import com.google.inject.assistedinject.FactoryModuleBuilder;
  */
 @ConfiguresRestClient
 public class CloudLoadBalancersRestClientModule extends
-         RestClientModule<CloudLoadBalancersClient, CloudLoadBalancersAsyncClient> {
+         RestClientModule<CloudLoadBalancersApi, CloudLoadBalancersAsyncApi> {
 
    public static final Map<Class<?>, Class<?>> DELEGATE_MAP = ImmutableMap.<Class<?>, Class<?>> builder()
             .put(LoadBalancerClient.class, LoadBalancerAsyncClient.class)

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancer.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.domain;
+package org.jclouds.rackspace.cloudloadbalancers.domain;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -24,9 +24,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Date;
 import java.util.Set;
 
-import org.jclouds.cloudloadbalancers.domain.internal.BaseLoadBalancer;
-import org.jclouds.cloudloadbalancers.features.LoadBalancerClient;
 import org.jclouds.javax.annotation.Nullable;
+import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClient;
 
 import com.google.common.base.Objects;
 import com.google.common.base.Objects.ToStringHelper;

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerAttributes.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.domain;
+package org.jclouds.rackspace.cloudloadbalancers.domain;
 
-import org.jclouds.cloudloadbalancers.domain.internal.BaseLoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer;
 
 /**
  * 

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/LoadBalancerRequest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.domain;
+package org.jclouds.rackspace.cloudloadbalancers.domain;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -24,7 +24,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.List;
 import java.util.Map;
 
-import org.jclouds.cloudloadbalancers.domain.internal.BaseLoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/Node.java

@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.domain;
+package org.jclouds.rackspace.cloudloadbalancers.domain;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.jclouds.cloudloadbalancers.domain.internal.BaseNode;
+import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode;
 
 /**
  * The nodes defined by the load balancer are responsible for servicing the requests received

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeAttributes.java

@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.domain;
+package org.jclouds.rackspace.cloudloadbalancers.domain;
 
-import org.jclouds.cloudloadbalancers.domain.internal.BaseNode;
+import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode;
-import org.jclouds.cloudloadbalancers.domain.internal.BaseNode.Condition;
+import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode.Condition;
 
 /**
  * 

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/NodeRequest.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.domain;
+package org.jclouds.rackspace.cloudloadbalancers.domain;
 
-import org.jclouds.cloudloadbalancers.domain.internal.BaseNode;
+import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseNode;
 
 /**
  * The nodes defined by the load balancer are responsible for servicing the requests received

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/VirtualIP.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.domain;
+package org.jclouds.rackspace.cloudloadbalancers.domain;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseLoadBalancer.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.domain.internal;
+package org.jclouds.rackspace.cloudloadbalancers.domain.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/domain/internal/BaseNode.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.domain.internal;
+package org.jclouds.rackspace.cloudloadbalancers.domain.internal;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerAsyncClient.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.features;
+package org.jclouds.rackspace.cloudloadbalancers.features;
 
 import java.util.Set;
 
@@ -29,12 +29,12 @@ import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.core.MediaType;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancerAttributes;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest;
-import org.jclouds.cloudloadbalancers.functions.UnwrapLoadBalancer;
-import org.jclouds.cloudloadbalancers.functions.UnwrapLoadBalancers;
 import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerAttributes;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest;
+import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancers;
 import org.jclouds.rest.annotations.ExceptionParser;
 import org.jclouds.rest.annotations.RequestFilters;
 import org.jclouds.rest.annotations.ResponseParser;

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerClient.java

@@ -16,16 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.features;
+package org.jclouds.rackspace.cloudloadbalancers.features;
 
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancerAttributes;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest;
 import org.jclouds.concurrent.Timeout;
-import org.jclouds.http.HttpResponseException;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerAttributes;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest;
 
 /**
  * Provides synchronous access to CloudLoadBalancers LoadBalancer features.

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeAsyncClient.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.features;
+package org.jclouds.rackspace.cloudloadbalancers.features;
 
 import java.util.Set;
 
@@ -30,10 +30,10 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 
-import org.jclouds.cloudloadbalancers.domain.Node;
-import org.jclouds.cloudloadbalancers.domain.NodeAttributes;
-import org.jclouds.cloudloadbalancers.domain.NodeRequest;
 import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.Node;
+import org.jclouds.rackspace.cloudloadbalancers.domain.NodeAttributes;
+import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest;
 import org.jclouds.rest.annotations.ExceptionParser;
 import org.jclouds.rest.annotations.RequestFilters;
 import org.jclouds.rest.annotations.SelectJson;

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeClient.java

@@ -16,17 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.features;
+package org.jclouds.rackspace.cloudloadbalancers.features;
 
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancerAttributes;
-import org.jclouds.cloudloadbalancers.domain.Node;
-import org.jclouds.cloudloadbalancers.domain.NodeAttributes;
-import org.jclouds.cloudloadbalancers.domain.NodeRequest;
 import org.jclouds.concurrent.Timeout;
-import org.jclouds.http.HttpResponseException;
+import org.jclouds.rackspace.cloudloadbalancers.domain.Node;
+import org.jclouds.rackspace.cloudloadbalancers.domain.NodeAttributes;
+import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest;
 
 /**
  * Provides synchronous access to CloudLoadBalancers Node features.

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/AppendAccountIdToURI.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.functions;
+package org.jclouds.rackspace.cloudloadbalancers.functions;
 
 import java.net.URI;
 
@@ -25,7 +25,7 @@ import javax.inject.Named;
 import javax.inject.Singleton;
 import javax.ws.rs.core.UriBuilder;
 
-import org.jclouds.cloudloadbalancers.reference.RackspaceConstants;
+import org.jclouds.rackspace.cloudloadbalancers.reference.RackspaceConstants;
 
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;
@@ -59,4 +59,4 @@ public final class AppendAccountIdToURI implements Function<Supplier<URI>, Suppl
 
       };
    }
-}
+}

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/ConvertLB.java

@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.functions;
+package org.jclouds.rackspace.cloudloadbalancers.functions;
 
 import javax.annotation.Resource;
 import javax.inject.Inject;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Builder;
 import org.jclouds.logging.Logger;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Builder;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/LB.java

@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.functions;
+package org.jclouds.rackspace.cloudloadbalancers.functions;
 
 import java.util.Date;
 import java.util.Map;
 import java.util.Set;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
+import org.jclouds.rackspace.cloudloadbalancers.domain.Node;
-import org.jclouds.cloudloadbalancers.domain.Node;
+import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP;
-import org.jclouds.cloudloadbalancers.domain.VirtualIP;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status;
-import org.jclouds.cloudloadbalancers.domain.internal.BaseLoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.internal.BaseLoadBalancer;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.Maps;

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancer.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.functions;
+package org.jclouds.rackspace.cloudloadbalancers.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
@@ -25,11 +25,11 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.functions.ConvertLB.Factory;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB.Factory;
 import org.jclouds.rest.InvocationContext;
 
 import com.google.common.base.Function;
@@ -71,4 +71,4 @@ public class UnwrapLoadBalancer implements Function<HttpResponse, LoadBalancer>,
       return this;
    }
 
-}
+}

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancers.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.functions;
+package org.jclouds.rackspace.cloudloadbalancers.functions;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -25,11 +25,11 @@ import java.util.Set;
 
 import javax.inject.Inject;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.functions.ConvertLB.Factory;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.http.functions.ParseJson;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB.Factory;
 import org.jclouds.rest.InvocationContext;
 
 import com.google.common.base.Function;
@@ -72,4 +72,4 @@ public class UnwrapLoadBalancers implements Function<HttpResponse, Set<LoadBalan
       return this;
    }
 
-}
+}

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponse.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.handlers;
+package org.jclouds.rackspace.cloudloadbalancers.handlers;
 
 import static org.jclouds.http.HttpUtils.releasePayload;
 

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersBindLoadBalancerStrategiesByClass.java

@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.loadbalancer.config;
+package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config;
 
-import org.jclouds.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersDestroyLoadBalancerStrategy;
-import org.jclouds.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersGetLoadBalancerMetadataStrategy;
-import org.jclouds.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersListLoadBalancersStrategy;
-import org.jclouds.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersLoadBalanceNodesStrategy;
 import org.jclouds.loadbalancer.config.BindLoadBalancerStrategiesByClass;
 import org.jclouds.loadbalancer.strategy.DestroyLoadBalancerStrategy;
 import org.jclouds.loadbalancer.strategy.GetLoadBalancerMetadataStrategy;
 import org.jclouds.loadbalancer.strategy.ListLoadBalancersStrategy;
 import org.jclouds.loadbalancer.strategy.LoadBalanceNodesStrategy;
+import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersDestroyLoadBalancerStrategy;
+import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersGetLoadBalancerMetadataStrategy;
+import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersListLoadBalancersStrategy;
+import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy.CloudLoadBalancersLoadBalanceNodesStrategy;
 
 /**
  * @author Adrian Cole
@@ -52,4 +52,4 @@ public class CloudLoadBalancersBindLoadBalancerStrategiesByClass extends BindLoa
    protected Class<? extends ListLoadBalancersStrategy> defineListLoadBalancersStrategy() {
       return CloudLoadBalancersListLoadBalancersStrategy.class;
    }
-}
+}

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerContextModule.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.loadbalancer.config;
+package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config;
 
 import org.jclouds.loadbalancer.config.BaseLoadBalancerServiceContextModule;
 

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/config/CloudLoadBalancersLoadBalancerServiceDependenciesModule.java

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.loadbalancer.config;
+package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.loadbalancer.functions.LoadBalancerToLoadBalancerMetadata;
 import org.jclouds.loadbalancer.domain.LoadBalancerMetadata;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.functions.LoadBalancerToLoadBalancerMetadata;
 
 import com.google.common.base.Function;
 import com.google.inject.AbstractModule;

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/functions/LoadBalancerToLoadBalancerMetadata.java

@@ -16,21 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.loadbalancer.functions;
+package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.functions;
 
 import java.util.Set;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.VirtualIP;
 import org.jclouds.collect.Memoized;
 import org.jclouds.domain.Location;
 import org.jclouds.loadbalancer.domain.LoadBalancerMetadata;
 import org.jclouds.loadbalancer.domain.LoadBalancerType;
 import org.jclouds.loadbalancer.domain.internal.LoadBalancerMetadataImpl;
 import org.jclouds.location.predicates.LocationPredicates;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP;
 
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersDestroyLoadBalancerStrategy.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.loadbalancer.strategy;
+package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -25,12 +25,12 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient;
 import org.jclouds.loadbalancer.domain.LoadBalancerMetadata;
 import org.jclouds.loadbalancer.reference.LoadBalancerConstants;
 import org.jclouds.loadbalancer.strategy.DestroyLoadBalancerStrategy;
 import org.jclouds.loadbalancer.strategy.GetLoadBalancerMetadataStrategy;
 import org.jclouds.logging.Logger;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi;
 
 /**
  * 
@@ -42,11 +42,11 @@ public class CloudLoadBalancersDestroyLoadBalancerStrategy implements DestroyLoa
    @Named(LoadBalancerConstants.LOADBALANCER_LOGGER)
    protected Logger logger = Logger.NULL;
 
-   private final CloudLoadBalancersClient client;
+   private final CloudLoadBalancersApi client;
    private final GetLoadBalancerMetadataStrategy getLoadBalancer;
 
    @Inject
-   protected CloudLoadBalancersDestroyLoadBalancerStrategy(CloudLoadBalancersClient client,
+   protected CloudLoadBalancersDestroyLoadBalancerStrategy(CloudLoadBalancersApi client,
             GetLoadBalancerMetadataStrategy getLoadBalancer) {
       this.client = checkNotNull(client, "client");
       this.getLoadBalancer = checkNotNull(getLoadBalancer, "getLoadBalancer");

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersGetLoadBalancerMetadataStrategy.java

@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.loadbalancer.strategy;
+package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
 import org.jclouds.loadbalancer.domain.LoadBalancerMetadata;
 import org.jclouds.loadbalancer.strategy.GetLoadBalancerMetadataStrategy;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
 
 import com.google.common.base.Function;
 
@@ -37,11 +37,11 @@ import com.google.common.base.Function;
 @Singleton
 public class CloudLoadBalancersGetLoadBalancerMetadataStrategy implements GetLoadBalancerMetadataStrategy {
 
-   private final org.jclouds.cloudloadbalancers.CloudLoadBalancersClient client;
+   private final org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi client;
    private final Function<LoadBalancer, LoadBalancerMetadata> converter;
 
    @Inject
-   protected CloudLoadBalancersGetLoadBalancerMetadataStrategy(CloudLoadBalancersClient client,
+   protected CloudLoadBalancersGetLoadBalancerMetadataStrategy(CloudLoadBalancersApi client,
             Function<LoadBalancer, LoadBalancerMetadata> converter) {
       this.client = checkNotNull(client, "client");
       this.converter = checkNotNull(converter, "converter");
@@ -55,4 +55,4 @@ public class CloudLoadBalancersGetLoadBalancerMetadataStrategy implements GetLoa
       return converter.apply(client.getLoadBalancerClient(region).getLoadBalancer(lbId));
    }
 
-}
+}

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersListLoadBalancersStrategy.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.loadbalancer.strategy;
+package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.collect.Iterables.concat;
@@ -33,13 +33,13 @@ import javax.inject.Named;
 import javax.inject.Singleton;
 
 import org.jclouds.Constants;
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersAsyncClient;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
 import org.jclouds.loadbalancer.domain.LoadBalancerMetadata;
 import org.jclouds.loadbalancer.reference.LoadBalancerConstants;
 import org.jclouds.loadbalancer.strategy.ListLoadBalancersStrategy;
 import org.jclouds.location.Zone;
 import org.jclouds.logging.Logger;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersAsyncApi;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
 
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;
@@ -55,13 +55,13 @@ public class CloudLoadBalancersListLoadBalancersStrategy implements ListLoadBala
    @Named(LoadBalancerConstants.LOADBALANCER_LOGGER)
    protected Logger logger = Logger.NULL;
 
-   private final CloudLoadBalancersAsyncClient aclient;
+   private final CloudLoadBalancersAsyncApi aclient;
    private final Function<LoadBalancer, LoadBalancerMetadata> converter;
    private final ExecutorService executor;
    private final Supplier<Set<String>> zones;
 
    @Inject
-   protected CloudLoadBalancersListLoadBalancersStrategy(CloudLoadBalancersAsyncClient aclient,
+   protected CloudLoadBalancersListLoadBalancersStrategy(CloudLoadBalancersAsyncApi aclient,
             Function<LoadBalancer, LoadBalancerMetadata> converter,
             @Named(Constants.PROPERTY_USER_THREADS) ExecutorService executor, @Zone Supplier<Set<String>> zones) {
       this.aclient = checkNotNull(aclient, "aclient");

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/loadbalancer/strategy/CloudLoadBalancersLoadBalanceNodesStrategy.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.loadbalancer.strategy;
+package org.jclouds.rackspace.cloudloadbalancers.loadbalancer.strategy;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -25,11 +25,6 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest;
-import org.jclouds.cloudloadbalancers.domain.NodeRequest;
-import org.jclouds.cloudloadbalancers.domain.VirtualIP.Type;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.domain.Location;
 import org.jclouds.loadbalancer.domain.LoadBalancerMetadata;
@@ -37,6 +32,11 @@ import org.jclouds.loadbalancer.reference.LoadBalancerConstants;
 import org.jclouds.loadbalancer.strategy.GetLoadBalancerMetadataStrategy;
 import org.jclouds.loadbalancer.strategy.LoadBalanceNodesStrategy;
 import org.jclouds.logging.Logger;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.Type;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
@@ -50,11 +50,11 @@ public class CloudLoadBalancersLoadBalanceNodesStrategy implements LoadBalanceNo
    @Resource
    @Named(LoadBalancerConstants.LOADBALANCER_LOGGER)
    protected Logger logger = Logger.NULL;
-   protected final CloudLoadBalancersClient client;
+   protected final CloudLoadBalancersApi client;
    protected final GetLoadBalancerMetadataStrategy getLB;
 
    @Inject
-   protected CloudLoadBalancersLoadBalanceNodesStrategy(CloudLoadBalancersClient client,
+   protected CloudLoadBalancersLoadBalanceNodesStrategy(CloudLoadBalancersApi client,
             GetLoadBalancerMetadataStrategy getLB) {
       this.client = checkNotNull(client, "client");
       this.getLB = checkNotNull(getLB, "getLB");

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/location/RegionUrisFromPropertiesAndAccountIDPathSuffix.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.location;
+package org.jclouds.rackspace.cloudloadbalancers.location;
 
 import java.net.URI;
 import java.util.Map;
@@ -25,11 +25,11 @@ import java.util.Set;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.cloudloadbalancers.functions.AppendAccountIdToURI;
 import org.jclouds.config.ValueOfConfigurationKeyOrNull;
 import org.jclouds.location.Provider;
 import org.jclouds.location.Region;
 import org.jclouds.location.suppliers.fromconfig.RegionIdToURIFromConfigurationOrDefaultToProvider;
+import org.jclouds.rackspace.cloudloadbalancers.functions.AppendAccountIdToURI;
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.Maps;
@@ -50,4 +50,4 @@ public class RegionUrisFromPropertiesAndAccountIDPathSuffix extends RegionIdToUR
    public Map<String, Supplier<URI>> get() {
       return Maps.transformValues(super.get(), filter);
    }
-}
+}

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptions.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.options;
+package org.jclouds.rackspace.cloudloadbalancers.options;
 
 import static com.google.common.base.Preconditions.checkArgument;
 

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/predicates/LoadBalancerActive.java

@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.predicates;
+package org.jclouds.rackspace.cloudloadbalancers.predicates;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
 import org.jclouds.logging.Logger;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status;
 
 import com.google.common.base.Predicate;
 import com.google.inject.Inject;
@@ -40,13 +40,13 @@ import com.google.inject.Inject;
 @Singleton
 public class LoadBalancerActive implements Predicate<LoadBalancer> {
 
-   private final CloudLoadBalancersClient client;
+   private final CloudLoadBalancersApi client;
 
    @Resource
    protected Logger logger = Logger.NULL;
 
    @Inject
-   public LoadBalancerActive(CloudLoadBalancersClient client) {
+   public LoadBalancerActive(CloudLoadBalancersApi client) {
       this.client = client;
    }
 

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/predicates/LoadBalancerDeleted.java

@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.predicates;
+package org.jclouds.rackspace.cloudloadbalancers.predicates;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import javax.annotation.Resource;
 import javax.inject.Singleton;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
 import org.jclouds.logging.Logger;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status;
 
 import com.google.common.base.Predicate;
 import com.google.inject.Inject;
@@ -40,13 +40,13 @@ import com.google.inject.Inject;
 @Singleton
 public class LoadBalancerDeleted implements Predicate<LoadBalancer> {
 
-   private final CloudLoadBalancersClient client;
+   private final CloudLoadBalancersApi client;
 
    @Resource
    protected Logger logger = Logger.NULL;
 
    @Inject
-   public LoadBalancerDeleted(CloudLoadBalancersClient client) {
+   public LoadBalancerDeleted(CloudLoadBalancersApi client) {
       this.client = client;
    }
 

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/reference/RackspaceConstants.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.reference;
+package org.jclouds.rackspace.cloudloadbalancers.reference;
 
 /**
  * Configuration properties and constants used in rackspace connections.

apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/reference/Region.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.reference;
+package org.jclouds.rackspace.cloudloadbalancers.reference;
 
 
 

apis/rackspace-cloudloadbalancers/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata

@@ -0,0 +1 @@
+org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersApiMetadataTest.java

@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers;
 
 import org.jclouds.loadbalancer.internal.BaseLoadBalancerServiceApiMetadataTest;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata;
 import org.testng.annotations.Test;
 
 /**

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerClientLiveTest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.features;
+package org.jclouds.rackspace.cloudloadbalancers.features;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -25,12 +25,12 @@ import static org.testng.Assert.assertTrue;
 import java.util.Set;
 import java.util.logging.Logger;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancerAttributes;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerAttributes;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest;
-import org.jclouds.cloudloadbalancers.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest;
-import org.jclouds.cloudloadbalancers.domain.VirtualIP.Type;
+import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.Type;
-import org.jclouds.cloudloadbalancers.internal.BaseCloudLoadBalancersClientLiveTest;
+import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersClientLiveTest;
 import org.testng.annotations.AfterGroups;
 import org.testng.annotations.Test;
 

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/LoadBalancerExpectTest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.features;
+package org.jclouds.rackspace.cloudloadbalancers.features;
 
 import static org.testng.Assert.assertEquals;
 
@@ -25,16 +25,17 @@ import java.util.Set;
 
 import javax.ws.rs.core.MediaType;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancerAttributes;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest;
-import org.jclouds.cloudloadbalancers.domain.NodeRequest;
-import org.jclouds.cloudloadbalancers.domain.VirtualIP;
-import org.jclouds.cloudloadbalancers.functions.UnwrapLoadBalancerTest;
-import org.jclouds.cloudloadbalancers.functions.UnwrapLoadBalancersTest;
-import org.jclouds.cloudloadbalancers.internal.BaseCloudLoadBalancerExpectTest;
 import org.jclouds.http.HttpResponse;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerAttributes;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP;
+import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClient;
+import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancerTest;
+import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancersTest;
+import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerExpectTest;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.Sets;
@@ -43,7 +44,7 @@ import com.google.common.collect.Sets;
  * @author Everett Toews
  */
 @Test(groups = "unit")
-public class LoadBalancerExpectTest extends BaseCloudLoadBalancerExpectTest<CloudLoadBalancersClient> {
+public class LoadBalancerExpectTest extends BaseCloudLoadBalancerExpectTest<CloudLoadBalancersApi> {
 
    public void testListLoadBalancers() {
       URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers");

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeClientLiveTest.java

@@ -16,28 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.features;
+package org.jclouds.rackspace.cloudloadbalancers.features;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
 import java.util.logging.Logger;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
+import com.google.common.collect.ImmutableSet;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancerRequest;
+import com.google.common.collect.Maps;
-import org.jclouds.cloudloadbalancers.domain.Node;
+
-import org.jclouds.cloudloadbalancers.domain.NodeAttributes;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancerRequest;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
+import org.jclouds.rackspace.cloudloadbalancers.domain.Node;
-import org.jclouds.cloudloadbalancers.domain.VirtualIP.Type;
+import org.jclouds.rackspace.cloudloadbalancers.domain.NodeAttributes;
-import org.jclouds.cloudloadbalancers.internal.BaseCloudLoadBalancersClientLiveTest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status;
+import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.Type;
+import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClient;
+import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancersClientLiveTest;
 import org.testng.annotations.AfterGroups;
 import org.testng.annotations.Test;
 
@@ -48,7 +50,7 @@ import org.testng.annotations.Test;
  */
 @Test(groups = "live", singleThreaded = true, testName = "NodeClientLiveTest")
 public class NodeClientLiveTest extends BaseCloudLoadBalancersClientLiveTest {
-   private Map<LoadBalancer, Set<Node>> nodes = new HashMap<LoadBalancer, Set<Node>>();
+   private Map<LoadBalancer, Set<Node>> nodes = Maps.newHashMap();
 
    public void testCreateLoadBalancers() {
       assertTrue(client.getConfiguredZones().size() > 0, "Need to have some zones!");
@@ -70,7 +72,7 @@ public class NodeClientLiveTest extends BaseCloudLoadBalancersClientLiveTest {
          String region = lb.getRegion();
          Logger.getAnonymousLogger().info("starting node on loadbalancer " + lb.getId() + " in region " + region);
          Set<Node> newNodes = client.getNodeClient(region).createNodesInLoadBalancer(
-                  Collections.<NodeRequest> singleton(NodeRequest.builder().address("192.168.1.2").port(8080).build()),
+                  ImmutableSet.<NodeRequest> of(NodeRequest.builder().address("192.168.1.2").port(8080).build()),
                   lb.getId());
 
          for (Node n : newNodes) {

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/features/NodeExpectTest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.features;
+package org.jclouds.rackspace.cloudloadbalancers.features;
 
 import static org.testng.Assert.assertEquals;
 
@@ -25,12 +25,13 @@ import java.util.Set;
 
 import javax.ws.rs.core.MediaType;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient;
-import org.jclouds.cloudloadbalancers.domain.Node;
-import org.jclouds.cloudloadbalancers.domain.NodeAttributes;
-import org.jclouds.cloudloadbalancers.domain.NodeRequest;
-import org.jclouds.cloudloadbalancers.internal.BaseCloudLoadBalancerExpectTest;
 import org.jclouds.http.HttpResponse;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi;
+import org.jclouds.rackspace.cloudloadbalancers.domain.Node;
+import org.jclouds.rackspace.cloudloadbalancers.domain.NodeAttributes;
+import org.jclouds.rackspace.cloudloadbalancers.domain.NodeRequest;
+import org.jclouds.rackspace.cloudloadbalancers.features.NodeClient;
+import org.jclouds.rackspace.cloudloadbalancers.internal.BaseCloudLoadBalancerExpectTest;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableSet;
@@ -40,7 +41,7 @@ import com.google.common.collect.ImmutableSortedSet;
  * @author Everett Toews
  */
 @Test(groups = "unit")
-public class NodeExpectTest extends BaseCloudLoadBalancerExpectTest<CloudLoadBalancersClient> {
+public class NodeExpectTest extends BaseCloudLoadBalancerExpectTest<CloudLoadBalancersApi> {
 
    public void testListNodes() {
       URI endpoint = URI.create("https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/123123/loadbalancers/2000/nodes");

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancerTest.java

@@ -16,16 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.functions;
+package org.jclouds.rackspace.cloudloadbalancers.functions;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.Node;
-import org.jclouds.cloudloadbalancers.domain.VirtualIP;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
-import org.jclouds.cloudloadbalancers.domain.VirtualIP.IPVersion;
 import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.json.BaseItemParserTest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.Node;
+import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status;
+import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP.IPVersion;
+import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB;
+import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancer;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Function;

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancerWhenDeletedTest.java

@@ -16,13 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.functions;
+package org.jclouds.rackspace.cloudloadbalancers.functions;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
 import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.json.BaseItemParserTest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status;
+import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB;
+import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancer;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Function;

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/functions/UnwrapLoadBalancersTest.java

@@ -16,16 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.functions;
+package org.jclouds.rackspace.cloudloadbalancers.functions;
 
 import java.util.Set;
 
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.domain.VirtualIP;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer.Status;
 import org.jclouds.date.internal.SimpleDateFormatDateService;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.json.BaseSetParserTest;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.domain.VirtualIP;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer.Status;
+import org.jclouds.rackspace.cloudloadbalancers.functions.ConvertLB;
+import org.jclouds.rackspace.cloudloadbalancers.functions.UnwrapLoadBalancers;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Function;

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/handlers/ParseCloudLoadBalancersErrorFromHttpResponseTest.java

@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.handlers;
+package org.jclouds.rackspace.cloudloadbalancers.handlers;
 
 import java.net.URI;
 
 import org.jclouds.http.handlers.BaseHttpErrorHandlerTest;
+import org.jclouds.rackspace.cloudloadbalancers.handlers.ParseCloudLoadBalancersErrorFromHttpResponse;
 import org.jclouds.rest.ResourceNotFoundException;
 import org.testng.annotations.Test;
 

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancerExpectTest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.internal;
+package org.jclouds.rackspace.cloudloadbalancers.internal;
 
 import javax.ws.rs.core.MediaType;
 

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/internal/BaseCloudLoadBalancersClientLiveTest.java

@@ -16,22 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.internal;
+package org.jclouds.rackspace.cloudloadbalancers.internal;
 
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
 import org.jclouds.apis.BaseContextLiveTest;
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata;
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersAsyncClient;
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersClient;
-import org.jclouds.cloudloadbalancers.domain.LoadBalancer;
-import org.jclouds.cloudloadbalancers.predicates.LoadBalancerActive;
-import org.jclouds.cloudloadbalancers.predicates.LoadBalancerDeleted;
 import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
 import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties;
 import org.jclouds.predicates.RetryablePredicate;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersAsyncApi;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApi;
+import org.jclouds.rackspace.cloudloadbalancers.domain.LoadBalancer;
+import org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerActive;
+import org.jclouds.rackspace.cloudloadbalancers.predicates.LoadBalancerDeleted;
 import org.jclouds.rest.RestContext;
 import org.testng.annotations.BeforeGroups;
 
@@ -45,13 +45,13 @@ import com.google.inject.Injector;
  * 
  * @author Adrian Cole
  */
-public class BaseCloudLoadBalancersClientLiveTest extends BaseContextLiveTest<RestContext<CloudLoadBalancersClient, CloudLoadBalancersAsyncClient>> {
+public class BaseCloudLoadBalancersClientLiveTest extends BaseContextLiveTest<RestContext<CloudLoadBalancersApi, CloudLoadBalancersAsyncApi>> {
 
    public BaseCloudLoadBalancersClientLiveTest() {
       provider = "cloudloadbalancers";
    }
 
-   protected CloudLoadBalancersClient client;
+   protected CloudLoadBalancersApi client;
    protected Predicate<HostAndPort> socketTester;
    protected RetryablePredicate<LoadBalancer> loadBalancerActive;
    protected RetryablePredicate<LoadBalancer> loadBalancerDeleted;
@@ -85,7 +85,7 @@ public class BaseCloudLoadBalancersClientLiveTest extends BaseContextLiveTest<Re
    }
    
    @Override
-   protected TypeToken<RestContext<CloudLoadBalancersClient, CloudLoadBalancersAsyncClient>> contextType() {
+   protected TypeToken<RestContext<CloudLoadBalancersApi, CloudLoadBalancersAsyncApi>> contextType() {
       return CloudLoadBalancersApiMetadata.CONTEXT_TOKEN;
    }
 }

apis/rackspace-cloudloadbalancers/src/test/java/org/jclouds/rackspace/cloudloadbalancers/options/ListOptionsTest.java

@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.cloudloadbalancers.options;
+package org.jclouds.rackspace.cloudloadbalancers.options;
 
-import static org.jclouds.cloudloadbalancers.options.ListOptions.Builder.limit;
+import static org.jclouds.rackspace.cloudloadbalancers.options.ListOptions.Builder.limit;
-import static org.jclouds.cloudloadbalancers.options.ListOptions.Builder.marker;
+import static org.jclouds.rackspace.cloudloadbalancers.options.ListOptions.Builder.marker;
 import static org.testng.Assert.assertEquals;
 
+import org.jclouds.rackspace.cloudloadbalancers.options.ListOptions;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableList;

providers/cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata

@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersUKProviderMetadata

providers/cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata

@@ -1 +0,0 @@
-org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersUSProviderMetadata

providers/pom.xml

@@ -39,17 +39,13 @@
         <module>azureblob</module>
         <module>aws-s3</module>
         <module>aws-ec2</module>
+        <module>aws-sqs</module>
+        <module>aws-cloudwatch</module>
         <module>synaptic-storage</module>
         <module>ninefold-storage</module>
         <module>cloudonestorage</module>
         <module>eucalyptus-partnercloud-s3</module>
         <module>eucalyptus-partnercloud-ec2</module>
-        <module>cloudservers-us</module>
-        <module>cloudservers-uk</module>
-        <module>cloudfiles-us</module>
-        <module>cloudfiles-uk</module>
-        <module>cloudloadbalancers-us</module>
-        <module>cloudloadbalancers-uk</module>
         <module>bluelock-vcloud-zone01</module>
         <module>stratogen-vcloud-mycloud</module>
         <module>trmk-ecloud</module>
@@ -64,18 +60,22 @@
         <module>serverlove-z1-man</module>
         <module>skalicloud-sdg-my</module>
         <module>greenhousedata-element-vcloud</module>
-        <module>aws-cloudwatch</module>
         <module>go2cloud-jhb1</module>
         <module>softlayer</module>
         <module>ninefold-compute</module>
         <module>hpcloud-compute</module>
         <module>hpcloud-objectstorage</module>
         <module>trystack-nova</module>
+        <module>cloudservers-us</module>
+        <module>cloudservers-uk</module>
+        <module>cloudfiles-us</module>
+        <module>cloudfiles-uk</module>
+        <module>rackspace-cloudloadbalancers-us</module>
+        <module>rackspace-cloudloadbalancers-uk</module>
         <module>rackspace-cloudservers-us</module>
         <module>rackspace-cloudservers-uk</module>
         <module>rackspace-cloudblockstorage-us</module>
         <module>rackspace-cloudblockstorage-uk</module>
-        <module>aws-sqs</module>
         <module>glesys</module>
     </modules>
 </project>

providers/rackspace-cloudloadbalancers-uk/pom.xml

@@ -28,19 +28,19 @@
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
     <groupId>org.jclouds.provider</groupId>
-    <artifactId>cloudloadbalancers-uk</artifactId>
+    <artifactId>rackspace-cloudloadbalancers-uk</artifactId>
-    <name>jclouds CloudLoadBalancers UK provider </name>
+    <name>jclouds Rackspace Cloud Load Balancers UK provider</name>
-    <description>LoadBalancer implementation targeted to Rackspace UK</description>
+    <description>Cloud Load Balancers implementation targeted to Rackspace UK</description>
     <packaging>bundle</packaging>
     
     <properties>
-        <test.cloudloadbalancers-uk.endpoint>https://lon.identity.api.rackspacecloud.com/v2.0/</test.cloudloadbalancers-uk.endpoint>
+        <test.rackspace-cloudloadbalancers-uk.endpoint>https://lon.identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudloadbalancers-uk.endpoint>
-        <test.cloudloadbalancers-uk.api-version>1</test.cloudloadbalancers-uk.api-version>
+        <test.rackspace-cloudloadbalancers-uk.api-version>1</test.rackspace-cloudloadbalancers-uk.api-version>
-        <test.cloudloadbalancers-uk.build-version></test.cloudloadbalancers-uk.build-version>
+        <test.rackspace-cloudloadbalancers-uk.build-version></test.rackspace-cloudloadbalancers-uk.build-version>
-        <test.cloudloadbalancers-uk.identity>${test.rackspace-uk.identity}</test.cloudloadbalancers-uk.identity>
+        <test.rackspace-cloudloadbalancers-uk.identity>${test.rackspace-uk.identity}</test.rackspace-cloudloadbalancers-uk.identity>
-        <test.cloudloadbalancers-uk.credential>${test.rackspace-uk.credential}</test.cloudloadbalancers-uk.credential>
+        <test.rackspace-cloudloadbalancers-uk.credential>${test.rackspace-uk.credential}</test.rackspace-cloudloadbalancers-uk.credential>
 
-        <jclouds.osgi.export>org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}"</jclouds.osgi.export>
+        <jclouds.osgi.export>org.jclouds.rackspace.cloudloadbalancers.uk*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
     </properties>
     
@@ -52,7 +52,7 @@
         </dependency>
     	<dependency>
             <groupId>org.jclouds.api</groupId>
-            <artifactId>cloudloadbalancers</artifactId>
+            <artifactId>rackspace-cloudloadbalancers</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -81,7 +81,7 @@
         </dependency>
         <dependency>
             <groupId>org.jclouds.api</groupId>
-            <artifactId>cloudloadbalancers</artifactId>
+            <artifactId>rackspace-cloudloadbalancers</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
@@ -123,11 +123,11 @@
                                 </goals>
                                 <configuration>
                                     <systemPropertyVariables>
-                                        <test.cloudloadbalancers-uk.endpoint>${test.cloudloadbalancers-uk.endpoint}</test.cloudloadbalancers-uk.endpoint>
+                                        <test.rackspace-cloudloadbalancers-uk.endpoint>${test.rackspace-cloudloadbalancers-uk.endpoint}</test.rackspace-cloudloadbalancers-uk.endpoint>
-                                        <test.cloudloadbalancers-uk.api-version>${test.cloudloadbalancers-uk.api-version}</test.cloudloadbalancers-uk.api-version>
+                                        <test.rackspace-cloudloadbalancers-uk.api-version>${test.rackspace-cloudloadbalancers-uk.api-version}</test.rackspace-cloudloadbalancers-uk.api-version>
-                                        <test.cloudloadbalancers-uk.build-version>${test.cloudloadbalancers-uk.build-version}</test.cloudloadbalancers-uk.build-version>
+                                        <test.rackspace-cloudloadbalancers-uk.build-version>${test.rackspace-cloudloadbalancers-uk.build-version}</test.rackspace-cloudloadbalancers-uk.build-version>
-                                        <test.cloudloadbalancers-uk.identity>${test.cloudloadbalancers-uk.identity}</test.cloudloadbalancers-uk.identity>
+                                        <test.rackspace-cloudloadbalancers-uk.identity>${test.rackspace-cloudloadbalancers-uk.identity}</test.rackspace-cloudloadbalancers-uk.identity>
-                                        <test.cloudloadbalancers-uk.credential>${test.cloudloadbalancers-uk.credential}</test.cloudloadbalancers-uk.credential>
+                                        <test.rackspace-cloudloadbalancers-uk.credential>${test.rackspace-cloudloadbalancers-uk.credential}</test.rackspace-cloudloadbalancers-uk.credential>
                                         <test.jclouds.keystone.credential-type>${test.jclouds.keystone.credential-type}</test.jclouds.keystone.credential-type>
                                     </systemPropertyVariables>
                                 </configuration>

providers/rackspace-cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderMetadata.java

@@ -16,23 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.rackspace.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers.uk;
 
-import static org.jclouds.cloudloadbalancers.reference.Region.LON;
 import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
 import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE;
 import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES;
+import static org.jclouds.rackspace.cloudloadbalancers.reference.Region.LON;
 
 import java.net.URI;
 import java.util.Properties;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata;
-import org.jclouds.cloudloadbalancers.config.CloudLoadBalancersRestClientModule;
-import org.jclouds.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule;
 import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
 import org.jclouds.providers.ProviderMetadata;
 import org.jclouds.providers.internal.BaseProviderMetadata;
 import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata;
+import org.jclouds.rackspace.cloudloadbalancers.config.CloudLoadBalancersRestClientModule;
+import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Module;

providers/rackspace-cloudloadbalancers-uk/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata

@@ -0,0 +1 @@
+org.jclouds.rackspace.cloudloadbalancers.uk.CloudLoadBalancersUKProviderMetadata

providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKLoadBalancerClientLiveTest.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.rackspace.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers.uk;
 
-import org.jclouds.cloudloadbalancers.features.LoadBalancerClientLiveTest;
+import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClientLiveTest;
 import org.testng.annotations.Test;
 
 /**

providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKNodeClientLiveTest.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.rackspace.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers.uk;
 
-import org.jclouds.cloudloadbalancers.features.NodeClientLiveTest;
+import org.jclouds.rackspace.cloudloadbalancers.features.NodeClientLiveTest;
 import org.testng.annotations.Test;
 
 /**

providers/rackspace-cloudloadbalancers-uk/src/test/java/org/jclouds/rackspace/cloudloadbalancers/uk/CloudLoadBalancersUKProviderTest.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.rackspace.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers.uk;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata;
 import org.jclouds.providers.internal.BaseProviderMetadataTest;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata;
+import org.jclouds.rackspace.cloudloadbalancers.uk.CloudLoadBalancersUKProviderMetadata;
 import org.testng.annotations.Test;
 
 /**
@@ -32,4 +33,4 @@ public class CloudLoadBalancersUKProviderTest extends BaseProviderMetadataTest {
    public CloudLoadBalancersUKProviderTest() {
       super(new CloudLoadBalancersUKProviderMetadata(), new CloudLoadBalancersApiMetadata());
    }
-}
+}

providers/rackspace-cloudloadbalancers-us/pom.xml

@@ -28,19 +28,19 @@
         <relativePath>../../project/pom.xml</relativePath>
     </parent>
     <groupId>org.jclouds.provider</groupId>
-    <artifactId>cloudloadbalancers-us</artifactId>
+    <artifactId>rackspace-cloudloadbalancers-us</artifactId>
-    <name>jclouds CloudLoadBalancers US provider </name>
+    <name>jclouds Rackspace Cloud Load Balancers US provider</name>
-    <description>LoadBalancer implementation targeted to Rackspace US</description>
+    <description>Cloud Load Balancers implementation targeted to Rackspace US</description>
     <packaging>bundle</packaging>
     
     <properties>
-        <test.cloudloadbalancers-us.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.cloudloadbalancers-us.endpoint>
+        <test.rackspace-cloudloadbalancers-us.endpoint>https://identity.api.rackspacecloud.com/v2.0/</test.rackspace-cloudloadbalancers-us.endpoint>
-        <test.cloudloadbalancers-us.api-version>1</test.cloudloadbalancers-us.api-version>
+        <test.rackspace-cloudloadbalancers-us.api-version>1</test.rackspace-cloudloadbalancers-us.api-version>
-        <test.cloudloadbalancers-us.build-version></test.cloudloadbalancers-us.build-version>
+        <test.rackspace-cloudloadbalancers-us.build-version></test.rackspace-cloudloadbalancers-us.build-version>
-        <test.cloudloadbalancers-us.identity>${test.rackspace-us.identity}</test.cloudloadbalancers-us.identity>
+        <test.rackspace-cloudloadbalancers-us.identity>${test.rackspace-us.identity}</test.rackspace-cloudloadbalancers-us.identity>
-        <test.cloudloadbalancers-us.credential>${test.rackspace-us.credential}</test.cloudloadbalancers-us.credential>
+        <test.rackspace-cloudloadbalancers-us.credential>${test.rackspace-us.credential}</test.rackspace-cloudloadbalancers-us.credential>
 
-        <jclouds.osgi.export>org.jclouds.rackspace.cloudloadbalancers*;version="${project.version}"</jclouds.osgi.export>
+        <jclouds.osgi.export>org.jclouds.rackspace.cloudloadbalancers.us*;version="${project.version}"</jclouds.osgi.export>
         <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
     </properties>
     
@@ -52,7 +52,7 @@
         </dependency>
     	<dependency>
             <groupId>org.jclouds.api</groupId>
-            <artifactId>cloudloadbalancers</artifactId>
+            <artifactId>rackspace-cloudloadbalancers</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -81,7 +81,7 @@
         </dependency>
         <dependency>
             <groupId>org.jclouds.api</groupId>
-            <artifactId>cloudloadbalancers</artifactId>
+            <artifactId>rackspace-cloudloadbalancers</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
@@ -123,11 +123,11 @@
                                 </goals>
                                 <configuration>
                                     <systemPropertyVariables>
-                                        <test.cloudloadbalancers-us.endpoint>${test.cloudloadbalancers-us.endpoint}</test.cloudloadbalancers-us.endpoint>
+                                        <test.rackspace-cloudloadbalancers-us.endpoint>${test.rackspace-cloudloadbalancers-us.endpoint}</test.rackspace-cloudloadbalancers-us.endpoint>
-                                        <test.cloudloadbalancers-us.api-version>${test.cloudloadbalancers-us.api-version}</test.cloudloadbalancers-us.api-version>
+                                        <test.rackspace-cloudloadbalancers-us.api-version>${test.rackspace-cloudloadbalancers-us.api-version}</test.rackspace-cloudloadbalancers-us.api-version>
-                                        <test.cloudloadbalancers-us.build-version>${test.cloudloadbalancers-us.build-version}</test.cloudloadbalancers-us.build-version>
+                                        <test.rackspace-cloudloadbalancers-us.build-version>${test.rackspace-cloudloadbalancers-us.build-version}</test.rackspace-cloudloadbalancers-us.build-version>
-                                        <test.cloudloadbalancers-us.identity>${test.cloudloadbalancers-us.identity}</test.cloudloadbalancers-us.identity>
+                                        <test.rackspace-cloudloadbalancers-us.identity>${test.rackspace-cloudloadbalancers-us.identity}</test.rackspace-cloudloadbalancers-us.identity>
-                                        <test.cloudloadbalancers-us.credential>${test.cloudloadbalancers-us.credential}</test.cloudloadbalancers-us.credential>
+                                        <test.rackspace-cloudloadbalancers-us.credential>${test.rackspace-cloudloadbalancers-us.credential}</test.rackspace-cloudloadbalancers-us.credential>
                                         <test.jclouds.keystone.credential-type>${test.jclouds.keystone.credential-type}</test.jclouds.keystone.credential-type>
                                     </systemPropertyVariables>
                                 </configuration>

providers/rackspace-cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderMetadata.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.rackspace.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers.us;
 
 import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
 import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE;
@@ -25,13 +25,13 @@ import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES;
 import java.net.URI;
 import java.util.Properties;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata;
-import org.jclouds.cloudloadbalancers.config.CloudLoadBalancersRestClientModule;
-import org.jclouds.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule;
 import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
 import org.jclouds.providers.ProviderMetadata;
 import org.jclouds.providers.internal.BaseProviderMetadata;
 import org.jclouds.rackspace.cloudidentity.v2_0.config.CloudIdentityAuthenticationModule;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata;
+import org.jclouds.rackspace.cloudloadbalancers.config.CloudLoadBalancersRestClientModule;
+import org.jclouds.rackspace.cloudloadbalancers.loadbalancer.config.CloudLoadBalancersLoadBalancerContextModule;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Module;

providers/rackspace-cloudloadbalancers-us/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata

@@ -0,0 +1 @@
+org.jclouds.rackspace.cloudloadbalancers.us.CloudLoadBalancersUSProviderMetadata

providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSLoadBalancerClientLiveTest.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.rackspace.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers.us;
 
-import org.jclouds.cloudloadbalancers.features.LoadBalancerClientLiveTest;
+import org.jclouds.rackspace.cloudloadbalancers.features.LoadBalancerClientLiveTest;
 import org.testng.annotations.Test;
 
 /**

providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSNodeClientLiveTest.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.rackspace.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers.us;
 
-import org.jclouds.cloudloadbalancers.features.NodeClientLiveTest;
+import org.jclouds.rackspace.cloudloadbalancers.features.NodeClientLiveTest;
 import org.testng.annotations.Test;
 
 /**

providers/rackspace-cloudloadbalancers-us/src/test/java/org/jclouds/rackspace/cloudloadbalancers/us/CloudLoadBalancersUSProviderTest.java

@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jclouds.rackspace.cloudloadbalancers;
+package org.jclouds.rackspace.cloudloadbalancers.us;
 
-import org.jclouds.cloudloadbalancers.CloudLoadBalancersApiMetadata;
 import org.jclouds.providers.internal.BaseProviderMetadataTest;
+import org.jclouds.rackspace.cloudloadbalancers.CloudLoadBalancersApiMetadata;
+import org.jclouds.rackspace.cloudloadbalancers.us.CloudLoadBalancersUSProviderMetadata;
 import org.testng.annotations.Test;
 
 /**
@@ -32,4 +33,4 @@ public class CloudLoadBalancersUSProviderTest extends BaseProviderMetadataTest {
    public CloudLoadBalancersUSProviderTest() {
       super(new CloudLoadBalancersUSProviderMetadata(), new CloudLoadBalancersApiMetadata());
    }
-}
+}