Merge "chg: adjust wording and use of uppercase on Manager.templ"