diff --git a/routing/routes.go b/routing/routes.go
index 2a27bef081000afb436d6ac7aef4b38c2e6a52f1..b787c8d6a11e107bd7ee428cafa3526f1df9d9fd 100644
--- a/routing/routes.go
+++ b/routing/routes.go
@@ -205,15 +205,15 @@ func SetRoutes( router *f.App, config *configuration.Config, store state.Store,
 
 
     router.Get( "/states", func( c *f.Ctx ) error {
-        states, err := store.Show()
+        names, err := store.List()
         if err != nil {
             return c.SendStatus( http.StatusInternalServerError )
         }
 
         const pathPrefix string = "/state"
-        paths := make ( []string, len( states ) )
-        for i, state := range states {
-            paths[ i ] = fmt.Sprintf( "%s/%s", pathPrefix, state )
+        paths := make( []string, len( names ) )
+        for i, name := range names {
+            paths[ i ] = fmt.Sprintf( "%s/%s", pathPrefix, name )
         }
 
         headers := c.GetReqHeaders()
diff --git a/state/ephemeral.go b/state/ephemeral.go
index dc04c387d2da9d6234e62a6471ef403f9c6ff978..c4739377d9943371396fe4cf28d6c2447793035d 100644
--- a/state/ephemeral.go
+++ b/state/ephemeral.go
@@ -64,15 +64,15 @@ func ( e *Ephemeral ) Fetch( name string ) ( *Item, error ) {
 }
 
 
-func ( e *Ephemeral ) Show() ( []string, error ) {
+func ( e *Ephemeral ) List() ( []string, error ) {
     if e.store == nil {
         return nil, errors.New( "ephemeral storage not available" )
     }
 
     e.mux.Lock()
     names := make( []string, 0, len( e.store ) )
-    for k := range e.store {
-        names = append( names, k )
+    for _, item := range e.store {
+        names = append( names, item.Name() )
     }
     e.mux.Unlock()
 
diff --git a/state/persistent.go b/state/persistent.go
index b005e428f9f5701e34836cc3c8899630e71786d8..1c857572c9cb687a493231c3f8a6615bdbaedfce 100644
--- a/state/persistent.go
+++ b/state/persistent.go
@@ -51,8 +51,8 @@ func ( e *Persistent ) Add( i Item ) error {
     name := i.Name()
     if err := e.client.HSet(
         ctx, name,
-        "data", i.Data(),
         "mime", i.MimeType(),
+        "data", i.Data(),
     ).Err(); err != nil {
         return err
     }
@@ -89,7 +89,7 @@ func ( e *Persistent ) Fetch( name string ) ( *Item, error ) {
 }
 
 
-func ( e *Persistent ) Show() ( []string, error ) {
+func ( e *Persistent ) List() ( []string, error ) {
     ctx, cancel := context.WithTimeout( context.TODO(), e.timeout )
     defer cancel()
 
diff --git a/state/store.go b/state/store.go
index ec39599ecedae71864ff75a11ac69467f49124a4..2af271e89bdf084798ba89457465af44ce40d168 100644
--- a/state/store.go
+++ b/state/store.go
@@ -6,7 +6,7 @@ type Store interface {
     Add( i Item ) error
     Remove( name string ) error
     Fetch( name string ) ( *Item, error )
-    Show() ( []string, error )
+    List() ( []string, error )
 
     Disconnect() error
 }