diff --git a/modules/ui/src/app/app-routing.module.ts b/modules/ui/src/app/app-routing.module.ts
index 454782cc9..6bd92387e 100644
--- a/modules/ui/src/app/app-routing.module.ts
+++ b/modules/ui/src/app/app-routing.module.ts
@@ -26,9 +26,7 @@ const routes: Routes = [
   {
     path: 'devices',
     loadChildren: () =>
-      import('./pages/devices/device-repository.module').then(
-        m => m.DeviceRepositoryModule
-      ),
+      import('./pages/devices/devices.module').then(m => m.DevicesModule),
     title: 'Testrun - Devices',
   },
   {
diff --git a/modules/ui/src/app/components/device-item/device-item.component.spec.ts b/modules/ui/src/app/components/device-item/device-item.component.spec.ts
index e774c22e9..2fe79d8db 100644
--- a/modules/ui/src/app/components/device-item/device-item.component.spec.ts
+++ b/modules/ui/src/app/components/device-item/device-item.component.spec.ts
@@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Device, DeviceView } from '../../model/device';
 
 import { DeviceItemComponent } from './device-item.component';
-import { DeviceRepositoryModule } from '../../pages/devices/device-repository.module';
+import { DevicesModule } from '../../pages/devices/devices.module';
 import { MatIconTestingModule } from '@angular/material/icon/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
@@ -29,7 +29,7 @@ describe('DeviceItemComponent', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
-        DeviceRepositoryModule,
+        DevicesModule,
         DeviceItemComponent,
         MatIconTestingModule,
         BrowserAnimationsModule,
diff --git a/modules/ui/src/app/pages/devices/device-repository-routing.module.ts b/modules/ui/src/app/pages/devices/devices-routing.module.ts
similarity index 79%
rename from modules/ui/src/app/pages/devices/device-repository-routing.module.ts
rename to modules/ui/src/app/pages/devices/devices-routing.module.ts
index f376c89de..19acb07c9 100644
--- a/modules/ui/src/app/pages/devices/device-repository-routing.module.ts
+++ b/modules/ui/src/app/pages/devices/devices-routing.module.ts
@@ -15,12 +15,12 @@
  */
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { DeviceRepositoryComponent } from './device-repository.component';
+import { DevicesComponent } from './devices.component';
 
-const routes: Routes = [{ path: '', component: DeviceRepositoryComponent }];
+const routes: Routes = [{ path: '', component: DevicesComponent }];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule],
 })
