diff --git a/app/views/admin/hosts/_host.html.erb b/app/views/admin/hosts/_host.html.erb
index e798d74..f1adb47 100644
--- a/app/views/admin/hosts/_host.html.erb
+++ b/app/views/admin/hosts/_host.html.erb
@@ -1,13 +1,13 @@
 <tr>
   <td><%= host.name %></td>
   <td><%= host.fqdn %></td>
   <td><%= host.first_user.display_name %></td>
   <td><%= host.port %></td>
   <td><%= I18n.l(host.created_at, format: :long) %></td>
   <td>
     <%= link_to 'Verify', verify_admin_host_path(host), method: :post,
       class: "btn btn-success", role: "button",
-      data: { confirm: "Host #{host.name} will be ready to be dispatched to Bacula" }
+      data: { confirm: "Client #{host.name} will be ready to be dispatched to Bacula" }
     %>
   </td>
 </tr>
diff --git a/app/views/admin/hosts/unverified.html.erb b/app/views/admin/hosts/unverified.html.erb
index 7388e52..eeb269e 100644
--- a/app/views/admin/hosts/unverified.html.erb
+++ b/app/views/admin/hosts/unverified.html.erb
@@ -1,24 +1,24 @@
-<h1>Unverified Hosts</h1>
+<h1>Unverified Clients</h1>
 
 <% if @hosts.empty? %>
-  <h3>There are no hosts pending for approval</h3>
+  <h3>There are no clients pending for approval</h3>
 <% else %>
   <div class="table-responsive">
     <table class="table table-striped table-bordered table-condensed">
       <thead>
         <tr>
           <th>Name</th>
           <th>FQDN</th>
           <th>User</th>
           <th>Port</th>
           <th>Created At</th>
           <th>Actions</th>
         </tr>
       </thead>
 
       <tbody>
         <%= render partial: 'host', collection: @hosts %>
       </tbody>
     </table>
   </div>
 <% end %>
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index 57f645b..6957523 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -1,37 +1,37 @@
 <div class="row right">
   <%= link_to new_admin_user_path, class: "btn btn-default", role: "button" do %>
     <label class="glyphicon glyphicon-plus text-primary"></label>
     New Admin
   <% end %>
 </div>
 
 <h1>Users</h1>
 
 <div class="row">
   <div class="col-xs-12">
     <div class="table-responsive">
       <table class="table table-striped table-bordered table-condensed">
         <thead>
           <tr>
             <th>id</th>
             <th>Username</th>
             <th>Email</th>
             <th>User type</th>
             <th>Created at</th>
             <th>Last login at</th>
             <th>Clients</th>
-            <th>Unverified hosts</th>
-            <th>Pending hosts</th>
+            <th>Unverified clients</th>
+            <th>Pending clients</th>
             <th>Admin</th>
             <th>Actions</th>
             <th>Ban</th>
           </tr>
         </thead>
 
         <tbody>
           <%= render partial: 'user', collection: @users %>
         </tbody>
       </table>
     </div>
   </div>
 </div>
diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb
index 1ba4b69..e4c6e0d 100644
--- a/app/views/admin/users/show.html.erb
+++ b/app/views/admin/users/show.html.erb
@@ -1,87 +1,87 @@
 <%= render partial: 'header' %>
 
 <div class="col-xs-5">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h2>User details</h2>
     </div>
 
     <br/>
 
     <div class="table-responsive">
       <table class="table table-striped table-bordered table-condensed">
         <tr>
           <td><b>Username</b></td>
           <td><%= @user.username %></td>
         </tr>
         <tr>
           <td><b>Email</b></td>
           <td><%= @user.email %></td>
         </tr>
         <tr>
           <td><b>User Type</b></td>
           <td><%= @user.user_type %></td>
         </tr>
         <tr>
           <td><b>Created At</b></td>
           <td><%= I18n.l(@user.created_at, format: :short) rescue '-' %></td>
         </tr>
         <tr>
           <td><b>Login At</b></td>
           <td><%= I18n.l(@user.login_at, format: :short) rescue '-' %></td>
         </tr>
         <tr>
           <td><b>Clients</b></td>
           <td><%= inline_list @user.baculized_hosts %></td>
         </tr>
         <tr>
