diff --git a/pom.xml b/pom.xml
index 0966e0c0d6..5925545954 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,6 @@
         <module>extensions/s3nio</module>
         <module>gae</module>
         <module>s3</module>
-        <module>s3/perftest</module>
     </modules>
     <build>
        <plugins>
diff --git a/s3/src/main/java/org/jclouds/aws/s3/S3Context.java b/s3/src/main/java/org/jclouds/aws/s3/S3Context.java
index 7c6bf19e7a..b4ba574142 100644
--- a/s3/src/main/java/org/jclouds/aws/s3/S3Context.java
+++ b/s3/src/main/java/org/jclouds/aws/s3/S3Context.java
@@ -39,7 +39,7 @@ public interface S3Context {
      * @param bucket
      * @return
      */
-    S3InputStreamMap createS3InputStreamMap(S3Bucket bucket);
+    S3InputStreamMap createInputStreamMap(S3Bucket bucket);
 
     /**
      * Creates a <code>Map<String,S3Object></code> view of the specified bucket.
diff --git a/s3/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java b/s3/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java
index c018e78d4c..c7306c17a6 100644
--- a/s3/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java
+++ b/s3/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java
@@ -77,7 +77,7 @@ public class GuiceS3Context implements S3Context {
     /**
      * {@inheritDoc}
      */
-    public S3InputStreamMap createS3InputStreamMap(S3Bucket bucket) {
+    public S3InputStreamMap createInputStreamMap(S3Bucket bucket) {
 	getConnection().createBucketIfNotExists(bucket);
 	return s3InputStreamMapFactory.createMapView(bucket);
     }
diff --git a/s3/src/test/java/org/jclouds/aws/s3/S3InputStreamMapTest.java b/s3/src/test/java/org/jclouds/aws/s3/S3InputStreamMapTest.java
index fe0fd0b7fd..1f9af708ab 100644
--- a/s3/src/test/java/org/jclouds/aws/s3/S3InputStreamMapTest.java
+++ b/s3/src/test/java/org/jclouds/aws/s3/S3InputStreamMapTest.java
@@ -51,7 +51,7 @@ public class S3InputStreamMapTest extends BaseS3MapTest<InputStream> {
     @SuppressWarnings("unchecked")
     protected BaseS3Map<InputStream> createMap(S3Context context,
 	    S3Bucket bucket) {
-	map = context.createS3InputStreamMap(bucket);
+	map = context.createInputStreamMap(bucket);
 	return (BaseS3Map<InputStream>) map;
     }
 
diff --git a/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java b/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java
index d68166c526..3b3e3fbc61 100644
--- a/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java
+++ b/samples/googleappengine/src/main/java/org/jclouds/samples/googleappengine/JCloudsServlet.java
@@ -62,7 +62,7 @@ public class JCloudsServlet extends HttpServlet {
 	    writer.write("List:\n");
 	    for (S3Bucket bucket : myBuckets) {
 		writer.write(String.format("  %1s: %2s entries%n", bucket
-			.getName(), context.createS3InputStreamMap(bucket)
+			.getName(), context.createInputStreamMap(bucket)
 			.size()));
 	    }
 	} catch (Exception e) {