From d531652aec0342088ef471c7332bb7c78c140000 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Mon, 16 Nov 2020 14:57:42 -0500
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20page-title=20?=
 =?UTF-8?q?syntax=20and=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/templates/account/change-password.hbs |  2 +-
 ui/core/app/templates/application.hbs         |  3 +-
 ui/core/app/templates/scopes/scope.hbs        | 12 ++--
 .../templates/scopes/scope/auth-methods.hbs   |  2 +-
 .../scopes/scope/auth-methods/auth-method.hbs |  2 +-
 .../auth-methods/auth-method/accounts.hbs     |  2 +-
 .../auth-method/accounts/account.hbs          |  2 +-
 .../accounts/account/set-password.hbs         |  2 +-
 .../scopes/scope/auth-methods/new.hbs         |  4 +-
 .../templates/scopes/scope/authenticate.hbs   |  2 +-
 ui/core/app/templates/scopes/scope/error.hbs  |  2 +-
 ui/core/app/templates/scopes/scope/groups.hbs |  2 +-
 .../templates/scopes/scope/groups/group.hbs   |  2 +-
 .../scopes/scope/groups/group/add-members.hbs |  2 +-
 .../scopes/scope/groups/group/members.hbs     |  2 +-
 .../app/templates/scopes/scope/groups/new.hbs |  2 +-
 .../templates/scopes/scope/host-catalogs.hbs  |  2 +-
 .../scope/host-catalogs/host-catalog.hbs      |  2 +-
 .../host-catalogs/host-catalog/host-sets.hbs  |  2 +-
 .../host-catalog/host-sets/host-set.hbs       |  2 +-
 .../host-sets/host-set/add-hosts.hbs          |  2 +-
 .../host-set/create-and-add-host.hbs          |  2 +-
 .../host-catalog/host-sets/host-set/hosts.hbs |  2 +-
 .../host-catalog/host-sets/new.hbs            |  2 +-
 .../host-catalogs/host-catalog/hosts.hbs      |  2 +-
 .../host-catalogs/host-catalog/hosts/host.hbs |  2 +-
 .../host-catalogs/host-catalog/hosts/new.hbs  |  2 +-
 .../scopes/scope/host-catalogs/new.hbs        |  2 +-
 ui/core/app/templates/scopes/scope/new.hbs    |  2 +-
 ui/core/app/templates/scopes/scope/roles.hbs  |  2 +-
 .../app/templates/scopes/scope/roles/new.hbs  |  2 +-
 .../app/templates/scopes/scope/roles/role.hbs |  2 +-
 .../scope/roles/role/add-principals.hbs       |  2 +-
 .../scopes/scope/roles/role/grants.hbs        |  2 +-
 .../scopes/scope/roles/role/principals.hbs    |  4 +-
 ui/core/app/templates/scopes/scope/scopes.hbs |  4 +-
 .../app/templates/scopes/scope/sessions.hbs   |  2 +-
 .../app/templates/scopes/scope/targets.hbs    |  2 +-
 .../templates/scopes/scope/targets/new.hbs    |  2 +-
 .../templates/scopes/scope/targets/target.hbs |  2 +-
 .../scope/targets/target/add-host-sets.hbs    |  2 +-
 .../scopes/scope/targets/target/host-sets.hbs |  2 +-
 ui/core/app/templates/scopes/scope/users.hbs  |  2 +-
 .../app/templates/scopes/scope/users/new.hbs  |  2 +-
 .../app/templates/scopes/scope/users/user.hbs |  2 +-
 .../scopes/scope/users/user/accounts.hbs      |  2 +-
 .../scopes/scope/users/user/add-accounts.hbs  |  2 +-
 ui/core/package.json                          |  2 +-
 yarn.lock                                     | 57 ++-----------------
 49 files changed, 62 insertions(+), 108 deletions(-)