-          <td><b>Pending Hosts</b></td>
+          <td><b>Pending Clients</b></td>
           <td><%= inline_list @user.non_baculized_hosts %></td>
         </tr>
         <% if @user.institutional? %>
           <tr>
-            <td><b>Unverified Hosts</b></td>
+            <td><b>Unverified Clients</b></td>
             <td><%= inline_list @user.unverified_hosts %></td>
           </tr>
         <% end %>
       </table>
     </div>
   </div>
   <% if @user.editable? %>
     <%= link_to edit_admin_user_path(@user), class: 'btn btn-primary' do %>
       <label class="glyphicon glyphicon-ok-edit text-success"></label>
       Edit User
     <% end %>
   <% end %>
   <% if @user.enabled? %>
     <%= link_to ban_admin_user_path(@user), method: :patch, class: 'btn btn-default',
                 data: { confirm: "User #{@user.username} will be banned" } do %>
       <label class="glyphicon glyphicon-ban-circle text-danger"></label>
       Ban User
     <% end %>
   <% else %>
     <%= link_to unban_admin_user_path(@user), method: :patch, class: 'btn btn-default',
                 data: { confirm: "User #{@user.username} will be unbanned" } do %>
       <label class="glyphicon glyphicon-ok-circle text-success"></label>
       Unban User
     <% end %>
   <% end %>
 
   <% if !@user.admin? %>
     <% if @user.has_admin_access? %>
       <%= link_to revoke_admin_admin_user_path(@user), method: :patch, class: 'btn btn-default',
-                  data: { confirm: "User #{@user.username} will be NOT an admin from now on" } do %>
+                  data: { confirm: "User #{@user.username} will NOT be an admin from now on" } do %>
         <label class="glyphicon glyphicon-ban-circle text-danger"></label>
         Revoke Admin
       <% end %>
     <% else %>
       <%= link_to grant_admin_admin_user_path(@user), method: :patch, class: 'btn btn-default',
-                  data: { confirm: "User #{@user.username} will an admin from now on" } do %>
+                  data: { confirm: "User #{@user.username} will be an admin from now on" } do %>
         <label class="glyphicon glyphicon-ok-circle text-success"></label>
         Grant Admin
       <% end %>
     <% end %>
   <% end %>
 
   <%= link_to 'Back to users', admin_users_path, class: 'right' %>
 </div>
diff --git a/app/views/clients/index.html.erb b/app/views/clients/index.html.erb
index 66315a0..191f1c2 100644
--- a/app/views/clients/index.html.erb
+++ b/app/views/clients/index.html.erb
@@ -1,54 +1,54 @@
 <div class="row right">
   <%= link_to 'New Client', new_host_path, class: 'btn btn-primary', role: 'button' %>
 </div>
 
-<h1>My Bacula Clients</h1>
+<h1>My Clients</h1>
 
 <div class="table-responsive">
   <table class="table table-striped table-bordered table-condensed">
     <thead>
       <tr>
         <th>Name</th>
         <th>Uname</th>
         <th>Active Jobs</th>
         <th>Last Backup</th>
         <th>File Ret. (days)</th>
         <th>Job Ret. (days)</th>
         <th>Space Used</th>
         <th>Quota</th>
         <th>Space Used %</th>
         <th>Files</th>
       </tr>
     </thead>
 
     <tbody>
       <%= render partial: 'client', collection: @clients %>
     </tbody>
   </table>
 </div>
 
 <% if @hosts.any? %>
-  <h1>My Pending Hosts</h1>
+  <h1>My Pending Clients</h1>
 
   <div class="table-responsive">
     <table class="table table-striped table-bordered table-condensed">
       <thead>
         <tr>
           <th>Name</th>
           <th>FQDN</th>
           <th>Port</th>
           <th>Password</th>
           <th>FileRetention (days)</th>
           <th>JobRetention (days)</th>
           <th>Verified</th>
           <th>Created At</th>
         </tr>
       </thead>
       <tbody>
         <%= render partial: 'hosts/host', collection: @hosts %>
       </tbody>
     </table>
   </div>
 <% end %>
 
 <%= render partial: 'client_graphs', locals: { path: clients_path } %>
