diff --git a/ui-ngx/src/app/modules/home/components/device/security-config-lwm2m-server.component.html b/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m-server.component.html
similarity index 100%
rename from ui-ngx/src/app/modules/home/components/device/security-config-lwm2m-server.component.html
rename to ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m-server.component.html
diff --git a/ui-ngx/src/app/modules/home/components/device/security-config-lwm2m-server.component.ts b/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m-server.component.ts
similarity index 93%
rename from ui-ngx/src/app/modules/home/components/device/security-config-lwm2m-server.component.ts
rename to ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m-server.component.ts
index 09b7014212..267650eef7 100644
--- a/ui-ngx/src/app/modules/home/components/device/security-config-lwm2m-server.component.ts
+++ b/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m-server.component.ts
@@ -39,24 +39,24 @@ import { takeUntil } from 'rxjs/operators';
 import { Subject } from 'rxjs';
 
 @Component({
-  selector: 'tb-security-config-lwm2m-server',
-  templateUrl: './security-config-lwm2m-server.component.html',
+  selector: 'tb-device-credentials-lwm2m-server',
+  templateUrl: './device-credentials-lwm2m-server.component.html',
   styleUrls: [],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => SecurityConfigLwm2mServerComponent),
+      useExisting: forwardRef(() => DeviceCredentialsLwm2mServerComponent),
       multi: true
     },
     {
       provide: NG_VALIDATORS,
-      useExisting: forwardRef(() => SecurityConfigLwm2mServerComponent),
+      useExisting: forwardRef(() => DeviceCredentialsLwm2mServerComponent),
       multi: true
     }
   ]
 })
 
