From b138cfa92fb9e1ef21bdf9c3baf60735300977d1 Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Wed, 3 May 2017 11:18:10 -0700
Subject: [PATCH 1/3] Adjust UI copy

---
 ui/src/hosts/components/HostsTable.js              | 2 +-
 ui/src/kapacitor/components/KapacitorRules.js      | 6 +++---
 ui/src/kapacitor/components/KapacitorRulesTable.js | 2 +-
 ui/src/kapacitor/components/ValuesSection.js       | 2 +-
 ui/src/side_nav/containers/SideNav.js              | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/src/hosts/components/HostsTable.js b/ui/src/hosts/components/HostsTable.js
index f63a749094..15ac42ae78 100644
--- a/ui/src/hosts/components/HostsTable.js
+++ b/ui/src/hosts/components/HostsTable.js
@@ -129,7 +129,7 @@ const HostsTable = React.createClass({
                   onClick={() => this.updateSort('name')}
                   className={this.sortableClasses('name')}
                 >
-                  Hostname
+                  Host
                 </th>
                 <th
                   onClick={() => this.updateSort('deltaUptime')}
diff --git a/ui/src/kapacitor/components/KapacitorRules.js b/ui/src/kapacitor/components/KapacitorRules.js
index ecc7f93f22..a6d4027ceb 100644
--- a/ui/src/kapacitor/components/KapacitorRules.js
+++ b/ui/src/kapacitor/components/KapacitorRules.js
@@ -28,11 +28,11 @@ const KapacitorRules = ({
       </PageContents>
     )
   }
-
+  const tableHeader = rules.length === 1 ? '1 Alert Rule' : `${rules.length} Alert Rules`
   return (
     <PageContents source={source}>
       <div className="panel-heading u-flex u-ai-center u-jc-space-between">
-        <h2 className="panel-title">Alert Rules</h2>
+        <h2 className="panel-title">{tableHeader}</h2>
         <Link
           to={`/sources/${source.id}/alert-rules/new`}
           className="btn btn-sm btn-primary"
@@ -55,7 +55,7 @@ const PageContents = ({children, source}) => (
     <div className="page-header">
       <div className="page-header__container">
         <div className="page-header__left">
-          <h1 className="page-header__title">Kapacitor Rules</h1>
+          <h1 className="page-header__title">Alert Rules</h1>
         </div>
         <div className="page-header__right">
           <SourceIndicator sourceName={source && source.name} />
diff --git a/ui/src/kapacitor/components/KapacitorRulesTable.js b/ui/src/kapacitor/components/KapacitorRulesTable.js
index 005f191d3f..12db317e44 100644
--- a/ui/src/kapacitor/components/KapacitorRulesTable.js
+++ b/ui/src/kapacitor/components/KapacitorRulesTable.js
@@ -8,7 +8,7 @@ const KapacitorRulesTable = ({source, rules, onDelete, onChangeRuleStatus}) => {
         <thead>
           <tr>
             <th>Name</th>
-            <th>Trigger</th>
+            <th>Rule Type</th>
             <th>Message</th>
             <th>Alerts</th>
             <th className="text-center">Enabled</th>
diff --git a/ui/src/kapacitor/components/ValuesSection.js b/ui/src/kapacitor/components/ValuesSection.js
index 2fc10f38eb..4664d42892 100644
--- a/ui/src/kapacitor/components/ValuesSection.js
+++ b/ui/src/kapacitor/components/ValuesSection.js
@@ -23,7 +23,7 @@ export const ValuesSection = React.createClass({
 
     return (
       <div className="kapacitor-rule-section">
-        <h3 className="rule-section-heading">Values</h3>
+        <h3 className="rule-section-heading">Rule Conditions</h3>
         <div className="rule-section-body">
           <Tabs initialIndex={initialIndex} onSelect={this.handleChooseTrigger}>
             <TabList isKapacitorTabs="true">
diff --git a/ui/src/side_nav/containers/SideNav.js b/ui/src/side_nav/containers/SideNav.js
index 12e8275bf9..679afbcc74 100644
--- a/ui/src/side_nav/containers/SideNav.js
+++ b/ui/src/side_nav/containers/SideNav.js
@@ -65,7 +65,7 @@ const SideNav = React.createClass({
               Alert History
             </NavListItem>
             <NavListItem link={`${sourcePrefix}/alert-rules`}>
-              Kapacitor Rules
+              Alert Rules
             </NavListItem>
           </NavBlock>
           <NavBlock icon="crown2" link={`${sourcePrefix}/admin`}>

From d98f834b8958579ad44e671a05d9143dd676c99a Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Wed, 3 May 2017 12:11:12 -0700
Subject: [PATCH 2/3] Add Nate's changes in

Two heads clearly better than one here
---
 ui/src/hosts/components/HostsTable.js        | 2 +-
 ui/src/kapacitor/components/KapacitorRule.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/hosts/components/HostsTable.js b/ui/src/hosts/components/HostsTable.js
index 15ac42ae78..240926b1cc 100644
--- a/ui/src/hosts/components/HostsTable.js
+++ b/ui/src/hosts/components/HostsTable.js
@@ -262,7 +262,7 @@ const SearchBar = React.createClass({
         <input
           type="text"
           className="form-control"
-          placeholder="Filter by Hostname..."
+          placeholder="Filter by Host..."
           ref="searchInput"
           onChange={this.handleChange}
         />
diff --git a/ui/src/kapacitor/components/KapacitorRule.js b/ui/src/kapacitor/components/KapacitorRule.js
index 72ae627a8b..c8f28f0d52 100644
--- a/ui/src/kapacitor/components/KapacitorRule.js
+++ b/ui/src/kapacitor/components/KapacitorRule.js
@@ -152,7 +152,7 @@ export const KapacitorRule = React.createClass({
     }
 
     if (this.thresholdValueEmpty() || this.relativeValueEmpty()) {
-      return 'Please enter a value in the Values section'
+      return 'Please enter a value in the Rule Conditions section'
     }
 
     return ''

From bb4ea57a6d8917f805ec5ff5462ca131e94796da Mon Sep 17 00:00:00 2001
From: Alex P <thealexpaxton@gmail.com>
Date: Wed, 3 May 2017 12:11:51 -0700
Subject: [PATCH 3/3] Update Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 302aefc22d..7bc486c5ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
   1. [#1378](https://github.com/influxdata/chronograf/pull/1378): Save query time range for dashboards
   1. [#1365](https://github.com/influxdata/chronograf/pull/1365): Show red indicator on Hosts Page for an offline host
   1. [#1373](https://github.com/influxdata/chronograf/pull/1373): Re-address dashboard cell stacking contexts
+  1. [#602](https://github.com/influxdata/chronograf/pull/602): Normalize terminology in app
 
 ## v1.2.0-beta10 [2017-04-28]