diff --git a/app/views/clients/restore.html.erb b/app/views/clients/restore.html.erb
index bb5bea1..d2a23f5 100644
--- a/app/views/clients/restore.html.erb
+++ b/app/views/clients/restore.html.erb
@@ -1,65 +1,65 @@
 <div class="row">
   <div class="col-xs-4">
     <% if @client.is_backed_up? %>
       <div class="panel panel-default">
         <div class="panel-heading">
           <h3>Restore files for "<%= @client.name %>"</h3>
         </div>
 
         <br />
 
         <%= bootstrap_form_tag(url: run_restore_client_path(@client), remote: true,
                                layout: :horizontal, label_col: 'col-xs-4', control_col: 'col-xs-7',
                                html: { id: 'basic-form' } ) do |f| %>
           <div class="form-group">
             <label class="col-xs-4 control-label"></label>
             <div class="col-xs-7">
               <p class="form-control-static">
                 Restore to most recent backup by leaving date and time blank
               </p>
             </div>
           </div>
           <%= f.text_field :restore_date %>
           <%= f.time_select :restore_time, ignore_date: true, minute_step: 30, prompt: true %>
 
           <%= f.select(:fileset,
                        options_from_collection_for_select(@client.file_sets, :id, :file_set)) %>
 
           <%= f.text_field :restore_location, placeholder: '/tmp/bacula_restore' %>
 
           <div class="row">
             <div class="col-xs-5 col-xs-offset-6 text-right">
               <%= f.submit 'Select Specific Files', id: 'select-files', class: 'btn btn-primary'  %>
             </div>
           </div>
           <br />
           <div class="row">
             <div class="col-xs-3 col-xs-offset-8">
               <%= f.submit 'Restore All Files', class: 'btn btn-warning text-right',
                   data: { confirm: "This will restore all your files" }
               %>
             </div>
           </div>
         <% end %>
         </br>
       </div>
     <% else %>
       <div class="alert alert-warning">
-        <p>Can not issue a restore for this host. It has no successful backups</p>
+        <p>Can not issue a restore for this client. It does not have any successful backups</p>
       </div>
     <% end %>
 
     <%= link_to 'Back to client', client_path(@client), class: 'btn btn-danger', role: 'button' %>
   </div>
   <%= render partial: 'file_selector' %>
 </div>
 <script type="text/javascript">
   <% min_date, max_date = @client.backup_enabled_datetime_range %>
   var minDate = '<%= min_date %>';
   var maxDate = '<%= max_date %>';
   $('#restore_date').datepicker({
     dateFormat: 'yy-mm-dd',
     minDate: minDate,
     maxDate: maxDate
   });
 </script>
diff --git a/app/views/hosts/_form.html.erb b/app/views/hosts/_form.html.erb
index a3da61d..ae8d211 100644
--- a/app/views/hosts/_form.html.erb
+++ b/app/views/hosts/_form.html.erb
@@ -1,32 +1,32 @@
 <%= bootstrap_form_for(@host, layout: :horizontal,
                        label_col: 'col-xs-3', control_col: 'col-xs-8') do |f| %>
   <div>
 
     <% if current_user.needs_host_list? %>
       <%= f.select :fqdn, options_for_select(@hosts_of_user, @host.fqdn), {},
                    disabled: @host.persisted? %>
     <% else %>
       <%= f.text_field :fqdn, disabled: @host.persisted? %>
     <% end %>
     <%= f.password_field :password, required: true, value: @host.password %>
     <%= f.number_field :port, min: 1 %>
     <% emails = (@host.users.pluck(:email) + @host.email_recipients).uniq.select(&:present?) %>
     <%= f.select :email_recipients, options_for_select(emails, @host.email_recipients), {},
                  multiple: true %>
   </div>
 
   <div class="form-group">
     <div class="col-xs-offset-3 col-xs-2">
       <%= f.submit class: 'btn btn-success' %>
     </div>
     <% if current_user.vima? %>
       <div class="col-xs-offset-3 col-xs-2">
         <%= link_to fetch_vima_hosts_path, role: :button, class: 'btn btn-default' do %>
           <label class="glyphicon glyphicon-refresh text-primary"></label>
