diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IPersistentSubscriptionStore.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IPersistentSubscriptionStore.java
index 49a32487..e81cfd83 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IPersistentSubscriptionStore.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IPersistentSubscriptionStore.java
@@ -35,5 +35,5 @@ public interface IPersistentSubscriptionStore {
      */
     void wipeSubscriptions(String sessionID);
 
-    List<Subscription> retrieveAllSubscriptions();
+    List<Subscription> listAllSubscriptions();
 }
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java
index 979180fd..c231b5a1 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java
@@ -264,7 +264,7 @@ public class HawtDBStorageService implements IStorageService {
         m_persistentSubscriptions.remove(clientID);
     }
 
-    public List<Subscription> retrieveAllSubscriptions() {
+    public List<Subscription> listAllSubscriptions() {
         List<Subscription> allSubscriptions = new ArrayList<Subscription>();
         for (Map.Entry<String, Set<Subscription>> entry : m_persistentSubscriptions) {
             allSubscriptions.addAll(entry.getValue());
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
index 06e0af64..88daec81 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java
@@ -134,7 +134,7 @@ public class MemoryStorageService implements IStorageService {
         m_persistentSubscriptions.remove(clientID);
     }
 
-    public List<Subscription> retrieveAllSubscriptions() {
+    public List<Subscription> listAllSubscriptions() {
         List<Subscription> allSubscriptions = new ArrayList<Subscription>();
         for (Map.Entry<String, Set<Subscription>> entry : m_persistentSubscriptions.entrySet()) {
             allSubscriptions.addAll(entry.getValue());
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
index 4ec72bef..73ea09d7 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
@@ -203,7 +203,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
     private void processInit(Properties props) {
         m_storageService = new HawtDBStorageService();
         m_storageService.initStore();
-        List<Subscription> storedSubscriptions = m_storageService.retrieveAllSubscriptions();
+        List<Subscription> storedSubscriptions = m_storageService.listAllSubscriptions();
         subscriptions.init(storedSubscriptions);
         
         String passwdPath = props.getProperty("password_file");
diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageServiceTest.java b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageServiceTest.java
index ad04e2c8..05df4878 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageServiceTest.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageServiceTest.java
@@ -63,7 +63,7 @@ public class HawtDBStorageServiceTest {
         m_storageService.addNewSubscription(overrindingSubscription, overrindingSubscription.getClientId());
         
         //Verify
-        List<Subscription> subscriptions = m_storageService.retrieveAllSubscriptions();
+        List<Subscription> subscriptions = m_storageService.listAllSubscriptions();
         assertEquals(1, subscriptions.size());
         Subscription sub = subscriptions.get(0);
         assertEquals(overrindingSubscription.getRequestedQos(), sub.getRequestedQos());