diff --git a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts
index 8629433e02..c0069ecd9e 100644
--- a/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts
+++ b/npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts
@@ -1,5 +1,5 @@
 import {Component, Inject} from '@angular/core';
-import {FORM_PROP_DATA_STREAM, FormProp, EXTENSIBLE_FORM_VIEW_PROVIDER} from "@abp/ng.theme.shared/extensions";
+import {EXTENSIONS_FORM_PROP, FormProp, EXTENSIBLE_FORM_VIEW_PROVIDER} from "@abp/ng.theme.shared/extensions";
 import {FormGroup} from "@angular/forms";
 
 @Component({
@@ -23,7 +23,7 @@ export class PersonalSettingsHalfRowComponent {
   public id: string;
   public formGroup: FormGroup
 
-  constructor(@Inject(FORM_PROP_DATA_STREAM) private propData: FormProp) {
+  constructor(@Inject(EXTENSIONS_FORM_PROP) private propData: FormProp) {
     this.displayName = propData.displayName
     this.name = propData.name
     this.id = propData.id
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
index 7fe8b4fb37..e9aa694d1f 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
@@ -1,4 +1,4 @@
-import { FORM_PROP, FORM_PROP_DATA } from './../../tokens/extensions.token';
+import { EXTENSIONS_FORM_PROP_DATA, EXTENSIONS_FORM_PROP } from './../../tokens/extensions.token';
 import {ABP, AbpValidators, ConfigStateService, TrackByService} from '@abp/ng.core';
 import {
   AfterViewInit,
@@ -31,7 +31,7 @@ import {FormProp} from '../../models/form-props';
 import {PropData} from '../../models/props';
 import {selfFactory} from '../../utils/factory.util';
 import {addTypeaheadTextSuffix} from '../../utils/typeahead.util';
- 
+
 @Component({
   selector: 'abp-extensible-form-prop',
   templateUrl: './extensible-form-prop.component.html',
@@ -188,12 +188,12 @@ export class ExtensibleFormPropComponent implements OnChanges, AfterViewInit {
       this.injectorForCustomComponent = Injector.create({
         providers: [
           {
-            provide: FORM_PROP,
+            provide: EXTENSIONS_FORM_PROP,
             useValue: currentProp
           },
           {
-            provide: FORM_PROP_DATA,
-            useValue: (data?.currentValue as PropData)?.record 
+            provide: EXTENSIONS_FORM_PROP_DATA,
+            useValue: (data?.currentValue as PropData)?.record
           },
           { provide: ControlContainer, useExisting: FormGroupDirective }
         ],