diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java
index 6a77108ad0..083523b4cc 100644
--- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java
+++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java
@@ -40,13 +40,13 @@ public class CDNContainer implements Comparable<CDNContainer> {
    public static class Builder {
 
       protected String name;
-      protected boolean cdn_enabled;
-      protected boolean log_retention;
+      protected boolean cdnEnabled;
+      protected boolean logRetention;
       protected long ttl;
-      protected URI cdn_uri;
-      protected URI cdn_ssl_uri;
-      protected String referrer_acl;
-      protected String useragent_acl;
+      protected URI cdnUri;
+      protected URI cdnSslUri;
+      protected String referrerAcl;
+      protected String useragentAcl;
 
       /**
        * @see CDNContainer#getName()
@@ -59,8 +59,8 @@ public class CDNContainer implements Comparable<CDNContainer> {
       /**
        * @see CDNContainer#isCDNEnabled()
        */
-      public Builder CDNEnabled(boolean cdn_enabled) {
-         this.cdn_enabled = cdn_enabled;
+      public Builder CDNEnabled(boolean cdnEnabled) {
+         this.cdnEnabled = cdnEnabled;
          return this;
       }
 
@@ -75,45 +75,45 @@ public class CDNContainer implements Comparable<CDNContainer> {
       /**
        * @see CDNContainer#getCDNUri()
        */
-      public Builder CDNUri(URI cdn_uri) {
-         this.cdn_uri = cdn_uri;
+      public Builder CDNUri(URI cdnUri) {
+         this.cdnUri = cdnUri;
          return this;
       }
 
       /**
        * @see CDNContainer#getCDNSslUri()
        */
-      public Builder CDNSslUri(URI cdn_ssl_uri) {
-         this.cdn_ssl_uri = cdn_ssl_uri;
+      public Builder CDNSslUri(URI cdnSslUri) {
+         this.cdnSslUri = cdnSslUri;
          return this;
       }
       
       /**
        * @see CDNContainer#getReferrerAcl()
        */
-      public Builder referrerAcl(String referrer_acl) {
-         this.referrer_acl = referrer_acl;
+      public Builder referrerAcl(String referrerAcl) {
+         this.referrerAcl = referrerAcl;
          return this;
       }
 
       /**
        * @see CDNContainer#getUseragentAcl()
        */
-      public Builder useragentAcl(String useragent_acl) {
-         this.useragent_acl = useragent_acl;
+      public Builder useragentAcl(String useragentAcl) {
+         this.useragentAcl = useragentAcl;
          return this;
       }
 
       /**
        * @see CDNContainer#isLogRetention()
        */
-      public Builder logRetention(boolean log_retention) {
-         this.log_retention = log_retention;
+      public Builder logRetention(boolean logRetention) {
+         this.logRetention = logRetention;
          return this;
       }
 
       public CDNContainer build() {
-         return new CDNContainer(name, cdn_enabled, ttl, cdn_uri, cdn_ssl_uri, referrer_acl, useragent_acl, log_retention);
+         return new CDNContainer(name, cdnEnabled, ttl, cdnUri, cdnSslUri, referrerAcl, useragentAcl, logRetention);
       }
 
       public Builder fromCDNContainer(CDNContainer in) {
@@ -132,9 +132,11 @@ public class CDNContainer implements Comparable<CDNContainer> {
    private final String referrerAcl;
    private final String useragentAcl;
 
-   @ConstructorProperties({ "name", "cdn_enabled", "ttl", "cdn_uri", "cdn_ssl_uri", "referrer_acl", "useragent_acl", "log_retention" })
+   @ConstructorProperties({ "name", "cdnEnabled", "ttl", "cdnUri", "cdnSslUri", "referrerAcl", "useragentAcl", 
+                            "logRetention" })
    protected CDNContainer(@Nullable String name, boolean cdnEnabled, long ttl, @Nullable URI CDNUri,
-           @Nullable URI CDNSslUri, @Nullable String referrerAcl, @Nullable String useragentAcl, boolean logRetention) {
+           @Nullable URI CDNSslUri, @Nullable String referrerAcl, @Nullable String useragentAcl, 
+           boolean logRetention) {
       this.name = Strings.emptyToNull(name);
       this.cdnEnabled = cdnEnabled;
       this.ttl = ttl;
diff --git a/providers/hpcloud-objectstorage/src/test/resources/test_list_cdn.json b/providers/hpcloud-objectstorage/src/test/resources/test_list_cdn.json
index 7bec3ec704..ca09e600f9 100644
--- a/providers/hpcloud-objectstorage/src/test/resources/test_list_cdn.json
+++ b/providers/hpcloud-objectstorage/src/test/resources/test_list_cdn.json
@@ -1,5 +1,5 @@
 [
-{"name":"hpcloud-blobstore.testCDNOperationsContainerWithCDN","cdn_enabled":"false","ttl":3600,"cdn_uri":"http://h10cdf69e2913a87afe9ce721ceb35ca5.cdn.hpcloudsvc.com","cdn_ssl_uri":"https://a248.e.akamai.net/cdn.hpcloudsvc.com/h10cdf69e2913a87afe9ce721ceb35ca5/aw2","referrer_acl":"","useragent_acl":"", "log_retention":"false"},
-{"name":"hpcloud-blobstore5","cdn_enabled":"true","ttl":28800,"cdn_uri":"http://h0bc2984e4ad8f8bec0ebf5b147c9fe55.cdn.hpcloudsvc.com","cdn_ssl_uri":"https://a248.e.akamai.net/cdn.hpcloudsvc.com/h0bc2984e4ad8f8bec0ebf5b147c9fe55/aw2","referrer_acl":"","useragent_acl":"", "log_retention":"false"},
-{"name":"hpcloud-cfcdnint.testCDNOperationsContainerWithCDN","cdn_enabled":"false","ttl":3600,"cdn_uri":"http://h82d1ae1ee2ada5151c60e33f097294c2.cdn.hpcloudsvc.com","cdn_ssl_uri":"https://a248.e.akamai.net/cdn.hpcloudsvc.com/h82d1ae1ee2ada5151c60e33f097294c2/aw2","referrer_acl":"","useragent_acl":"", "log_retention":"false"}
+{"name":"hpcloud-blobstore.testCDNOperationsContainerWithCDN","cdnEnabled":"false","ttl":3600,"cdnUri":"http://h10cdf69e2913a87afe9ce721ceb35ca5.cdn.hpcloudsvc.com","cdnSslUri":"https://a248.e.akamai.net/cdn.hpcloudsvc.com/h10cdf69e2913a87afe9ce721ceb35ca5/aw2","referrerAcl":"","useragentAcl":"", "logRetention":"false"},
+{"name":"hpcloud-blobstore5","cdnEnabled":"true","ttl":28800,"cdnUri":"http://h0bc2984e4ad8f8bec0ebf5b147c9fe55.cdn.hpcloudsvc.com","cdnSslUri":"https://a248.e.akamai.net/cdn.hpcloudsvc.com/h0bc2984e4ad8f8bec0ebf5b147c9fe55/aw2","referrerAcl":"","useragentAcl":"", "logRetention":"false"},
+{"name":"hpcloud-cfcdnint.testCDNOperationsContainerWithCDN","cdnEnabled":"false","ttl":3600,"cdnUri":"http://h82d1ae1ee2ada5151c60e33f097294c2.cdn.hpcloudsvc.com","cdnSslUri":"https://a248.e.akamai.net/cdn.hpcloudsvc.com/h82d1ae1ee2ada5151c60e33f097294c2/aw2","referrerAcl":"","useragentAcl":"", "logRetention":"false"}
 ]
\ No newline at end of file