diff --git a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.html b/ui-ngx/src/app/modules/home/components/entity/debug/debug-settings-button.component.html
similarity index 100%
rename from ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.html
rename to ui-ngx/src/app/modules/home/components/entity/debug/debug-settings-button.component.html
diff --git a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.ts b/ui-ngx/src/app/modules/home/components/entity/debug/debug-settings-button.component.ts
similarity index 93%
rename from ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.ts
rename to ui-ngx/src/app/modules/home/components/entity/debug/debug-settings-button.component.ts
index dafda75c0b..f89e7ec198 100644
--- a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-button.component.ts
+++ b/ui-ngx/src/app/modules/home/components/entity/debug/debug-settings-button.component.ts
@@ -24,7 +24,7 @@ import { DebugSettingsPanelComponent } from './debug-settings-panel.component';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { of, shareReplay, timer } from 'rxjs';
 import { SECOND } from '@shared/models/time/time.models';
-import { DebugSettings } from '@shared/models/entity.models';
+import { EntityDebugSettings } from '@shared/models/entity.models';
 import { map, startWith, switchMap, takeWhile } from 'rxjs/operators';
 import { getCurrentAuthState } from '@core/auth/auth.selectors';
 import { AppState } from '@core/core.state';
@@ -79,7 +79,7 @@ export class DebugSettingsButtonComponent implements ControlValueAccessor {
 
   readonly maxDebugModeDurationMinutes = getCurrentAuthState(this.store).maxDebugModeDurationMinutes;
 
-  private propagateChange: (settings: DebugSettings) => void = () => {};
+  private propagateChange: (settings: EntityDebugSettings) => void = () => {};
 
   constructor(private popoverService: TbPopoverService,
               private renderer: Renderer2,
@@ -126,20 +126,20 @@ export class DebugSettingsButtonComponent implements ControlValueAccessor {
         {},
         {}, {}, true);
       debugStrategyPopover.tbComponentRef.instance.popover = debugStrategyPopover;
-      debugStrategyPopover.tbComponentRef.instance.onSettingsApplied.subscribe((settings: DebugSettings) => {
+      debugStrategyPopover.tbComponentRef.instance.onSettingsApplied.subscribe((settings: EntityDebugSettings) => {
         this.debugSettingsFormGroup.patchValue(settings);
         debugStrategyPopover.hide();
       });
     }
   }
 
-  registerOnChange(fn: (settings: DebugSettings) => void): void {
+  registerOnChange(fn: (settings: EntityDebugSettings) => void): void {
     this.propagateChange = fn;
   }
 
   registerOnTouched(_: () => void): void {}
 
-  writeValue(settings: DebugSettings): void {
+  writeValue(settings: EntityDebugSettings): void {
     this.debugSettingsFormGroup.patchValue(settings, {emitEvent: false});
     this.debugSettingsFormGroup.get('allEnabled').updateValueAndValidity({onlySelf: true});
   }
diff --git a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/entity/debug/debug-settings-panel.component.html
similarity index 100%
rename from ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.html
rename to ui-ngx/src/app/modules/home/components/entity/debug/debug-settings-panel.component.html
diff --git a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/entity/debug/debug-settings-panel.component.ts
similarity index 97%
rename from ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.ts
rename to ui-ngx/src/app/modules/home/components/entity/debug/debug-settings-panel.component.ts
index a9e237245c..702d416982 100644
--- a/ui-ngx/src/app/modules/home/components/debug-settings/debug-settings-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/entity/debug/debug-settings-panel.component.ts
@@ -32,7 +32,7 @@ import { SECOND } from '@shared/models/time/time.models';
 import { DurationLeftPipe } from '@shared/pipe/duration-left.pipe';
 import { of, shareReplay, timer } from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { DebugSettings } from '@shared/models/entity.models';
+import { EntityDebugSettings } from '@shared/models/entity.models';
 import { distinctUntilChanged, map, startWith, switchMap, takeWhile } from 'rxjs/operators';
 
 @Component({
@@ -78,7 +78,7 @@ export class DebugSettingsPanelComponent extends PageComponent implements OnInit
     shareReplay(1),
   );
 
-  onSettingsApplied = new EventEmitter<DebugSettings>();
+  onSettingsApplied = new EventEmitter<EntityDebugSettings>();
 
   constructor(private fb: FormBuilder,
               private cd: ChangeDetectorRef) {
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain.module.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain.module.ts
index 1fdf11c780..a89b6868f7 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain.module.ts
@@ -33,7 +33,7 @@ import { RuleNodeLinkComponent } from './rule-node-link.component';
 import { LinkLabelsComponent } from '@home/pages/rulechain/link-labels.component';
 import { RuleNodeConfigComponent } from './rule-node-config.component';
 import { DurationLeftPipe } from '@shared/pipe/duration-left.pipe';
-import { DebugSettingsButtonComponent } from '@home/components/debug-settings/debug-settings-button.component';
+import { DebugSettingsButtonComponent } from '@home/components/entity/debug-settings/debug-settings-button.component';
 
 @NgModule({
   declarations: [
diff --git a/ui-ngx/src/app/shared/models/entity.models.ts b/ui-ngx/src/app/shared/models/entity.models.ts
index 19b0718336..9934da65aa 100644
--- a/ui-ngx/src/app/shared/models/entity.models.ts
+++ b/ui-ngx/src/app/shared/models/entity.models.ts
@@ -193,11 +193,11 @@ export interface HasVersion {
   version?: number;
 }
 
-export interface HasDebugSettings {
-  debugSettings?: DebugSettings;
+export interface HasEntityDebugSettings {
+  debugSettings?: EntityDebugSettings;
 }
 
-export interface DebugSettings {
+export interface EntityDebugSettings {
   failuresEnabled?: boolean;
   allEnabled?: boolean;
   allEnabledUntil?: number;
diff --git a/ui-ngx/src/app/shared/models/rule-node.models.ts b/ui-ngx/src/app/shared/models/rule-node.models.ts
index ddfad98f11..f7d5e20d1d 100644
--- a/ui-ngx/src/app/shared/models/rule-node.models.ts
+++ b/ui-ngx/src/app/shared/models/rule-node.models.ts
@@ -27,13 +27,13 @@ import { AppState } from '@core/core.state';
 import { AbstractControl, UntypedFormGroup } from '@angular/forms';
 import { RuleChainType } from '@shared/models/rule-chain.models';
 import { DebugRuleNodeEventBody } from '@shared/models/event.models';
-import { HasDebugSettings } from '@shared/models/entity.models';
+import { HasEntityDebugSettings } from '@shared/models/entity.models';
 
 export interface RuleNodeConfiguration {
   [key: string]: any;
 }
 
-export interface RuleNode extends BaseData<RuleNodeId>, HasDebugSettings {
+export interface RuleNode extends BaseData<RuleNodeId>, HasEntityDebugSettings {
   ruleChainId?: RuleChainId;
   type: string;
   name: string;
@@ -331,7 +331,7 @@ export interface RuleNodeComponentDescriptor extends ComponentDescriptor {
   configurationDescriptor?: RuleNodeConfigurationDescriptor;
 }
 
-export interface FcRuleNodeType extends FcNode, HasDebugSettings {
+export interface FcRuleNodeType extends FcNode, HasEntityDebugSettings {
   component?: RuleNodeComponentDescriptor;
   singletonMode?: boolean;
   queueName?: string;