diff --git a/modules/ui/src/app/model/device.ts b/modules/ui/src/app/model/device.ts
index 5b4acf631..55d383401 100644
--- a/modules/ui/src/app/model/device.ts
+++ b/modules/ui/src/app/model/device.ts
@@ -69,6 +69,6 @@ export interface QuestionnaireFormat extends QuestionFormat {
 }
 
 export enum TestingType {
-  Pilot = 'Pilot assessment',
-  Qualification = 'Device qualification',
+  Pilot = 'Pilot Assessment',
+  Qualification = 'Device Qualification',
 }
diff --git a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.spec.ts b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.spec.ts
index c9f33e473..9633556c6 100644
--- a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.spec.ts
+++ b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.spec.ts
@@ -182,7 +182,7 @@ describe('DeviceQualificationFromComponent', () => {
         manufacturer: 'test',
         model: '',
         mac_addr: '',
-        test_pack: 'Device qualification',
+        test_pack: 'Device Qualification',
         type: '',
         technology: '',
         test_modules: {
@@ -586,7 +586,7 @@ describe('DeviceQualificationFromComponent', () => {
             manufacturer: 'manufacturer',
             model: 'model',
             mac_addr: '07:07:07:07:07:07',
-            test_pack: 'Device qualification',
+            test_pack: 'Device Qualification',
             type: '',
             technology: '',
             test_modules: {
@@ -643,7 +643,7 @@ describe('DeviceQualificationFromComponent', () => {
             manufacturer: 'manufacturer',
             model: 'model',
             mac_addr: '07:07:07:07:07:07',
-            test_pack: 'Device qualification',
+            test_pack: 'Device Qualification',
             type: '',
             technology: '',
             test_modules: {
diff --git a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.ts b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.ts
index 69c60006c..ce89660b6 100644
--- a/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.ts
+++ b/modules/ui/src/app/pages/devices/components/device-qualification-from/device-qualification-from.component.ts
@@ -343,7 +343,11 @@ export class DeviceQualificationFromComponent
     this.manufacturer.setValue(device.manufacturer);
     this.mac_addr.setValue(device.mac_addr);
 
-    if (device.test_pack) {
+    if (
+      device.test_pack &&
+      (device.test_pack === TestingType.Qualification ||
+        device.test_pack === TestingType.Pilot)
+    ) {
       this.test_pack.setValue(device.test_pack);
     } else {
       this.test_pack.setValue(TestingType.Qualification);