-          Fetch Hosts
+          Fetch Clients
         <% end %>
       </div>
     <% end %>
   </div>
 
 <% end %>
diff --git a/app/views/hosts/edit.html.erb b/app/views/hosts/edit.html.erb
index 11bc55e..c9cc1b6 100644
--- a/app/views/hosts/edit.html.erb
+++ b/app/views/hosts/edit.html.erb
@@ -1,7 +1,7 @@
-<h1>Edit Host <%= @host.name %></h1>
+<h1>Edit Client <%= @host.name %></h1>
 
 <div class="container graybox">
   <%= render 'form' %>
 </div>
 
 <%= link_to 'Back', host_path(@host) %>
diff --git a/app/views/hosts/new.html.erb b/app/views/hosts/new.html.erb
index bcd7bbd..c2309b4 100644
--- a/app/views/hosts/new.html.erb
+++ b/app/views/hosts/new.html.erb
@@ -1,13 +1,13 @@
 <div class="row">
   <div class="col-xs-4">
     <div class="panel panel-default">
       <div class="panel-heading">
-        <h3>New Host</h3>
+        <h3>New Client</h3>
       </div>
       <br />
       <%= render 'form' %>
     </div>
   </div>
 </div>
 
 <%= link_to 'Back', clients_path %>
diff --git a/app/views/jobs/_job_details.html.erb b/app/views/jobs/_job_details.html.erb
index 83db2e0..8919559 100644
--- a/app/views/jobs/_job_details.html.erb
+++ b/app/views/jobs/_job_details.html.erb
@@ -1,51 +1,51 @@
 <div class="col-xs-12">
   <div class="table-responsive">
     <table class="table table-striped table-bordered table-condensed">
       <tr>
         <td><b>Name</b></td>
         <td><%= @job.name %></td>
       </tr>
       <tr>
         <td><b>Type</b></td>
         <td><%= @job.job_type %></td>
       </tr>
       <tr>
-        <td><b>Host</b></td>
+        <td><b>Client</b></td>
         <td><%= @host.name %></td>
       </tr>
       <tr>
         <td><b>Fileset</b></td>
         <td><pre><%= @job.fileset.to_bacula_config_array.join("\n") %></pre></td>
       </tr>
       <% if @job.restore? %>
         <tr>
           <td><b>Restore Location</b></td>
           <td><%= @job.restore_location %></td>
         </tr>
       <% else %>
         <tr>
           <td><b>Schedule</b></td>
           <td>
             <pre><%= @job.schedule.to_bacula_config_array.join("\n") %></pre>
           </td>
         </tr>
       <% end %>
       <tr>
         <td><b>Client Run Before Job</b></td>
         <td><%= @job.client_before_run_file %></td>
       </tr>
       <tr>
         <td><b>Client Run After Job</b></td>
         <td><%= @job.client_after_run_file %></td>
       </tr>
       <tr>
         <td><b>Created</b></td>
         <td><%= I18n.l(@job.created_at, format: :long) %></td>
       </tr>
       <tr>
         <td><b>Enabled</b></td>
         <td><%= @job.enabled_human %></td>
       </tr>
     </table>
   </div>
 </div>
diff --git a/app/views/shared/_admin.html.erb b/app/views/shared/_admin.html.erb
index 0ff754f..f234d75 100644
--- a/app/views/shared/_admin.html.erb
+++ b/app/views/shared/_admin.html.erb
@@ -1,42 +1,42 @@
 <ul class="nav navbar-nav navbar-right">
   <%= content_tag(:li, active_class(admin_path)) do %>
     <%= link_to 'Admin', admin_path %>
   <% end %>
   <%= content_tag(:li, active_class(admin_clients_path, true)) do %>
     <%= link_to 'Clients', admin_clients_path %>
   <% end %>
   <%= content_tag(:li, active_class(unverified_admin_hosts_path, true)) do %>
