keycloak-uncached

diff --git a/docbook/reference/en/en-US/modules/timeouts.xml b/docbook/reference/en/en-US/modules/timeouts.xml
index 8a772cc..dda5981 100755
--- a/docbook/reference/en/en-US/modules/timeouts.xml
+++ b/docbook/reference/en/en-US/modules/timeouts.xml
@@ -18,7 +18,7 @@
     <section id="session-timeouts">
         <title>Session Timeouts</title>
         <para>
-            If you go to the Sesions and Tokens->Token Settings page of the Keycloak adminstration console there is a bunch of fine tuning
+            If you go to the Sesions and Tokens->Timeout Settings page of the Keycloak adminstration console there is a bunch of fine tuning
             you can do as far as login session timeouts go.
         </para>
         <para>

diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-tokens.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-tokens.html
index 4dc0ffc..ba58157 100755
--- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-tokens.html
+++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/realm-tokens.html
@@ -2,16 +2,16 @@
 <div id="content-area" class="col-sm-9" role="main">
     <ul class="nav nav-tabs nav-tabs-pf"  data-ng-show="!create">
         <li><a href="#/realms/{{realm.realm}}/sessions/realm">Realm Sessions</a></li>
-        <li class="active"><a href="#/realms/{{realm.realm}}/token-settings">Token Settings</a></li>
+        <li class="active"><a href="#/realms/{{realm.realm}}/token-settings">Timeout Settings</a></li>
         <li><a href="#/realms/{{realm.realm}}/sessions/revocation">Revocation</a></li>
-        <li><a href="#/realms/{{realm.realm}}/sessions/brute-force">Brute Force</a></li>
+        <li><a href="#/realms/{{realm.realm}}/sessions/brute-force">Brute Force Protection</a></li>
     </ul>
     <div id="content">
         <ol class="breadcrumb">
             <li><a href="#/realms/{{realm.realm}}">{{realm.realm}}</a></li>
-            <li class="active">Token</li>
+            <li class="active">Timeouts</li>
         </ol>
-        <h2><span>{{realm.realm}}</span> Token Settings</h2>
+        <h2><span>{{realm.realm}}</span> Session and Token Timeout Settings</h2>
         <form class="form-horizontal" name="realmForm" novalidate kc-read-only="!access.manageRealm">
             <fieldset class="border-top">
                 <div class="form-group input-select">

diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-brute-force.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-brute-force.html
index a2c7f47..3f9bd9a 100755
--- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-brute-force.html
+++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-brute-force.html
@@ -2,9 +2,9 @@
 <div id="content-area" class="col-sm-9" role="main">
     <ul class="nav nav-tabs nav-tabs-pf"  data-ng-show="!create">
         <li><a href="#/realms/{{realm.realm}}/sessions/realm">Realm Sessions</a></li>
-        <li><a href="#/realms/{{realm.realm}}/token-settings">Token Settings</a></li>
+        <li><a href="#/realms/{{realm.realm}}/token-settings">Timeout Settings</a></li>
         <li><a href="#/realms/{{realm.realm}}/sessions/revocation">Revocation</a></li>
-        <li class="active"><a href="#/realms/{{realm.realm}}/sessions/brute-force">Brute Force</a></li>
+        <li class="active"><a href="#/realms/{{realm.realm}}/sessions/brute-force">Brute Force Protection</a></li>
     </ul>
     <div id="content">
         <ol class="breadcrumb">

diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-realm.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-realm.html
index bea3c02..866b2f7 100755
--- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-realm.html
+++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-realm.html
@@ -2,9 +2,9 @@
 <div id="content-area" class="col-md-9" role="main">
     <ul class="nav nav-tabs nav-tabs-pf">
         <li class="active"><a href="#/realms/{{realm.realm}}/sessions/realm">Realm Sessions</a></li>
-        <li><a href="#/realms/{{realm.realm}}/token-settings">Token Settings</a></li>
+        <li><a href="#/realms/{{realm.realm}}/token-settings">Timeout Settings</a></li>
         <li><a href="#/realms/{{realm.realm}}/sessions/revocation">Revocation</a></li>
-        <li><a href="#/realms/{{realm.realm}}/sessions/brute-force">Brute Force</a></li>
+        <li><a href="#/realms/{{realm.realm}}/sessions/brute-force">Brute Force Protection</a></li>
     </ul>
     <div id="content">
         <ol class="breadcrumb">

diff --git a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-revocation.html b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-revocation.html
index 285903c..04ec771 100755
--- a/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-revocation.html
+++ b/forms/common-themes/src/main/resources/theme/admin/base/resources/partials/session-revocation.html
@@ -2,9 +2,9 @@
 <div id="content-area" class="col-md-9" role="main">
     <ul class="nav nav-tabs nav-tabs-pf"  data-ng-show="!create">
         <li><a href="#/realms/{{realm.realm}}/sessions/realm">Realm Sessions</a></li>
-        <li><a href="#/realms/{{realm.realm}}/token-settings">Token Settings</a></li>
+        <li><a href="#/realms/{{realm.realm}}/token-settings">Timeout Settings</a></li>
         <li class="active"><a href="#/realms/{{realm.realm}}/sessions/revocation">Revocation</a></li>
-        <li><a href="#/realms/{{realm.realm}}/sessions/brute-force">Brute Force</a></li>
+        <li><a href="#/realms/{{realm.realm}}/sessions/brute-force">Brute Force Protection</a></li>
     </ul>
     <div id="content">
         <ol class="breadcrumb">