diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/appliances/appliances.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/appliances/appliances.jst
index 67e64cecb..9cba851d3 100644
--- a/src/rockstor/storageadmin/static/storageadmin/js/templates/appliances/appliances.jst
+++ b/src/rockstor/storageadmin/static/storageadmin/js/templates/appliances/appliances.jst
@@ -1,5 +1,5 @@
 <!-- appliances -->
-<h3>RockStor Appliances that are known to this one</h3>
+<h3>Rockstor Appliances that are known to this one</h3>
 <div class="row">
   <div class="col-md-12">
     <table class="table table-bordered table-striped data-table" width="100%">
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/common/sidenav_setup.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/common/sidenav_setup.jst
index 849dbaab4..b9eda2249 100644
--- a/src/rockstor/storageadmin/static/storageadmin/js/templates/common/sidenav_setup.jst
+++ b/src/rockstor/storageadmin/static/storageadmin/js/templates/common/sidenav_setup.jst
@@ -1,2 +1,2 @@
-<h3>RockStor Setup</h3>
+<h3>Rockstor Setup</h3>
 
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/setup/system.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/setup/system.jst
index d8674c931..d9843d945 100644
--- a/src/rockstor/storageadmin/static/storageadmin/js/templates/setup/system.jst
+++ b/src/rockstor/storageadmin/static/storageadmin/js/templates/setup/system.jst
@@ -37,7 +37,7 @@
         <div class="form-group">
           <label class="control-label" for="hostname">Appliance Hostname<span class="required"> *</span></label>
           <div class="controls">
-            <input type="text" name="hostname" id="hostname" value="RockStor">
+            <input type="text" name="hostname" id="hostname" value="Rockstor">
           </div>
         </div>
       </form>
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/users/add_user.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/users/add_user.jst
index 51e12a7fd..b1059091a 100644
--- a/src/rockstor/storageadmin/static/storageadmin/js/templates/users/add_user.jst
+++ b/src/rockstor/storageadmin/static/storageadmin/js/templates/users/add_user.jst
@@ -59,7 +59,7 @@
 		{{else}}
                 <input class="checkbox-inline" type="checkbox" id="admin" name="admin" placeholder="Admin">
 		{{/if}}
-		Allow this user to login to RockStor Web UI?
+		Allow this user to login to the Rockstor Web-UI?
               </label>
             </div>
 	  </div>
diff --git a/src/rockstor/storageadmin/templates/storageadmin/login.html b/src/rockstor/storageadmin/templates/storageadmin/login.html
index 6917ac6b8..e8c0b1950 100644
--- a/src/rockstor/storageadmin/templates/storageadmin/login.html
+++ b/src/rockstor/storageadmin/templates/storageadmin/login.html
@@ -23,7 +23,7 @@
 
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>RockStor: Store Smartly {% block title %}{% endblock %}</title>
+    <title>Rockstor: Store Smartly {% block title %}{% endblock %}</title>
     <link href="/static/storageadmin/css/bootstrap.min.css" rel="stylesheet">
     <link href="/static/storageadmin/css/style.css" rel="stylesheet">
     <link rel="icon" type="image/png" href="/static/storageadmin/img/favicon.ico">
diff --git a/src/rockstor/storageadmin/templates/storageadmin/setup.html b/src/rockstor/storageadmin/templates/storageadmin/setup.html
index a272d25f2..2b234d944 100644
--- a/src/rockstor/storageadmin/templates/storageadmin/setup.html
+++ b/src/rockstor/storageadmin/templates/storageadmin/setup.html
@@ -24,7 +24,7 @@
 
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>RockStor | {% block title %}{% endblock %}</title>
+    <title>Rockstor | {% block title %}{% endblock %}</title>
     <link href="/static/storageadmin/css/bootstrap.min.css" rel="stylesheet">
     <link href="/static/storageadmin/css/style.css" rel="stylesheet">
 
diff --git a/src/rockstor/storageadmin/templates/storageadmin/user_create.html b/src/rockstor/storageadmin/templates/storageadmin/user_create.html
index fac4f48fb..53273deda 100644
--- a/src/rockstor/storageadmin/templates/storageadmin/user_create.html
+++ b/src/rockstor/storageadmin/templates/storageadmin/user_create.html
@@ -21,7 +21,7 @@
     */
     -->
     <meta charset="utf-8">
-    <title>RockStor: Store Smartly {% block title %}{% endblock %}</title>
+    <title>Rockstor: Store Smartly {% block title %}{% endblock %}</title>
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/style.css" rel="stylesheet">
 
@@ -49,7 +49,7 @@ <h2>Store Smartly.</h2>
                 </div>
 
                 <div class="span4">
-                  Create a user to begin using RockStor.
+                  Create a user to begin using Rockstor.
                   <form id="login_form" method="post" action="/user_create_login" name="aform" target="_top" class="form-horizontal">
                     <div id="login-box">
                       {% csrf_token %}