diff --git a/ui/src/authorizations/containers/TokensIndex.tsx b/ui/src/authorizations/containers/TokensIndex.tsx
index 75f3bc3581..1cd7470eca 100644
--- a/ui/src/authorizations/containers/TokensIndex.tsx
+++ b/ui/src/authorizations/containers/TokensIndex.tsx
@@ -34,7 +34,7 @@ class TokensIndex extends Component<StateProps> {
               <SettingsNavigation tab="tokens" orgID={org.id} />
               <Tabs.TabContents>
                 <TabbedPageSection
-                  id="org-view-tab--buckets"
+                  id="settings-tab--buckets"
                   url="buckets"
                   title="Buckets"
                 >
diff --git a/ui/src/buckets/containers/BucketsIndex.tsx b/ui/src/buckets/containers/BucketsIndex.tsx
index 9cee1f8f72..dbab621340 100644
--- a/ui/src/buckets/containers/BucketsIndex.tsx
+++ b/ui/src/buckets/containers/BucketsIndex.tsx
@@ -35,7 +35,7 @@ class BucketsIndex extends Component<StateProps> {
                 <SettingsNavigation tab="buckets" orgID={org.id} />
                 <Tabs.TabContents>
                   <TabbedPageSection
-                    id="org-view-tab--buckets"
+                    id="settings-tab--buckets"
                     url="buckets"
                     title="Buckets"
                   >
diff --git a/ui/src/dashboards/components/DashboardImportFromTemplateOverlay.tsx b/ui/src/dashboards/components/DashboardImportFromTemplateOverlay.tsx
index 40b5d5dd0f..ee37d11e7a 100644
--- a/ui/src/dashboards/components/DashboardImportFromTemplateOverlay.tsx
+++ b/ui/src/dashboards/components/DashboardImportFromTemplateOverlay.tsx
@@ -29,7 +29,6 @@ import {getTemplateByID} from 'src/templates/actions'
 import {AppState, RemoteDataState, DashboardTemplate} from 'src/types'
 import GetResources, {ResourceTypes} from 'src/shared/components/GetResources'
 
-
 interface StateProps {
   templates: TemplateSummary[]
   templateStatus: RemoteDataState
diff --git a/ui/src/labels/containers/LabelsIndex.tsx b/ui/src/labels/containers/LabelsIndex.tsx
index aad65eef47..e58255a9df 100644
--- a/ui/src/labels/containers/LabelsIndex.tsx
+++ b/ui/src/labels/containers/LabelsIndex.tsx
@@ -34,7 +34,7 @@ class LabelsIndex extends PureComponent<StateProps> {
               <SettingsNavigation tab="labels" orgID={org.id} />
               <Tabs.TabContents>
                 <TabbedPageSection
-                  id="org-view-tab--labels"
+                  id="settings-tab--labels"
                   url="labels"
                   title="Labels"
                 >
diff --git a/ui/src/members/containers/MembersIndex.tsx b/ui/src/members/containers/MembersIndex.tsx
index a9f410e3a1..f6fb4322c1 100644
--- a/ui/src/members/containers/MembersIndex.tsx
+++ b/ui/src/members/containers/MembersIndex.tsx
@@ -48,7 +48,7 @@ class MembersIndex extends Component<Props> {
               <SettingsNavigation tab="members" orgID={org.id} />
               <Tabs.TabContents>
                 <TabbedPageSection
-                  id="org-view-tab--members"
+                  id="settings-tab--members"
                   url="members"
                   title="Members"
                 >
diff --git a/ui/src/scrapers/containers/ScrapersIndex.tsx b/ui/src/scrapers/containers/ScrapersIndex.tsx
index cf4dcc17b0..aa36b366c5 100644
--- a/ui/src/scrapers/containers/ScrapersIndex.tsx
+++ b/ui/src/scrapers/containers/ScrapersIndex.tsx
@@ -37,7 +37,7 @@ class ScrapersIndex extends Component<StateProps> {
                 <SettingsNavigation tab="scrapers" orgID={org.id} />
                 <Tabs.TabContents>
                   <TabbedPageSection
-                    id="org-view-tab--scrapers"
+                    id="settings-tab--scrapers"
                     url="scrapers"
                     title="Scrapers"
                   >
diff --git a/ui/src/telegrafs/containers/TelegrafsPage.tsx b/ui/src/telegrafs/containers/TelegrafsPage.tsx
index 78946a47b3..7b28659852 100644
--- a/ui/src/telegrafs/containers/TelegrafsPage.tsx
+++ b/ui/src/telegrafs/containers/TelegrafsPage.tsx
@@ -35,7 +35,7 @@ class TelegrafsPage extends PureComponent<StateProps> {
                 <SettingsNavigation tab="telegrafs" orgID={org.id} />
                 <Tabs.TabContents>
                   <TabbedPageSection
-                    id="org-view-tab--telegrafs"
+                    id="settings-tab--telegrafs"
                     url="telegrafs"
                     title="Telegraf"
                   >
diff --git a/ui/src/templates/containers/TemplatesIndex.tsx b/ui/src/templates/containers/TemplatesIndex.tsx
index 4bb5749522..907e896ba9 100644
--- a/ui/src/templates/containers/TemplatesIndex.tsx
+++ b/ui/src/templates/containers/TemplatesIndex.tsx
@@ -36,7 +36,7 @@ class TemplatesIndex extends Component<Props> {
                 <SettingsNavigation tab="templates" orgID={org.id} />
                 <Tabs.TabContents>
                   <TabbedPageSection
-                    id="org-view-tab--templates"
+                    id="settings-tab--templates"
                     url="templates"
                     title="Templates"
                   >
diff --git a/ui/src/variables/containers/VariablesIndex.tsx b/ui/src/variables/containers/VariablesIndex.tsx
index 87a7b15a15..27ed9811a1 100644
--- a/ui/src/variables/containers/VariablesIndex.tsx
+++ b/ui/src/variables/containers/VariablesIndex.tsx
@@ -35,7 +35,7 @@ class VariablesIndex extends Component<StateProps> {
                 <SettingsNavigation tab="variables" orgID={org.id} />
                 <Tabs.TabContents>
                   <TabbedPageSection
-                    id="org-view-tab--variables"
+                    id="settings-tab--variables"
                     url="variables"
                     title="Variables"
                   >