-export class SecurityConfigLwm2mServerComponent implements OnDestroy, ControlValueAccessor, Validator {
+export class DeviceCredentialsLwm2mServerComponent implements OnDestroy, ControlValueAccessor, Validator {
 
   serverFormGroup: FormGroup;
   securityConfigLwM2MType = Lwm2mSecurityType;
diff --git a/ui-ngx/src/app/modules/home/components/device/security-config-lwm2m.component.html b/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.html
similarity index 96%
rename from ui-ngx/src/app/modules/home/components/device/security-config-lwm2m.component.html
rename to ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.html
index 200cd88f74..c41b4b6900 100644
--- a/ui-ngx/src/app/modules/home/components/device/security-config-lwm2m.component.html
+++ b/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.html
@@ -89,9 +89,9 @@
             </mat-panel-title>
           </mat-expansion-panel-header>
           <ng-template matExpansionPanelContent>
-            <tb-security-config-lwm2m-server
+            <tb-device-credentials-lwm2m-server
               formControlName="bootstrapServer">
-            </tb-security-config-lwm2m-server>
+            </tb-device-credentials-lwm2m-server>
           </ng-template>
         </mat-expansion-panel>
         <mat-expansion-panel>
@@ -101,9 +101,9 @@
             </mat-panel-title>
           </mat-expansion-panel-header>
           <ng-template matExpansionPanelContent>
-            <tb-security-config-lwm2m-server
+            <tb-device-credentials-lwm2m-server
               formControlName="lwm2mServer">
-            </tb-security-config-lwm2m-server>
+            </tb-device-credentials-lwm2m-server>
           </ng-template>
         </mat-expansion-panel>
       </mat-accordion>
diff --git a/ui-ngx/src/app/modules/home/components/device/security-config-lwm2m.component.scss b/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.scss
similarity index 100%
rename from ui-ngx/src/app/modules/home/components/device/security-config-lwm2m.component.scss
rename to ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.scss
diff --git a/ui-ngx/src/app/modules/home/components/device/security-config-lwm2m.component.ts b/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.ts
similarity index 94%
rename from ui-ngx/src/app/modules/home/components/device/security-config-lwm2m.component.ts
rename to ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.ts
index cbb85e305f..a118de24d6 100644
--- a/ui-ngx/src/app/modules/home/components/device/security-config-lwm2m.component.ts
+++ b/ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.ts
@@ -40,24 +40,24 @@ import { takeUntil } from 'rxjs/operators';
 import { isDefinedAndNotNull } from '@core/utils';
 
 @Component({
-  selector: 'tb-security-config-lwm2m',
-  templateUrl: './security-config-lwm2m.component.html',
-  styleUrls: ['./security-config-lwm2m.component.scss'],
+  selector: 'tb-device-credentials-lwm2m',
+  templateUrl: './device-credentials-lwm2m.component.html',
+  styleUrls: ['./device-credentials-lwm2m.component.scss'],
   providers: [
     {
       provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => SecurityConfigLwm2mComponent),
+      useExisting: forwardRef(() => DeviceCredentialsLwm2mComponent),
       multi: true
     },
     {
       provide: NG_VALIDATORS,
-      useExisting: forwardRef(() => SecurityConfigLwm2mComponent),
+      useExisting: forwardRef(() => DeviceCredentialsLwm2mComponent),
       multi: true
     }
   ]
 })
 
-export class SecurityConfigLwm2mComponent implements ControlValueAccessor, Validator, OnDestroy {
+export class DeviceCredentialsLwm2mComponent implements ControlValueAccessor, Validator, OnDestroy {
 
   lwm2mConfigFormGroup: FormGroup;
   securityConfigLwM2MType = Lwm2mSecurityType;
diff --git a/ui-ngx/src/app/modules/home/components/device/device-credentials.component.html b/ui-ngx/src/app/modules/home/components/device/device-credentials.component.html
index 76a9935565..d5a846189d 100644
--- a/ui-ngx/src/app/modules/home/components/device/device-credentials.component.html
+++ b/ui-ngx/src/app/modules/home/components/device/device-credentials.component.html
@@ -51,8 +51,8 @@
       </tb-device-credentials-mqtt-basic>
     </ng-template>
     <ng-template [ngSwitchCase]="deviceCredentialsType.LWM2M_CREDENTIALS">
-      <tb-security-config-lwm2m formControlName="credentialsValue">
-      </tb-security-config-lwm2m>
+      <tb-device-credentials-lwm2m formControlName="credentialsValue">
+      </tb-device-credentials-lwm2m>
     </ng-template>
   </div>
 </section>
diff --git a/ui-ngx/src/app/modules/home/components/device/device-credentials.module.ts b/ui-ngx/src/app/modules/home/components/device/device-credentials.module.ts
index c3427bba68..49f1c2c097 100644
--- a/ui-ngx/src/app/modules/home/components/device/device-credentials.module.ts
+++ b/ui-ngx/src/app/modules/home/components/device/device-credentials.module.ts
@@ -19,16 +19,16 @@ import { CommonModule } from '@angular/common';
 import { SharedModule } from '@shared/shared.module';
 import { CopyDeviceCredentialsComponent } from './copy-device-credentials.component';
 import { DeviceCredentialsComponent } from './device-credentials.component';
-import { SecurityConfigLwm2mComponent } from './security-config-lwm2m.component';
-import { SecurityConfigLwm2mServerComponent } from './security-config-lwm2m-server.component';
+import { DeviceCredentialsLwm2mComponent } from './device-credentials-lwm2m.component';
+import { DeviceCredentialsLwm2mServerComponent } from './device-credentials-lwm2m-server.component';
 import { DeviceCredentialsMqttBasicComponent } from './device-credentials-mqtt-basic.component';
 
 @NgModule({
   declarations: [
     CopyDeviceCredentialsComponent,
     DeviceCredentialsComponent,
-    SecurityConfigLwm2mComponent,
-    SecurityConfigLwm2mServerComponent,
+    DeviceCredentialsLwm2mComponent,
+    DeviceCredentialsLwm2mServerComponent,
     DeviceCredentialsMqttBasicComponent
   ],
   imports: [
@@ -38,8 +38,8 @@ import { DeviceCredentialsMqttBasicComponent } from './device-credentials-mqtt-b
   exports: [
     CopyDeviceCredentialsComponent,
     DeviceCredentialsComponent,
-    SecurityConfigLwm2mComponent,
-    SecurityConfigLwm2mServerComponent,
+    DeviceCredentialsLwm2mComponent,
+    DeviceCredentialsLwm2mServerComponent,
     DeviceCredentialsMqttBasicComponent
   ]
 })