diff --git a/eventq_aws/lib/eventq_aws.rb b/eventq_aws/lib/eventq_aws.rb
index ab77a91..c45ea25 100644
--- a/eventq_aws/lib/eventq_aws.rb
+++ b/eventq_aws/lib/eventq_aws.rb
@@ -21,5 +21,11 @@ def self.create_event_type(event_type)
     end
     return "#{EventQ.namespace}-#{event_type}"
   end
+  def self.create_queue_name(queue_name)
+    if EventQ.namespace == nil
+      return queue_name
+    end
+    return "#{EventQ.namespace}-#{queue_name}"
+  end
 end
 
diff --git a/eventq_aws/lib/eventq_aws/aws_eventq_client.rb b/eventq_aws/lib/eventq_aws/aws_eventq_client.rb
index 5c11eb1..d39ca31 100644
--- a/eventq_aws/lib/eventq_aws/aws_eventq_client.rb
+++ b/eventq_aws/lib/eventq_aws/aws_eventq_client.rb
@@ -16,13 +16,11 @@ def initialize(options)
 
       def raise_event(event_type, event)
 
-        _event_type = EventQ.create_event_type(event_type)
-
-        topic_arn = @client.get_topic_arn(_event_type)
+        topic_arn = @client.get_topic_arn(event_type)
 
         qm = new_message
         qm.content = event
-        qm.type = _event_type
+        qm.type = event_type
 
         serialization_provider = @serialization_manager.get_provider(EventQ::Configuration.serialization_provider)
 
diff --git a/eventq_aws/lib/eventq_aws/aws_queue_client.rb b/eventq_aws/lib/eventq_aws/aws_queue_client.rb
index 494d5da..72ed68a 100644
--- a/eventq_aws/lib/eventq_aws/aws_queue_client.rb
+++ b/eventq_aws/lib/eventq_aws/aws_queue_client.rb
@@ -30,21 +30,25 @@ def initialize(options = {})
       end
 
       def get_topic_arn(event_type)
-        return "arn:aws:sns:#{@aws_region}:#{@aws_account}:#{aws_safe_name(event_type)}"
+        _event_type = EventQ.create_event_type(event_type)
+        return "arn:aws:sns:#{@aws_region}:#{@aws_account}:#{aws_safe_name(_event_type)}"
       end
 
       def get_queue_arn(queue)
-        return "arn:aws:sqs:#{@aws_region}:#{@aws_account}:#{aws_safe_name(queue.name)}"
+        _queue_name = EventQ.create_queue_name(queue.name)
+        return "arn:aws:sqs:#{@aws_region}:#{@aws_account}:#{aws_safe_name(_queue_name)}"
       end
 
       def create_topic_arn(event_type)
-        response = @sns.create_topic({ name: aws_safe_name(event_type) })
+        _event_type = EventQ.create_event_type(event_type)
+        response = @sns.create_topic({ name: aws_safe_name(_event_type) })
         return response.topic_arn
       end
 
       def get_queue_url(queue)
+        _queue_name = EventQ.create_queue_name(queue.name)
         response= @sqs.get_queue_url({
-                                            queue_name: aws_safe_name(queue.name),
+                                            queue_name: aws_safe_name(_queue_name),
                                             queue_owner_aws_account_id: @aws_account,
                                         })
         return response.queue_url
diff --git a/eventq_aws/lib/eventq_aws/aws_queue_manager.rb b/eventq_aws/lib/eventq_aws/aws_queue_manager.rb
index 6193232..d168fbd 100644
--- a/eventq_aws/lib/eventq_aws/aws_queue_manager.rb
+++ b/eventq_aws/lib/eventq_aws/aws_queue_manager.rb
@@ -24,8 +24,9 @@ def get_queue(queue)
       end
 
       def create_queue(queue)
+        _queue_name = EventQ.create_queue_name(queue.name)
         response = @client.sqs.create_queue({
-                                                queue_name: queue.name,
+                                                queue_name: _queue_name,
                                                 attributes: {
                                                     VISIBILITY_TIMEOUT => 300.to_s #5 minutes
                                                 }
@@ -52,7 +53,8 @@ def drop_topic(event_type)
       end
 
       def queue_exists?(queue)
-        return @client.sqs.list_queues({ queue_name_prefix: queue.name }).queue_urls.length > 0
+        _queue_name = EventQ.create_queue_name(queue.name)
+        return @client.sqs.list_queues({ queue_name_prefix: _queue_name }).queue_urls.length > 0
       end
 
       def update_queue(queue)
diff --git a/eventq_aws/lib/eventq_aws/aws_subscription_manager.rb b/eventq_aws/lib/eventq_aws/aws_subscription_manager.rb
index 5db7112..50667d7 100644
--- a/eventq_aws/lib/eventq_aws/aws_subscription_manager.rb
+++ b/eventq_aws/lib/eventq_aws/aws_subscription_manager.rb
@@ -19,8 +19,7 @@ def initialize(options)
 
       def subscribe(event_type, queue)
 
-        _event_type = EventQ.create_event_type(event_type)
-        topic_arn = @client.create_topic_arn(_event_type)
+        topic_arn = @client.create_topic_arn(event_type)
 
         q = @manager.get_queue(queue)
         queue_arn = @client.get_queue_arn(queue)
diff --git a/eventq_aws/lib/eventq_aws/version.rb b/eventq_aws/lib/eventq_aws/version.rb
index 14510c6..de5f275 100644
--- a/eventq_aws/lib/eventq_aws/version.rb
+++ b/eventq_aws/lib/eventq_aws/version.rb
@@ -1,5 +1,5 @@
 module EventQ
   module Amazon
-    VERSION = "1.6.0"
+    VERSION = "1.6.1"
   end
 end