-    <%= link_to 'Hosts', unverified_admin_hosts_path %>
+    <%= link_to 'Unverified Clients', unverified_admin_hosts_path %>
   <% end %>
   <%= content_tag(:li, { class: "dropdown #{active_class(admin_users_path)[:class]}" }) do %>
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
       Users <span class="caret"></span>
     </a>
     <ul class="dropdown-menu">
       <li>
         <%= link_to 'All Users', admin_users_path %>
       </li>
       <li class="divider"></li>
       <li>
         <%= link_to 'ViMa Users', admin_users_path(type: :vima) %>
       </li>
       <li>
         <%= link_to 'Institutional Users', admin_users_path(type: :institutional) %>
       </li>
       <li>
         <%= link_to 'Admins', admin_users_path(type: :admin) %>
       </li>
       <li>
     </ul>
   <% end %>
   <%= content_tag(:li, active_class(admin_faqs_path)) do %>
     <%= link_to 'FAQ', admin_faqs_path %>
   <% end %>
   <%= content_tag(:li, active_class(admin_pools_path)) do %>
     <%= link_to 'Pools', admin_pools_path %>
   <% end %>
   <%= content_tag(:li, active_class(admin_settings_path)) do %>
     <%= link_to 'Settings', admin_settings_path %>
   <% end %>
 </ul>
 
diff --git a/app/views/user_mailer/notify_admin.text.erb b/app/views/user_mailer/notify_admin.text.erb
index 96f84fe..0653738 100644
--- a/app/views/user_mailer/notify_admin.text.erb
+++ b/app/views/user_mailer/notify_admin.text.erb
@@ -1,9 +1,9 @@
-New Host pending admin approval.
+New Client pending admin approval.
 
 user: <%= @user.username %> <%= admin_user_url(@user.id) %>
-host <%= @host %>
+client: <%= @host %>
 
 <%= unverified_admin_hosts_url %>
 
 ---------
 Archiving
diff --git a/app/views/user_mailer/notify_for_verification.text.erb b/app/views/user_mailer/notify_for_verification.text.erb
index e45e2ac..d0e8158 100644
--- a/app/views/user_mailer/notify_for_verification.text.erb
+++ b/app/views/user_mailer/notify_for_verification.text.erb
@@ -1,6 +1,6 @@
-Host <%= @host %> is approved by an admin.
+Client <%= @host %> is approved by an admin.
 
 You can now start scheduling your backups.
 
 ---------
 Archiving
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index d62dc44..f976052 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,64 +1,64 @@
 <div class="col-xs-5">
   <div class="panel panel-default">
     <div class="panel-heading">
       <h2>User details</h2>
     </div>
 
     <br/>
 
     <div class="table-responsive">
       <table class="table table-striped table-bordered table-condensed">
         <tr>
           <td><b>Username</b></td>
           <td><%= current_user.username %></td>
         </tr>
         <tr>
           <td><b>Email</b></td>
           <td><%= current_user.email %></td>
         </tr>
         <tr>
           <td><b>User Type</b></td>
           <td><%= current_user.user_type %></td>
         </tr>
         <tr>
           <td><b>Created At</b></td>
           <td><%= I18n.l(current_user.created_at, format: :short) rescue '-' %></td>
         </tr>
         <tr>
           <td><b>Login At</b></td>
           <td><%= I18n.l(current_user.login_at, format: :short) rescue '-' %></td>
         </tr>
         <tr>
           <td><b>Clients</b></td>
           <td><%= inline_list current_user.baculized_hosts %></td>
         </tr>
         <tr>
-          <td><b>Pending Hosts</b></td>
+          <td><b>Pending Clients</b></td>
           <td><%= inline_list current_user.non_baculized_hosts %></td>
         </tr>
         <% if current_user.institutional? %>
           <tr>
-            <td><b>Unverified Hosts</b></td>
+            <td><b>Unverified Clients</b></td>
             <td><%= inline_list current_user.unverified_hosts %></td>
           </tr>
         <% end %>
         <tr>
           <td><b>Authentication Token</b></td>
           <td><%= current_user.token %></td>
         </tr>
       </table>
     </div>
   </div>
 
   <%= link_to generate_token_user_path(current_user), method: :patch, class: 'btn btn-primary' do %>
     <label class="glyphicon glyphicon-cog"></label>
     Generate Token
   <% end %>
 
   <% if current_user.admin? %>
     <%= link_to edit_admin_user_path(current_user), class: 'btn btn-primary' do %>
       <label class="glyphicon glyphicon-ok-edit text-success"></label>
       Edit User
     <% end %>
   <% end %>
 </div>