diff --git a/azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureStorage.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueue.java
similarity index 75%
rename from azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureStorage.java
rename to azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueue.java
index a83d7b9369..ddabeb2e20 100644
--- a/azure/storage/core/src/main/java/org/jclouds/azure/storage/AzureStorage.java
+++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueue.java
@@ -1,4 +1,4 @@
-package org.jclouds.azure.storage;
+package org.jclouds.azure.storage.queue;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.inject.Qualifier;
 
 /**
- * Related to a resource of type Azure Storage
+ * Related to a resource of type Azure Queue
  * 
  * @author Adrian Cole
  * 
@@ -16,6 +16,6 @@ import javax.inject.Qualifier;
 @Retention(value = RetentionPolicy.RUNTIME)
 @Target(value = { ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
 @Qualifier
-public @interface AzureStorage {
+public @interface AzureQueue {
 
 }
\ No newline at end of file
diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java
index 346d3d77f9..4996cad862 100755
--- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java
+++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/AzureQueueContextBuilder.java
@@ -58,7 +58,7 @@ public class AzureQueueContextBuilder extends CloudContextBuilder<AzureQueueCont
    public AzureQueueContextBuilder(Properties props) {
       super(props);
       properties.setProperty(AzureQueueConstants.PROPERTY_AZUREQUEUE_ENDPOINT,
-               "https://{account}.blob.core.windows.net");
+               "https://{account}.queue.core.windows.net");
    }
 
    public static AzureQueueContextBuilder newBuilder(String id, String secret) {
diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/RestAzureQueueConnectionModule.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/RestAzureQueueConnectionModule.java
index f980106081..530e2c827e 100644
--- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/RestAzureQueueConnectionModule.java
+++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/config/RestAzureQueueConnectionModule.java
@@ -25,14 +25,18 @@ package org.jclouds.azure.storage.queue.config;
 
 import java.net.URI;
 
-import org.jclouds.azure.storage.queue.AzureQueueConnection;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.jclouds.azure.storage.config.RestAzureStorageConnectionModule;
+import org.jclouds.azure.storage.queue.AzureQueue;
+import org.jclouds.azure.storage.queue.AzureQueueConnection;
+import org.jclouds.azure.storage.queue.reference.AzureQueueConstants;
 import org.jclouds.cloud.ConfiguresCloudConnection;
 import org.jclouds.http.RequiresHttp;
 import org.jclouds.rest.RestClientFactory;
 
 import com.google.inject.Provides;
-import javax.inject.Singleton;
 
 /**
  * Configures the Azure Queue Service connection, including logging and http transport.
@@ -42,10 +46,19 @@ import javax.inject.Singleton;
 @ConfiguresCloudConnection
 @RequiresHttp
 public class RestAzureQueueConnectionModule extends RestAzureStorageConnectionModule {
-  
+
    @Provides
    @Singleton
-   protected AzureQueueConnection provideAzureStorageConnection(URI uri, RestClientFactory factory) {
+   @AzureQueue
+   protected URI provideAuthenticationURI(
+            @Named(AzureQueueConstants.PROPERTY_AZUREQUEUE_ENDPOINT) String endpoint) {
+      return URI.create(endpoint);
+   }
+
+   @Provides
+   @Singleton
+   protected AzureQueueConnection provideAzureStorageConnection(@AzureQueue URI uri,
+            RestClientFactory factory) {
       return factory.create(uri, AzureQueueConnection.class);
    }
 
diff --git a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/internal/GuiceAzureQueueContext.java b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/internal/GuiceAzureQueueContext.java
index 4b8745828e..9df4e6c388 100644
--- a/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/internal/GuiceAzureQueueContext.java
+++ b/azure/storage/queue/core/src/main/java/org/jclouds/azure/storage/queue/internal/GuiceAzureQueueContext.java
@@ -27,16 +27,17 @@ import java.io.IOException;
 import java.net.URI;
 
 import javax.annotation.Resource;
+import javax.inject.Inject;
+import javax.inject.Named;
 
+import org.jclouds.azure.storage.queue.AzureQueue;
 import org.jclouds.azure.storage.queue.AzureQueueConnection;
 import org.jclouds.azure.storage.queue.AzureQueueContext;
 import org.jclouds.azure.storage.reference.AzureStorageConstants;
 import org.jclouds.lifecycle.Closer;
 import org.jclouds.logging.Logger;
 
-import javax.inject.Inject;
 import com.google.inject.Injector;
-import javax.inject.Named;
 
 /**
  * Uses a Guice Injector to configure the objects served by AzureQueueContext methods.
@@ -55,7 +56,8 @@ public class GuiceAzureQueueContext implements AzureQueueContext {
 
    @Inject
    private GuiceAzureQueueContext(Injector injector, Closer closer,
-            @Named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT) String account, URI endPoint) {
+            @Named(AzureStorageConstants.PROPERTY_AZURESTORAGE_ACCOUNT) String account,
+            @AzureQueue URI endPoint) {
       this.injector = injector;
       this.closer = closer;
       this.endPoint = endPoint;