diff --git a/redisson/src/main/java/org/redisson/RedissonBoundedBlockingQueue.java b/redisson/src/main/java/org/redisson/RedissonBoundedBlockingQueue.java
index 5ad99ac027936618820fb106278a129877a8d357..9f744e5da1a905cea3b7232f724fdf60fb5ea885 100644
--- a/redisson/src/main/java/org/redisson/RedissonBoundedBlockingQueue.java
+++ b/redisson/src/main/java/org/redisson/RedissonBoundedBlockingQueue.java
@@ -53,10 +53,7 @@ public class RedissonBoundedBlockingQueue<V> extends RedissonQueue<V> implements
     }
     
     private String getSemaphoreName() {
-        if (getName().contains("{")) {
-            return "redisson_bqs:" + getName();
-        }
-        return "redisson_bqs:{" + getName() + "}";
+        return prefixName("redisson_bqs", getName());
     }
     
     @Override
@@ -310,6 +307,7 @@ public class RedissonBoundedBlockingQueue<V> extends RedissonQueue<V> implements
                         Arrays.<Object>asList(getName(), getSemaphoreName(), channelName), maxElements);
     }
     
+    @Override
     public RFuture<Boolean> trySetCapacityAsync(int capacity) {
         String channelName = RedissonSemaphore.getChannelName(getSemaphoreName());
         return commandExecutor.evalWriteAsync(getName(), LongCodec.INSTANCE, RedisCommands.EVAL_BOOLEAN,
@@ -323,6 +321,7 @@ public class RedissonBoundedBlockingQueue<V> extends RedissonQueue<V> implements
                 Arrays.<Object>asList(getSemaphoreName(), channelName), capacity);
     }
     
+    @Override
     public boolean trySetCapacity(int capacity) {
         return get(trySetCapacityAsync(capacity));
     }
diff --git a/redisson/src/main/java/org/redisson/api/RRingBuffer.java b/redisson/src/main/java/org/redisson/api/RRingBuffer.java
index 95c7b832a017d11c27adfa393d955e474b8efb3e..c1ad2188a2be002b1caa239e226eb9cf7f69772e 100644
--- a/redisson/src/main/java/org/redisson/api/RRingBuffer.java
+++ b/redisson/src/main/java/org/redisson/api/RRingBuffer.java
@@ -16,7 +16,7 @@
 package org.redisson.api;
 
 /**
- * This RingBuffer based queue evicts elements from the head if queue capacity became full.
+ * RingBuffer based queue evicts elements from the head if queue capacity became full.
  * <p>
  * The head element removed if new element added and queue is full. 
  * <p>