-export class DeviceRepositoryRoutingModule {}
+export class DevicesRoutingModule {}
diff --git a/modules/ui/src/app/pages/devices/device-repository.component.html b/modules/ui/src/app/pages/devices/devices.component.html
similarity index 100%
rename from modules/ui/src/app/pages/devices/device-repository.component.html
rename to modules/ui/src/app/pages/devices/devices.component.html
diff --git a/modules/ui/src/app/pages/devices/device-repository.component.scss b/modules/ui/src/app/pages/devices/devices.component.scss
similarity index 100%
rename from modules/ui/src/app/pages/devices/device-repository.component.scss
rename to modules/ui/src/app/pages/devices/devices.component.scss
diff --git a/modules/ui/src/app/pages/devices/device-repository.component.spec.ts b/modules/ui/src/app/pages/devices/devices.component.spec.ts
similarity index 95%
rename from modules/ui/src/app/pages/devices/device-repository.component.spec.ts
rename to modules/ui/src/app/pages/devices/devices.component.spec.ts
index f01edabee..db156a6f2 100644
--- a/modules/ui/src/app/pages/devices/device-repository.component.spec.ts
+++ b/modules/ui/src/app/pages/devices/devices.component.spec.ts
@@ -22,8 +22,8 @@ import {
 import { of } from 'rxjs';
 import { Device } from '../../model/device';
 
-import { DeviceRepositoryComponent } from './device-repository.component';
-import { DeviceRepositoryModule } from './device-repository.module';
+import { DevicesComponent } from './devices.component';
+import { DevicesModule } from './devices.module';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import {
   DeviceFormComponent,
@@ -42,9 +42,9 @@ import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Component } from '@angular/core';
 
-describe('DeviceRepositoryComponent', () => {
-  let component: DeviceRepositoryComponent;
-  let fixture: ComponentFixture<DeviceRepositoryComponent>;
+describe('DevicesComponent', () => {
+  let component: DevicesComponent;
+  let fixture: ComponentFixture<DevicesComponent>;
   let compiled: HTMLElement;
   let mockDevicesStore: SpyObj<DevicesStore>;
   let router: Router;
@@ -68,7 +68,7 @@ describe('DeviceRepositoryComponent', () => {
         RouterTestingModule.withRoutes([
           { path: 'testing', component: FakeProgressComponent },
         ]),
-        DeviceRepositoryModule,
+        DevicesModule,
         BrowserAnimationsModule,
         MatIconTestingModule,
       ],
@@ -76,12 +76,12 @@ describe('DeviceRepositoryComponent', () => {
         { provide: DevicesStore, useValue: mockDevicesStore },
         { provide: FocusManagerService, useValue: stateServiceMock },
       ],
-      declarations: [DeviceRepositoryComponent, FakeProgressComponent],
+      declarations: [DevicesComponent, FakeProgressComponent],
     }).compileComponents();
 
     TestBed.overrideProvider(DevicesStore, { useValue: mockDevicesStore });
 
-    fixture = TestBed.createComponent(DeviceRepositoryComponent);
+    fixture = TestBed.createComponent(DevicesComponent);
     component = fixture.componentInstance;
     router = TestBed.get(Router);
     compiled = fixture.nativeElement as HTMLElement;
diff --git a/modules/ui/src/app/pages/devices/device-repository.component.ts b/modules/ui/src/app/pages/devices/devices.component.ts
similarity index 97%
rename from modules/ui/src/app/pages/devices/device-repository.component.ts
rename to modules/ui/src/app/pages/devices/devices.component.ts
index 441a11f17..2e8e8ebbc 100644
--- a/modules/ui/src/app/pages/devices/device-repository.component.ts
+++ b/modules/ui/src/app/pages/devices/devices.component.ts
@@ -39,11 +39,11 @@ import { DevicesStore } from './devices.store';
 
 @Component({
   selector: 'app-device-repository',
-  templateUrl: './device-repository.component.html',
-  styleUrls: ['./device-repository.component.scss'],
+  templateUrl: './devices.component.html',
+  styleUrls: ['./devices.component.scss'],
   providers: [DevicesStore],
 })
-export class DeviceRepositoryComponent implements OnInit, OnDestroy {
+export class DevicesComponent implements OnInit, OnDestroy {
   readonly DeviceView = DeviceView;
   private destroy$: Subject<boolean> = new Subject<boolean>();
   viewModel$ = this.devicesStore.viewModel$;
diff --git a/modules/ui/src/app/pages/devices/device-repository.module.ts b/modules/ui/src/app/pages/devices/devices.module.ts
similarity index 87%
rename from modules/ui/src/app/pages/devices/device-repository.module.ts
rename to modules/ui/src/app/pages/devices/devices.module.ts
index cadfc216a..d246b76f3 100644
--- a/modules/ui/src/app/pages/devices/device-repository.module.ts
+++ b/modules/ui/src/app/pages/devices/devices.module.ts
@@ -26,8 +26,8 @@ import { MatInputModule } from '@angular/material/input';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { DeviceFormComponent } from './components/device-form/device-form.component';
 
-import { DeviceRepositoryRoutingModule } from './device-repository-routing.module';
-import { DeviceRepositoryComponent } from './device-repository.component';
+import { DevicesRoutingModule } from './devices-routing.module';
+import { DevicesComponent } from './devices.component';
 import { DeviceItemComponent } from '../../components/device-item/device-item.component';
 import { DeviceTestsComponent } from '../../components/device-tests/device-tests.component';
 import { SpinnerComponent } from '../../components/spinner/spinner.component';
@@ -35,10 +35,10 @@ import { DeleteFormComponent } from '../../components/delete-form/delete-form.co
 import { NgxMaskDirective, NgxMaskPipe, provideNgxMask } from 'ngx-mask';
 
 @NgModule({
-  declarations: [DeviceRepositoryComponent, DeviceFormComponent],
+  declarations: [DevicesComponent, DeviceFormComponent],
   imports: [
     CommonModule,
-    DeviceRepositoryRoutingModule,
+    DevicesRoutingModule,
     MatToolbarModule,
     MatButtonModule,
     MatIconModule,
@@ -57,4 +57,4 @@ import { NgxMaskDirective, NgxMaskPipe, provideNgxMask } from 'ngx-mask';
   ],
   providers: [provideNgxMask()],
 })
-export class DeviceRepositoryModule {}
+export class DevicesModule {}