diff --git a/ui/core/app/templates/account/change-password.hbs b/ui/core/app/templates/account/change-password.hbs
index 5fc40fb52..4f5dc25fb 100644
--- a/ui/core/app/templates/account/change-password.hbs
+++ b/ui/core/app/templates/account/change-password.hbs
@@ -1,4 +1,4 @@
-{{title (t "actions.change-password")}}
+{{page-title (t "actions.change-password")}}
 
 <Rose::Layout::Sidebar as |sidebarLayout|>
   <sidebarLayout.body>
diff --git a/ui/core/app/templates/application.hbs b/ui/core/app/templates/application.hbs
index 4602a5bd3..2b9175a76 100644
--- a/ui/core/app/templates/application.hbs
+++ b/ui/core/app/templates/application.hbs
@@ -1,5 +1,4 @@
-<HeadLayout />
-{{title (app-name)}}
+{{page-title (app-name)}}
 
 <Rose::Layout::Global as |layout|>
 
diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs
index 278755d24..07943d64f 100644
--- a/ui/core/app/templates/scopes/scope.hbs
+++ b/ui/core/app/templates/scopes/scope.hbs
@@ -1,13 +1,13 @@
 {{#if @model.isOrg}}
-  {{title (t "resources.org.title_plural") }}
-  {{title @model.displayName}}
+  {{page-title (t "resources.org.title_plural") }}
+  {{page-title @model.displayName}}
 {{/if}}
 
 {{#if @model.isProject}}
-  {{title (t "resources.org.title_plural") }}
-  {{title this.scopes.selectedOrg.displayName}}
-  {{title (t "resources.project.title_plural") }}
-  {{title @model.displayName}}
+  {{page-title (t "resources.org.title_plural") }}
+  {{page-title this.scopes.selectedOrg.displayName}}
+  {{page-title (t "resources.project.title_plural") }}
+  {{page-title @model.displayName}}
 {{/if}}
 
 <Rose::Layout::Sidebar as |sidebarLayout|>
diff --git a/ui/core/app/templates/scopes/scope/auth-methods.hbs b/ui/core/app/templates/scopes/scope/auth-methods.hbs
index fb4d78b4a..7dfce0f30 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.auth-method.title_plural")}}
+{{page-title (t "resources.auth-method.title_plural")}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method.hbs
index 2a878ff51..016b284ad 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method.hbs
@@ -1,4 +1,4 @@
-{{title @model.displayName}}
+{{page-title @model.displayName}}
 
 <Rose::Layout::Page as |page|>
 
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs
index fe5b0c9ee..6ec5213a6 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs
@@ -1,3 +1,3 @@
-{{title (t 'resources.account.title_plural')}}
+{{page-title (t 'resources.account.title_plural')}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs
index d66e83390..fdb14a71f 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs
@@ -1,3 +1,3 @@
-{{title @model.displayName}}
+{{page-title @model.displayName}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
index 315877a6f..7d9679ccc 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs
@@ -1,4 +1,4 @@
-{{title (t 'actions.set-password')}}
+{{page-title (t 'actions.set-password')}}
 
 <Form::Account::Password::SetPassword
   @model={{@model}}
diff --git a/ui/core/app/templates/scopes/scope/auth-methods/new.hbs b/ui/core/app/templates/scopes/scope/auth-methods/new.hbs
index 44c4f35d6..cb1f2e863 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/new.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/new.hbs
@@ -1,4 +1,4 @@
-{{title (t "titles.new")}}
+{{page-title (t "titles.new")}}
 
 <Rose::Layout::Page as |page|>
   <page.header>
@@ -16,4 +16,4 @@
       @cancel={{route-action "cancel" @model}}
     />
   </page.body>
-</Rose::Layout::Page>
\ No newline at end of file
+</Rose::Layout::Page>
diff --git a/ui/core/app/templates/scopes/scope/authenticate.hbs b/ui/core/app/templates/scopes/scope/authenticate.hbs
index ccabf58d4..68d98634c 100644
--- a/ui/core/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/core/app/templates/scopes/scope/authenticate.hbs
@@ -1,4 +1,4 @@
-{{title (t "actions.authenticate")}}
+{{page-title (t "actions.authenticate")}}
 
 <Rose::Layout::Centered>
   <Rose::Layout::Page as |page|>
diff --git a/ui/core/app/templates/scopes/scope/error.hbs b/ui/core/app/templates/scopes/scope/error.hbs
index 70b0ce6ad..4b50d06f4 100644
--- a/ui/core/app/templates/scopes/scope/error.hbs
+++ b/ui/core/app/templates/scopes/scope/error.hbs
@@ -1,4 +1,4 @@
-{{title (t "errors.generic.title") }}
+{{page-title (t "errors.generic.title") }}
 
 <Rose::Layout::Centered>
   {{#each @model.errors as |error|}}
diff --git a/ui/core/app/templates/scopes/scope/groups.hbs b/ui/core/app/templates/scopes/scope/groups.hbs
index 14f6b8561..0313da973 100644
--- a/ui/core/app/templates/scopes/scope/groups.hbs
+++ b/ui/core/app/templates/scopes/scope/groups.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.group.title_plural")}}
+{{page-title (t "resources.group.title_plural")}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/groups/group.hbs b/ui/core/app/templates/scopes/scope/groups/group.hbs
index 2a878ff51..016b284ad 100644
--- a/ui/core/app/templates/scopes/scope/groups/group.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group.hbs
@@ -1,4 +1,4 @@
-{{title @model.displayName}}
+{{page-title @model.displayName}}
 
 <Rose::Layout::Page as |page|>
 
diff --git a/ui/core/app/templates/scopes/scope/groups/group/add-members.hbs b/ui/core/app/templates/scopes/scope/groups/group/add-members.hbs
index 0981d22d7..65383a92f 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/add-members.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/add-members.hbs
@@ -1,4 +1,4 @@
-{{title (t "resources.group.messages.add-members.title")}}
+{{page-title (t "resources.group.messages.add-members.title")}}
 
 <Form::Group::AddMembers
   @model={{@model.group}}
diff --git a/ui/core/app/templates/scopes/scope/groups/group/members.hbs b/ui/core/app/templates/scopes/scope/groups/group/members.hbs
index 58a6383c6..73dbf114c 100644
--- a/ui/core/app/templates/scopes/scope/groups/group/members.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/group/members.hbs
@@ -1,4 +1,4 @@
-{{title (t 'resources.group.messages.members.title')}}
+{{page-title (t 'resources.group.messages.members.title')}}
 
 {{#if @model.members}}
 
diff --git a/ui/core/app/templates/scopes/scope/groups/new.hbs b/ui/core/app/templates/scopes/scope/groups/new.hbs
index b8f782b23..0f1c5c13a 100644
--- a/ui/core/app/templates/scopes/scope/groups/new.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/new.hbs
@@ -1,4 +1,4 @@
-{{title (t 'titles.new')}}
+{{page-title (t 'titles.new')}}
 
 <Rose::Layout::Page as |page|>
 
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs.hbs b/ui/core/app/templates/scopes/scope/host-catalogs.hbs
index abbb6702e..014ec91ff 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.host-catalog.title_plural")}}
+{{page-title (t "resources.host-catalog.title_plural")}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog.hbs b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog.hbs
index 271a98d73..03cf768df 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog.hbs
@@ -1,4 +1,4 @@
-{{title @model.displayName}}
+{{page-title @model.displayName}}
 
 <Rose::Layout::Page as |page|>
 
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets.hbs b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets.hbs
index 031f2510b..7687e031a 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.host-set.title_plural")}}
+{{page-title (t "resources.host-set.title_plural")}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.hbs b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.hbs
index d66e83390..fdb14a71f 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.hbs
@@ -1,3 +1,3 @@
-{{title @model.displayName}}
+{{page-title @model.displayName}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs
index b185f9550..4b84cd7f8 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs
@@ -1,4 +1,4 @@
-{{title (t "resources.host-set.actions.add-hosts")}}
+{{page-title (t "resources.host-set.actions.add-hosts")}}
 
 <Form::HostSet::AddHosts
   @model={{@model.hostSet}}
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.hbs b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.hbs
index 3e7ed3f29..1adbdaca4 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.hbs
@@ -1,4 +1,4 @@
-{{title (t 'resources.host-set.actions.create-and-add-host')}}
+{{page-title (t 'resources.host-set.actions.create-and-add-host')}}
 
 <Form::Host
   @model={{@model}}
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
index 8eacc846b..d6a1dfa5f 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
@@ -1,4 +1,4 @@
-{{title (t "resources.host.title_plural")}}
+{{page-title (t "resources.host.title_plural")}}
 
 {{#if @model.hosts}}
 
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs
index bd5a0338c..9dc07bc79 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs
@@ -1,4 +1,4 @@
-{{title (t 'titles.new')}}
+{{page-title (t 'titles.new')}}
 
 <Form::HostSet
   @model={{@model}}
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts.hbs b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts.hbs
index 5e74dd528..450a3c4bf 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.host.title_plural")}}
+{{page-title (t "resources.host.title_plural")}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host.hbs b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host.hbs
index d66e83390..fdb14a71f 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host.hbs
@@ -1,3 +1,3 @@
-{{title @model.displayName}}
+{{page-title @model.displayName}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new.hbs b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new.hbs
index 2e3ec8149..2a3d19cf1 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new.hbs
@@ -1,4 +1,4 @@
-{{title (t 'titles.new')}}
+{{page-title (t 'titles.new')}}
 
 <Form::Host
   @model={{@model}}
diff --git a/ui/core/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/core/app/templates/scopes/scope/host-catalogs/new.hbs
index 641fd3ff9..4e413c5e1 100644
--- a/ui/core/app/templates/scopes/scope/host-catalogs/new.hbs
+++ b/ui/core/app/templates/scopes/scope/host-catalogs/new.hbs
@@ -1,4 +1,4 @@
-{{title (t 'titles.new')}}
+{{page-title (t 'titles.new')}}
 
 <Rose::Layout::Page as |page|>
 
diff --git a/ui/core/app/templates/scopes/scope/new.hbs b/ui/core/app/templates/scopes/scope/new.hbs
index b33c28109..4718f24e8 100644
--- a/ui/core/app/templates/scopes/scope/new.hbs
+++ b/ui/core/app/templates/scopes/scope/new.hbs
@@ -1,4 +1,4 @@
-{{title (t 'titles.new')}}
+{{page-title (t 'titles.new')}}
 
 <Rose::Layout::Page as |page|>
 
diff --git a/ui/core/app/templates/scopes/scope/roles.hbs b/ui/core/app/templates/scopes/scope/roles.hbs
index 05a8f7a37..ad3b5c1c1 100644
--- a/ui/core/app/templates/scopes/scope/roles.hbs
+++ b/ui/core/app/templates/scopes/scope/roles.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.role.title_plural")}}
+{{page-title (t "resources.role.title_plural")}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/roles/new.hbs b/ui/core/app/templates/scopes/scope/roles/new.hbs
index efddd8fb9..0d074a456 100644
--- a/ui/core/app/templates/scopes/scope/roles/new.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/new.hbs
@@ -1,4 +1,4 @@
-{{title (t 'titles.new')}}
+{{page-title (t 'titles.new')}}
 
 <Rose::Layout::Page as |page|>
   <page.breadcrumbs>
diff --git a/ui/core/app/templates/scopes/scope/roles/role.hbs b/ui/core/app/templates/scopes/scope/roles/role.hbs
index 271a98d73..03cf768df 100644
--- a/ui/core/app/templates/scopes/scope/roles/role.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role.hbs
@@ -1,4 +1,4 @@
-{{title @model.displayName}}
+{{page-title @model.displayName}}
 
 <Rose::Layout::Page as |page|>
 
diff --git a/ui/core/app/templates/scopes/scope/roles/role/add-principals.hbs b/ui/core/app/templates/scopes/scope/roles/role/add-principals.hbs
index afe17ef59..b2da50ea6 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/add-principals.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/add-principals.hbs
@@ -1,4 +1,4 @@
-{{title (t "resources.role.principal.actions.add-principals")}}
+{{page-title (t "resources.role.principal.actions.add-principals")}}
 
 <Form::Role::AddPrincipals
   @model={{@model.role}}
diff --git a/ui/core/app/templates/scopes/scope/roles/role/grants.hbs b/ui/core/app/templates/scopes/scope/roles/role/grants.hbs
index 9551c3614..cdf0922c7 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/grants.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/grants.hbs
@@ -1,4 +1,4 @@
-{{title (t 'resources.role.grant.title_plural')}}
+{{page-title (t 'resources.role.grant.title_plural')}}
 
 <Form::Role::Grants
   @model={{@model}}
diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
index 668b93e4f..d601d4475 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
@@ -1,4 +1,4 @@
-{{title (t 'resources.role.principal.title_plural')}}
+{{page-title (t 'resources.role.principal.title_plural')}}
 
 {{#if @model.principals}}
 
@@ -64,4 +64,4 @@
     </Rose::Message>
   </Rose::Layout::Centered>
 
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/ui/core/app/templates/scopes/scope/scopes.hbs b/ui/core/app/templates/scopes/scope/scopes.hbs
index ef0177922..91975612e 100644
--- a/ui/core/app/templates/scopes/scope/scopes.hbs
+++ b/ui/core/app/templates/scopes/scope/scopes.hbs
@@ -1,9 +1,9 @@
 {{#if @model.currentScope.isGlobal}}
-  {{title (t "resources.org.title_plural") }}
+  {{page-title (t "resources.org.title_plural") }}
 {{/if}}
 
 {{#if @model.currentScope.isOrg}}
-  {{title (t "resources.project.title_plural") }}
+  {{page-title (t "resources.project.title_plural") }}
 {{/if}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/sessions.hbs b/ui/core/app/templates/scopes/scope/sessions.hbs
index f7ffb23d4..41222bd30 100644
--- a/ui/core/app/templates/scopes/scope/sessions.hbs
+++ b/ui/core/app/templates/scopes/scope/sessions.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.session.title_plural")}}
+{{page-title (t "resources.session.title_plural")}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/targets.hbs b/ui/core/app/templates/scopes/scope/targets.hbs
index 8b5774916..1cb39a182 100644
--- a/ui/core/app/templates/scopes/scope/targets.hbs
+++ b/ui/core/app/templates/scopes/scope/targets.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.target.title_plural")}}
+{{page-title (t "resources.target.title_plural")}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/targets/new.hbs b/ui/core/app/templates/scopes/scope/targets/new.hbs
index f161f252b..24d1fb28a 100644
--- a/ui/core/app/templates/scopes/scope/targets/new.hbs
+++ b/ui/core/app/templates/scopes/scope/targets/new.hbs
@@ -1,4 +1,4 @@
-{{title (t 'titles.new')}}
+{{page-title (t 'titles.new')}}
 
 <Rose::Layout::Page as |page|>
 
diff --git a/ui/core/app/templates/scopes/scope/targets/target.hbs b/ui/core/app/templates/scopes/scope/targets/target.hbs
index 2a878ff51..016b284ad 100644
--- a/ui/core/app/templates/scopes/scope/targets/target.hbs
+++ b/ui/core/app/templates/scopes/scope/targets/target.hbs
@@ -1,4 +1,4 @@
-{{title @model.displayName}}
+{{page-title @model.displayName}}
 
 <Rose::Layout::Page as |page|>
 
diff --git a/ui/core/app/templates/scopes/scope/targets/target/add-host-sets.hbs b/ui/core/app/templates/scopes/scope/targets/target/add-host-sets.hbs
index e214aa895..450ca7763 100644
--- a/ui/core/app/templates/scopes/scope/targets/target/add-host-sets.hbs
+++ b/ui/core/app/templates/scopes/scope/targets/target/add-host-sets.hbs
@@ -1,4 +1,4 @@
-{{title (t 'resources.target.actions.add-host-sets')}}
+{{page-title (t 'resources.target.actions.add-host-sets')}}
 
 {{#if @model.hostSets}}
   <Form::Target::AddHostSets
diff --git a/ui/core/app/templates/scopes/scope/targets/target/host-sets.hbs b/ui/core/app/templates/scopes/scope/targets/target/host-sets.hbs
index 464dc32e1..84657ce33 100644
--- a/ui/core/app/templates/scopes/scope/targets/target/host-sets.hbs
+++ b/ui/core/app/templates/scopes/scope/targets/target/host-sets.hbs
@@ -1,4 +1,4 @@
-{{title (t "resources.host-set.title_plural")}}
+{{page-title (t "resources.host-set.title_plural")}}
 
 {{#if @model.hostSets}}
 
diff --git a/ui/core/app/templates/scopes/scope/users.hbs b/ui/core/app/templates/scopes/scope/users.hbs
index f6ecdfa99..ebf89e0c7 100644
--- a/ui/core/app/templates/scopes/scope/users.hbs
+++ b/ui/core/app/templates/scopes/scope/users.hbs
@@ -1,3 +1,3 @@
-{{title (t "resources.user.title_plural")}}
+{{page-title (t "resources.user.title_plural")}}
 
 {{outlet}}
diff --git a/ui/core/app/templates/scopes/scope/users/new.hbs b/ui/core/app/templates/scopes/scope/users/new.hbs
index 08e72531c..630e7e547 100644
--- a/ui/core/app/templates/scopes/scope/users/new.hbs
+++ b/ui/core/app/templates/scopes/scope/users/new.hbs
@@ -1,4 +1,4 @@
-{{title (t 'titles.new')}}
+{{page-title (t 'titles.new')}}
 
 <Rose::Layout::Page as |page|>
 
diff --git a/ui/core/app/templates/scopes/scope/users/user.hbs b/ui/core/app/templates/scopes/scope/users/user.hbs
index 2a878ff51..016b284ad 100644
--- a/ui/core/app/templates/scopes/scope/users/user.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user.hbs
@@ -1,4 +1,4 @@
-{{title @model.displayName}}
+{{page-title @model.displayName}}
 
 <Rose::Layout::Page as |page|>
 
diff --git a/ui/core/app/templates/scopes/scope/users/user/accounts.hbs b/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
index 176510da9..46c571982 100644
--- a/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user/accounts.hbs
@@ -1,4 +1,4 @@
-{{title (t 'resources.user.messages.accounts.title')}}
+{{page-title (t 'resources.user.messages.accounts.title')}}
 
 {{#if @model.accounts}}
 
diff --git a/ui/core/app/templates/scopes/scope/users/user/add-accounts.hbs b/ui/core/app/templates/scopes/scope/users/user/add-accounts.hbs
index eea2fb88d..fd8020126 100644
--- a/ui/core/app/templates/scopes/scope/users/user/add-accounts.hbs
+++ b/ui/core/app/templates/scopes/scope/users/user/add-accounts.hbs
@@ -1,4 +1,4 @@
-{{title (t 'resources.user.actions.add-accounts')}}
+{{page-title (t 'resources.user.actions.add-accounts')}}
 
 {{#if @model.accounts}}
   <Form::User::AddAccounts
diff --git a/ui/core/package.json b/ui/core/package.json
index 60689eb7e..edd861aa9 100644
--- a/ui/core/package.json
+++ b/ui/core/package.json
@@ -70,7 +70,7 @@
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-modifier": "^1.0.3",
     "ember-notify": "^6.0.0",
-    "ember-page-title": "^5.2.1",
+    "ember-page-title": "^6.0.3",
     "ember-qunit": "^4.6.0",
     "ember-radio-button": "^2.0.1",
     "ember-resolver": "^8.0.0",
diff --git a/yarn.lock b/yarn.lock
index 523c39154..539aa0ea6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7508,7 +7508,7 @@ debug@~4.1.0:
   dependencies:
     ms "^2.1.1"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -8229,7 +8229,7 @@ ember-cli-babel@7.21.0:
     rimraf "^3.0.1"
     semver "^5.5.0"
 
-ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.2:
+ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.12.0, ember-cli-babel@^6.16.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.2:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz#3f6435fd275172edeff2b634ee7b29ce74318957"
   integrity sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==
@@ -8287,14 +8287,6 @@ ember-cli-get-component-path-option@^1.0.0:
   resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
   integrity sha1-DXtZVVni+QUKvtgE8djv8bCLx3E=
 
-ember-cli-head@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-head/-/ember-cli-head-0.4.1.tgz#28b7ee86439746640834b232a3b34ab1329f3cf3"
-  integrity sha512-MIgshw5nGil7Q/TU4SDRCsgsiA3wPC9WqOig/g1LlHTNXjR4vH7s/ddG7GTfK5Kt4ZQHJEUDXpd/lIbdBkIQ/Q==
-  dependencies:
-    ember-cli-babel "^6.11.0"
-    ember-cli-htmlbars "^2.0.3"
-
 ember-cli-htmlbars-inline-precompile@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-2.1.0.tgz#61b91ff1879d44ae504cadb46fb1f2604995ae08"
@@ -8317,16 +8309,6 @@ ember-cli-htmlbars@^1.1.1:
     json-stable-stringify "^1.0.0"
     strip-bom "^2.0.0"
 
-ember-cli-htmlbars@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.5.tgz#b5a105429a6bce4f7c9c97b667e3b8926e31397f"
-  integrity sha512-3f3PAxdnQ/fhQa8XP/3z4RLRgLHxV8j4Ln75aHbRdemOCjBa048KxL9l+acRLhCulbGQCMnLiIUIC89PAzLrcA==
-  dependencies:
-    broccoli-persistent-filter "^1.4.3"
-    hash-for-dep "^1.2.3"
-    json-stable-stringify "^1.0.0"
-    strip-bom "^3.0.0"
-
 ember-cli-htmlbars@^3.0.0, ember-cli-htmlbars@^3.0.1:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-3.1.0.tgz#87806c2a0bca2ab52d4fb8af8e2215c1ca718a99"
@@ -9070,16 +9052,6 @@ ember-notify@^6.0.0:
     ember-cli-babel "^7.7.3"
     ember-cli-htmlbars "^3.0.1"
 
-ember-page-title@^5.2.1:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-5.2.3.tgz#63b039d70d4a5d7db9c00de5b2108823fb90bb9d"
-  integrity sha512-2ErWCJsTawaKJy7fzZqIsrUTNaNtDgEboiiL4OcqEg2A3gKmuuaDFSWz0w9njFRxWISvfPfRw1df0kpYAr98ng==
-  dependencies:
-    ember-cli-babel "^7.7.3"
-    ember-cli-head "^0.4.0"
-    ember-cli-htmlbars "^3.0.1"
-    ember-copy "^1.0.0"
-
 ember-page-title@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-6.0.3.tgz#6f2f26428ae81262d31520c65c1ce8b336f34839"
@@ -12207,7 +12179,7 @@ import-lazy@^2.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -13904,11 +13876,6 @@ lodash._baseflatten@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -13917,16 +13884,11 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
-lodash._bindcallback@*, lodash._bindcallback@^3.0.0:
+lodash._bindcallback@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
   integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
 
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
-
 lodash._createassigner@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
@@ -13936,19 +13898,12 @@ lodash._createassigner@^3.0.0:
     lodash._isiterateecall "^3.0.0"
     lodash.restparam "^3.0.0"
 
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
   integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
+lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
   integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
@@ -14161,7 +14116,7 @@ lodash.pick@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
   integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
 
-lodash.restparam@*, lodash.restparam@^3.0.0:
+lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
   integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=