diff --git a/jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml b/jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml
index 755137daeb5..3bcc7940bad 100644
--- a/jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml
+++ b/jetty-infinispan/src/main/config/etc/sessions/infinispan/default.xml
@@ -13,15 +13,15 @@
   </New>
   
   <!-- ===================================================================== -->
-  <!-- Configure a factory for InfinispanSessionStore using the              -->
+  <!-- Configure a factory for InfinispanSessionDataStore using the          -->
   <!-- Infinispan DefaultCache                                               -->
   <!-- ===================================================================== -->
   <Call name="addBean">
    <Arg>
-    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.InfinispanSessionStoreFactory">
+    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory">
        <Set name="cache"><Ref id="cache"/></Set>
        <Set name="infinispanIdleTimeoutSec"><Property name="jetty.session.infinispanIdleTimeout.seconds" default="0" /></Set>
-       <Set name="gracePeriod"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
+       <Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
     </New>
    </Arg>
   </Call>
diff --git a/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml b/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml
index 0f55ad09ab1..6a533945817 100644
--- a/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml
+++ b/jetty-infinispan/src/main/config/etc/sessions/infinispan/remote.xml
@@ -15,15 +15,15 @@
   </New>
   
   <!-- ===================================================================== -->
-  <!-- Configure a factory for InfinispanSessionStore using the              -->
-  <!-- Infinispan DefaultCache                                               -->
+  <!-- Configure a factory for InfinispanSessionDataStore using an           -->
+  <!-- Infinispan remote cache                                               -->
   <!-- ===================================================================== -->
   <Call name="addBean">
    <Arg>
-    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.InfinispanSessionStoreFactory">
+    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory">
        <Set name="cache"><Ref id="remoteCache"/></Set>
        <Set name="infinispanIdleTimeoutSec"><Property name="jetty.session.infinispanIdleTimeout.seconds" default="0" /></Set>
-       <Set name="gracePeriod"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
+       <Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
     </New>
    </Arg>
   </Call>
diff --git a/jetty-infinispan/src/main/config/modules/session-store-infinispan.mod b/jetty-infinispan/src/main/config/modules/session-store-infinispan.mod
index f666b2a1d64..168265d136a 100644
--- a/jetty-infinispan/src/main/config/modules/session-store-infinispan.mod
+++ b/jetty-infinispan/src/main/config/modules/session-store-infinispan.mod
@@ -1,11 +1,11 @@
 [description]
-Enables session data store in a remote Infinispan cache
+Enables session data store in an Infinispan cache
 
 [provides]
 session-store
 
 [depend]
-session
+sessions
 sessions/infinispan/${cache-type}
 
 [files]
diff --git a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store.xml b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store.xml
index c9176d3a8ca..0b462c86013 100644
--- a/jetty-nosql/src/main/config/etc/sessions/mongo/session-store.xml
+++ b/jetty-nosql/src/main/config/etc/sessions/mongo/session-store.xml
@@ -5,14 +5,14 @@
 
 
   <!-- ===================================================================== -->
-  <!-- Configure a factory for MongoSessionStores                            -->
+  <!-- Configure a factory for MongoSessionDataStores                        -->
   <!-- ===================================================================== -->
   <Call name="addBean">
    <Arg>
-    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.MongoSessionStoreFactory">      
+    <New id="sessionDataStoreFactory" class="org.eclipse.jetty.nosql.mongodb.MongoSessionDataStoreFactory">      
        <Set name="dbName"><Property name="jetty.session.dbName" default="HttpSessions" /></Set>
        <Set name="collectionName"><Property name="jetty.session.collectionName" default="jettySessions" /></Set>
-       <Set name="gracePeriod"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
+       <Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
     </New>
    </Arg>
   </Call>