diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html
index 9de48a9ad0297f6212fa12b646af6cc22c9b0aef..03bdde34cccaca1ef8567a9c19e937c0a8fbd4bd 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.html
@@ -1,7 +1,7 @@
 <nshmp-lib-ng-template [navigationList]="navigationList" [title]="title">
   <nshmp-template-content-container>
     <nshmp-template-control-panel>
-      <app-control />
+      <app-control-panel />
     </nshmp-template-control-panel>
 
     <nshmp-template-plot-content>
@@ -9,7 +9,7 @@
     </nshmp-template-plot-content>
 
     <nshmp-template-settings>
-      <app-settings />
+      <app-plot-settings-panel />
     </nshmp-template-settings>
   </nshmp-template-content-container>
 
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.spec.ts b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.spec.ts
index 85c154861426d6b19d31efd83d9064ace66b6521..357ef335cfb3636f87cab9c2ec4334a6ac564a5d 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.spec.ts
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.spec.ts
@@ -6,10 +6,10 @@ import {provideRouter} from '@angular/router';
 import {AppComponent} from './app.component';
 import {AboutComponent} from './components/about/about.component';
 import {ContentComponent} from './components/content/content.component';
-import {ControlComponent} from './components/control/control.component';
+import {ControlPanelComponent} from './components/control-panel/control-panel.component';
 import {ParameterSummaryComponent} from './components/parameter-summary/parameter-summary.component';
 import {PlotsComponent} from './components/plots/plots.component';
