diff --git a/ui/src/data_explorer/actions/view/index.js b/ui/src/data_explorer/actions/view/index.js
index 4ead10228f..b759e4ec9a 100644
--- a/ui/src/data_explorer/actions/view/index.js
+++ b/ui/src/data_explorer/actions/view/index.js
@@ -129,12 +129,12 @@ export function updateRawQuery(queryID, text) {
   }
 }
 
-export function editRawQueryStatus(queryID, rawStatus) {
+export function editQueryStatus(queryID, status) {
   return {
-    type: 'EDIT_RAW_QUERY_STATUS',
+    type: 'EDIT_QUERY_STATUS',
     payload: {
       queryID,
-      rawStatus,
+      status,
     },
   }
 }
diff --git a/ui/src/data_explorer/components/RawQueryEditor.js b/ui/src/data_explorer/components/RawQueryEditor.js
index 495a5f86fc..636a6f85ad 100644
--- a/ui/src/data_explorer/components/RawQueryEditor.js
+++ b/ui/src/data_explorer/components/RawQueryEditor.js
@@ -50,7 +50,7 @@ const RawQueryEditor = React.createClass({
   },
 
   render() {
-    const {query: {rawStatus}} = this.props
+    const {config: {status}} = this.props
     const {value} = this.state
 
     return (
@@ -66,20 +66,20 @@ const RawQueryEditor = React.createClass({
           autoComplete="off"
           spellCheck="false"
         />
-        {this.renderStatus(rawStatus)}
+        {this.renderStatus(status)}
         <Dropdown items={QUERY_TEMPLATES} selected={'Query Templates'} onChoose={this.handleChooseTemplate} className="query-template"/>
       </div>
     )
   },
 
-  renderStatus(rawStatus) {
-    if (!rawStatus) {
+  renderStatus(status) {
+    if (!status) {
       return (
         <div className="raw-text--status"></div>
       )
     }
 
-    if (rawStatus.loading) {
+    if (status.loading) {
       return (
         <div className="raw-text--status">
           <LoadingDots />
@@ -88,9 +88,9 @@ const RawQueryEditor = React.createClass({
     }
 
     return (
-      <div className={classNames("raw-text--status", {"raw-text--error": rawStatus.error, "raw-text--success": rawStatus.success, "raw-text--warning": rawStatus.warn})}>
-        <span className={classNames("icon", {stop: rawStatus.error, checkmark: rawStatus.success, "alert-triangle": rawStatus.warn})}></span>
-        {rawStatus.error || rawStatus.warn || rawStatus.success}
+      <div className={classNames("raw-text--status", {"raw-text--error": status.error, "raw-text--success": status.success, "raw-text--warning": status.warn})}>
+        <span className={classNames("icon", {stop: status.error, checkmark: status.success, "alert-triangle": status.warn})}></span>
+        {status.error || status.warn || status.success}
       </div>
     )
   },
diff --git a/ui/src/data_explorer/reducers/queryConfigs.js b/ui/src/data_explorer/reducers/queryConfigs.js
index eaa11bd1ef..cea09d24b0 100644
--- a/ui/src/data_explorer/reducers/queryConfigs.js
+++ b/ui/src/data_explorer/reducers/queryConfigs.js
@@ -146,10 +146,10 @@ export default function queryConfigs(state = {}, action) {
       })
     }
 
-    case 'EDIT_RAW_QUERY_STATUS': {
-      const {queryID, rawStatus} = action.payload
+    case 'EDIT_QUERY_STATUS': {
+      const {queryID, status} = action.payload
       const nextState = {
-        [queryID]: {...state[queryID], rawStatus},
+        [queryID]: {...state[queryID], status},
       }
 
       return {...state, ...nextState}
diff --git a/ui/src/utils/defaultQueryConfig.js b/ui/src/utils/defaultQueryConfig.js
index de578708f3..19aac568e6 100644
--- a/ui/src/utils/defaultQueryConfig.js
+++ b/ui/src/utils/defaultQueryConfig.js
@@ -12,6 +12,6 @@ export default function defaultQueryConfig(id) {
     },
     areTagsAccepted: true,
     rawText: null,
-    rawStatus: null,
+    status: null,
   }
 }