diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java
index 78bec78997..7a16d7c194 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaAsyncClient.java
@@ -143,7 +143,7 @@ public interface NovaAsyncClient {
     * Provides asynchronous access to Server Extra Data features.
     */
    @Delegate
-   Optional<ServerWithSecurityGroupsAsyncClient> getServerExtraDataExtensionForZone(
+   Optional<ServerWithSecurityGroupsAsyncClient> getServerWithSecurityGroupsExtensionForZone(
          @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
 
    /**
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java
index 4bd53198f3..75d3173bbd 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/NovaClient.java
@@ -126,7 +126,6 @@ public interface NovaClient {
    Optional<SimpleTenantUsageClient> getSimpleTenantUsageExtensionForZone(
          @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
 
-
    /**
     * Provides synchronous access to Volume features.
     */
@@ -141,17 +140,15 @@ public interface NovaClient {
    Optional<VirtualInterfaceClient> getVirtualInterfaceExtensionForZone(
          @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
 
-
    /**
     * Provides synchronous access to Server Extra Data features.
     */
    @Delegate
-   Optional<ServerWithSecurityGroupsClient> getServerExtraDataExtensionForZone(
+   Optional<ServerWithSecurityGroupsClient> getServerWithSecurityGroupsExtensionForZone(
          @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
 
-
    /**
-    * Provides asynchronous access to Server Admin Actions features.
+    * Provides synchronous access to Server Admin Actions features.
     */
    @Delegate
    Optional<AdminActionsClient> getAdminActionsExtensionForZone(
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Image.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Image.java
index 9670ba096e..28196bf454 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Image.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/domain/Image.java
@@ -160,7 +160,7 @@ public class Image extends Resource {
       /**
        * @see Image#getMetadata()
        */
-      public T metadata(Map<java.lang.String, java.lang.String> metadata) {
+      public T metadata(Map<String, String> metadata) {
          this.metadata = metadata;
          return self();
       }
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsAsyncClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsAsyncClient.java
index 3277b671da..423d7ec97c 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsAsyncClient.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsAsyncClient.java
@@ -38,10 +38,11 @@ import com.google.common.util.concurrent.ListenableFuture;
 
 /**
  * Provides synchronous access to Servers with Security Groups.
- * 
+ *
+ * @author Adam Lowe
  * @see org.jclouds.openstack.nova.v1_1.features.ServerAsyncClient
  * @see ServerWithSecurityGroupsClient
- * @author Adam Lowe
+ * @see <a href="http://nova.openstack.org/api/nova.api.openstack.compute.contrib.createserverext.html"/>
  */
 @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.CREATESERVEREXT)
 @SkipEncoding({'/', '='})
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClient.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClient.java
index 84c8d87b4e..3fab8ec83b 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClient.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClient.java
@@ -26,13 +26,16 @@ import org.jclouds.openstack.services.Extension;
 import org.jclouds.openstack.services.ServiceType;
 
 /**
- * Provides synchronous access to Server details including security groups.
+ * Provides synchronous access to Server details including security group, referred to as the CREATESERVEREXT extension
+ * in the nova documentation
  * <p/>
- * NOTE: the equivalent to listServersInDetail() doesn't work, so not extending ServerClient at this time.
+ * NOTE: the equivalent to listServersInDetail() isn't available at the other end, so not extending ServerClient at this
+ * time.
  *
  * @author Adam Lowe
  * @see org.jclouds.openstack.nova.v1_1.features.ServerClient
  * @see ServerWithSecurityGroupsAsyncClient
+ * @see <a href="http://nova.openstack.org/api/nova.api.openstack.compute.contrib.createserverext.html"/>
  */
 @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.CREATESERVEREXT)
 @Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClientExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClientExpectTest.java
index 6ad9738cba..237526a83a 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClientExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClientExpectTest.java
@@ -30,7 +30,7 @@ import org.testng.annotations.Test;
 import com.google.common.collect.ImmutableSet;
 
 /**
- * Tests parsing and guice wiring of ServerExtraDataClient
+ * Tests parsing and guice wiring of ServerWithSecurityGroupsClient
  *
  * @author Adam Lowe
  */
@@ -44,7 +44,7 @@ public class ServerWithSecurityGroupsClientExpectTest extends BaseNovaClientExpe
             responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
             standardRequestBuilder(endpoint).build(),
             standardResponseBuilder(200).payload(payloadFromResource("/server_with_security_groups.json")).build()
-      ).getServerExtraDataExtensionForZone("az-1.region-a.geo-1").get();
+      ).getServerWithSecurityGroupsExtensionForZone("az-1.region-a.geo-1").get();
 
       ServerWithSecurityGroups server = client.getServer("8d0a6ca5-8849-4b3d-b86e-f24c92490ebb");
       assertEquals(server.getId(), "8d0a6ca5-8849-4b3d-b86e-f24c92490ebb");
@@ -58,7 +58,7 @@ public class ServerWithSecurityGroupsClientExpectTest extends BaseNovaClientExpe
             responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
             standardRequestBuilder(endpoint).build(),
             standardResponseBuilder(404).build()
-      ).getServerExtraDataExtensionForZone("az-1.region-a.geo-1").get();
+      ).getServerWithSecurityGroupsExtensionForZone("az-1.region-a.geo-1").get();
       assertNull(client.getServer("8d0a6ca5-8849-4b3d-b86e-f24c92490ebb"));
    }
 }
\ No newline at end of file
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClientLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClientLiveTest.java
index 351a08ee45..75a4227fdc 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClientLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v1_1/extensions/ServerWithSecurityGroupsClientLiveTest.java
@@ -50,7 +50,7 @@ public class ServerWithSecurityGroupsClientLiveTest extends BaseNovaClientLiveTe
       super.setupContext();
       zone = Iterables.getLast(novaContext.getApi().getConfiguredZones(), "nova");
       serverClient = novaContext.getApi().getServerClientForZone(zone);
-      clientOption = novaContext.getApi().getServerExtraDataExtensionForZone(zone);
+      clientOption = novaContext.getApi().getServerWithSecurityGroupsExtensionForZone(zone);
    }
 
    public void testGetServer() {