-import {SettingsComponent} from './components/settings/settings.component';
+import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component';
 
 describe('MainComponent', () => {
   let component: AppComponent;
@@ -21,8 +21,8 @@ describe('MainComponent', () => {
         AppComponent,
         ContentComponent,
         PlotsComponent,
-        ControlComponent,
-        SettingsComponent,
+        ControlPanelComponent,
+        PlotSettingsPanelComponent,
         AboutComponent,
         ParameterSummaryComponent,
       ],
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts
index 124bf85f850e720985ec2b24a2e64f2da545023a..18e3eba4bdbc3a386a7cfe893688064c6bf73f7d 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/app.component.ts
@@ -14,8 +14,8 @@ import {navigation} from 'projects/nshmp-apps/src/shared/utils/navigation.utils'
 
 import {AboutComponent} from './components/about/about.component';
 import {ContentComponent} from './components/content/content.component';
-import {ControlComponent} from './components/control/control.component';
-import {SettingsComponent} from './components/settings/settings.component';
+import {ControlPanelComponent} from './components/control-panel/control-panel.component';
+import {PlotSettingsPanelComponent} from './components/plot-settings-panel/plot-settings-panel.component';
 import {AppService} from './services/app.service';
 
 /**
@@ -30,9 +30,9 @@ import {AppService} from './services/app.service';
     NshmpLibNgAboutPageComponent,
     NshmpLibNgHazardProvisionalModelComponent,
     NshmpTemplateSettingsComponent,
-    ControlComponent,
+    ControlPanelComponent,
     ContentComponent,
-    SettingsComponent,
+    PlotSettingsPanelComponent,
     AboutComponent,
     AsyncPipe,
   ],
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.html
similarity index 100%
rename from projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.html
rename to projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.html
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.scss b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.scss
similarity index 100%
rename from projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.scss
rename to projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.scss
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.spec.ts b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.spec.ts
similarity index 69%
rename from projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.spec.ts
rename to projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.spec.ts
index 04eb3901946d409d061e02dddf9daa3ab336f6e4..6b91d5feccfbbc9c9b21acbd29d67ae108d4cd99 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.spec.ts
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.spec.ts
@@ -3,15 +3,15 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {provideNoopAnimations} from '@angular/platform-browser/animations';
 import {provideRouter} from '@angular/router';
 
-import {ControlComponent} from './control.component';
+import {ControlPanelComponent} from './control-panel.component';
 
-describe('ControlComponent', () => {
-  let component: ControlComponent;
-  let fixture: ComponentFixture<ControlComponent>;
+describe('ControlPanelComponent', () => {
+  let component: ControlPanelComponent;
+  let fixture: ComponentFixture<ControlPanelComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [ControlComponent],
+      imports: [ControlPanelComponent],
       providers: [
         provideHttpClient(),
         provideNoopAnimations(),
@@ -22,7 +22,7 @@ describe('ControlComponent', () => {
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ControlComponent);
+    fixture = TestBed.createComponent(ControlPanelComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.ts b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.ts
similarity index 94%
rename from projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.ts
rename to projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.ts
index 50ab38f0299604d77549cfdb012bc9d5eff67a76..de2575304d7a01c024fd963623fcade151709401 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/components/control/control.component.ts
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/control-panel/control-panel.component.ts
@@ -27,7 +27,7 @@ import {
   SourceType,
   sourceTypeToCapitalCase,
 } from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/model';
-import {environment} from 'projects/nshmp-apps/src/environments/environment';
+import {environment} from '../../../../../environments/environment';
 import {combineLatest, Subscription} from 'rxjs';
 
 import {AppService} from '../../services/app.service';
@@ -52,12 +52,12 @@ import {AppService} from '../../services/app.service';
     AsyncPipe,
     ReactiveFormsModule,
   ],
-  selector: 'app-control',
+  selector: 'app-control-panel',
   standalone: true,
-  styleUrl: './control.component.scss',
-  templateUrl: './control.component.html',
+  styleUrl: './control-panel.component.scss',
+  templateUrl: './control-panel.component.html',
 })
-export class ControlComponent implements OnInit, OnDestroy {
+export class ControlPanelComponent implements OnInit, OnDestroy {
   /** Max and min bounds for return periods */
   returnPeriodBounds = RETURN_PERIOD_BOUNDS;
   /** List of return periods */
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.html
similarity index 100%
rename from projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.html
rename to projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.html
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.scss b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.scss
similarity index 100%
rename from projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.scss
rename to projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.scss
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.spec.ts b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.spec.ts
similarity index 66%
rename from projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.spec.ts
rename to projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.spec.ts
index cdadff990714b2125891239f69da9ae5a6ed62a2..ef7b05b5522d660fd40ffe44c9515b6daa010213 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.spec.ts
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.spec.ts
@@ -3,15 +3,15 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {provideNoopAnimations} from '@angular/platform-browser/animations';
 import {provideRouter} from '@angular/router';
 
-import {SettingsComponent} from './settings.component';
+import {PlotSettingsPanelComponent} from './plot-settings-panel.component';
 
-describe('SettingsComponent', () => {
-  let component: SettingsComponent;
-  let fixture: ComponentFixture<SettingsComponent>;
+describe('PlotSettingsPanelComponent', () => {
+  let component: PlotSettingsPanelComponent;
+  let fixture: ComponentFixture<PlotSettingsPanelComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [SettingsComponent],
+      imports: [PlotSettingsPanelComponent],
       providers: [
         provideHttpClient(),
         provideNoopAnimations(),
@@ -22,7 +22,7 @@ describe('SettingsComponent', () => {
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SettingsComponent);
+    fixture = TestBed.createComponent(PlotSettingsPanelComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.ts b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.ts
similarity index 88%
rename from projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.ts
rename to projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.ts
index c1bc88e055226044fc28ff3ebed3fcfe2809d9db..d789abad4a5a6837e62a42760887be86cb293c52 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/components/settings/settings.component.ts
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/plot-settings-panel/plot-settings-panel.component.ts
@@ -19,12 +19,12 @@ import {AppService} from '../../services/app.service';
     NshmpLibNgPlotResetPlotSettingsComponent,
     MatExpansionModule,
   ],
-  selector: 'app-settings',
+  selector: 'app-plot-settings-panel',
   standalone: true,
-  styleUrl: './settings.component.scss',
-  templateUrl: './settings.component.html',
+  styleUrl: './plot-settings-panel.component.scss',
+  templateUrl: './plot-settings-panel.component.html',
 })
-export class SettingsComponent {
+export class PlotSettingsPanelComponent {
   /** Hazard plot state */
   hazardPlot = this.service.hazardPlotState;
   /** Hazard plot settings */