diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt
index 8ef5e4c0cc..a50bc09456 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/actions/PersonalizeAction.kt
@@ -10,10 +10,10 @@ import com.tangem.tangemtest.ucase.domain.paramsManager.PayloadKey
 import com.tangem.tangemtest.ucase.tunnel.ActionView
 import com.tangem.tangemtest.ucase.tunnel.ItemError
 import com.tangem.tangemtest.ucase.variants.personalize.CardNumber
-import com.tangem.tangemtest.ucase.variants.personalize.converter.PersonalizeConfigConverter
+import com.tangem.tangemtest.ucase.variants.personalize.converter.PersonalizationConfigConverter
 import com.tangem.tangemtest.ucase.variants.personalize.converter.fromTo.PersonalizeConfigToCardConfig
-import com.tangem.tangemtest.ucase.variants.personalize.dto.DefaultPersonalizeParams
-import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizeConfig
+import com.tangem.tangemtest.ucase.variants.personalize.dto.DefaultPersonalizationParams
+import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizationConfig
 import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf
 
 /**
@@ -33,11 +33,11 @@ class PersonalizeAction : BaseAction() {
             return
         }
 
-        val issuer = DefaultPersonalizeParams.issuer()
-        val acquirer = DefaultPersonalizeParams.acquirer()
-        val manufacturer = DefaultPersonalizeParams.manufacturer()
+        val issuer = DefaultPersonalizationParams.issuer()
+        val acquirer = DefaultPersonalizationParams.acquirer()
+        val manufacturer = DefaultPersonalizationParams.manufacturer()
 
-        val personalizeConfig = PersonalizeConfigConverter().convert(itemList, PersonalizeConfig())
+        val personalizeConfig = PersonalizationConfigConverter().convert(itemList, PersonalizationConfig())
         val cardConfig = PersonalizeConfigToCardConfig().convert(personalizeConfig)
 
         attrs.cardManager.personalize(cardConfig, issuer, manufacturer, acquirer) {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizeItemsManager.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizationItemsManager.kt
similarity index 77%
rename from tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizeItemsManager.kt
rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizationItemsManager.kt
index a483cfe69d..e67e278aca 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizeItemsManager.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/domain/paramsManager/managers/PersonalizationItemsManager.kt
@@ -6,17 +6,17 @@ import com.tangem.CardManager
 import com.tangem.tangemtest.commons.Store
 import com.tangem.tangemtest.ucase.domain.actions.PersonalizeAction
 import com.tangem.tangemtest.ucase.domain.paramsManager.ActionCallback
-import com.tangem.tangemtest.ucase.variants.personalize.converter.PersonalizeConfigConverter
-import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizeConfig
+import com.tangem.tangemtest.ucase.variants.personalize.converter.PersonalizationConfigConverter
+import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizationConfig
 
 /**
 [REDACTED_AUTHOR]
  */
-class PersonalizeItemsManager(
-        private val store: Store<PersonalizeConfig>
+class PersonalizationItemsManager(
+        private val store: Store<PersonalizationConfig>
 ) : BaseItemsManager(PersonalizeAction()) {
 
-    private val converter = PersonalizeConfigConverter()
+    private val converter = PersonalizationConfigConverter()
 
     init {
         val config = store.restore()
@@ -29,7 +29,7 @@ class PersonalizeItemsManager(
 
     @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
     fun onDestroy() {
-        val config = converter.convert(itemList, PersonalizeConfig())
+        val config = converter.convert(itemList, PersonalizationConfig())
         store.save(config)
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/MainResourceHolder.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/MainResourceHolder.kt
index 44028d9018..cf6a61abbc 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/MainResourceHolder.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/MainResourceHolder.kt
@@ -3,7 +3,7 @@ package com.tangem.tangemtest.ucase.resources
 import com.tangem.tangemtest.R
 import com.tangem.tangemtest._arch.structure.Id
 import com.tangem.tangemtest.ucase.resources.initializers.ActionResources
-import com.tangem.tangemtest.ucase.resources.initializers.PersonalizeResources
+import com.tangem.tangemtest.ucase.resources.initializers.PersonalizationResources
 import com.tangem.tangemtest.ucase.resources.initializers.ResponseResources
 import com.tangem.tangemtest.ucase.resources.initializers.TlvResources
 import ru.dev.gbixahue.eu4d.lib.kotlin.common.BaseTypedHolder
@@ -15,7 +15,7 @@ open class ResourceHolder<T> : BaseTypedHolder<T, Resources>()
 
 object MainResourceHolder : ResourceHolder<Id>() {
     init {
-        PersonalizeResources().init(this)
+        PersonalizationResources().init(this)
         ActionResources().init(this)
         TlvResources().init(this)
         ResponseResources().init(this)
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizationResources.kt
similarity index 99%
rename from tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt
rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizationResources.kt
index fe56561030..a45bc55ed4 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizationResources.kt
@@ -10,7 +10,7 @@ import ru.dev.gbixahue.eu4d.lib.kotlin.common.TypedHolder
 /**
 [REDACTED_AUTHOR]
  */
-class PersonalizeResources() {
+class PersonalizationResources() {
     fun init(holder: ResourceHolder<Id>) {
         initBlock(holder)
         initCardNumber(holder)
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt
index b8573bbdf5..6305b68975 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt
@@ -6,11 +6,9 @@ import com.tangem.tangemtest._arch.structure.Id
 [REDACTED_AUTHOR]
  */
 
-interface PersonalizeId : Id
+interface PersonalizationId : Id
 
-interface BlockItem : PersonalizeId
-
-enum class BlockId : PersonalizeId {
+enum class BlockId : PersonalizationId {
     CardNumber,
     Common,
     SigningMethod,
@@ -24,13 +22,13 @@ enum class BlockId : PersonalizeId {
     Pins,
 }
 
-enum class CardNumber : BlockItem {
+enum class CardNumber : PersonalizationId {
     Series,
     Number,
     BatchId,
 }
 
-enum class Common : BlockItem {
+enum class Common : PersonalizationId {
     Curve,
     Blockchain,
     BlockchainCustom,
@@ -38,7 +36,7 @@ enum class Common : BlockItem {
     CreateWallet,
 }
 
-enum class SigningMethod : BlockItem {
+enum class SigningMethod : PersonalizationId {
     SignTx,
     SignTxRaw,
     SignValidatedTx,
@@ -48,7 +46,7 @@ enum class SigningMethod : BlockItem {
     SignExternal,
 }
 
-enum class SignHashExProp : BlockItem {
+enum class SignHashExProp : PersonalizationId {
     PinLessFloorLimit,
     CryptoExKey,
     RequireTerminalCertSig,
@@ -56,26 +54,26 @@ enum class SignHashExProp : BlockItem {
     CheckPin3,
 }
 
-enum class Denomination : BlockItem {
+enum class Denomination : PersonalizationId {
     WriteOnPersonalize,
     Denomination,
 }
 
-enum class Token : BlockItem {
+enum class Token : PersonalizationId {
     ItsToken,
     Symbol,
     ContractAddress,
     Decimal
 }
 
-enum class ProductMask : BlockItem {
+enum class ProductMask : PersonalizationId {
     Note,
     Tag,
     IdCard,
     IdIssuerCard
 }
 
-enum class SettingsMask : BlockItem {
+enum class SettingsMask : PersonalizationId {
     IsReusable,
     NeedActivation,
     ForbidPurge,
@@ -94,12 +92,12 @@ enum class SettingsMask : BlockItem {
     RestrictOverwriteExtraIssuerData,
 }
 
-enum class SettingsMaskProtocolEnc : BlockItem {
+enum class SettingsMaskProtocolEnc : PersonalizationId {
     AllowUnencrypted,
     AllowStaticEncryption
 }
 
-enum class SettingsMaskNdef : BlockItem {
+enum class SettingsMaskNdef : PersonalizationId {
     UseNdef,
     DynamicNdef,
     DisablePrecomputedNdef,
@@ -108,7 +106,7 @@ enum class SettingsMaskNdef : BlockItem {
     Uri,
 }
 
-enum class Pins : BlockItem {
+enum class Pins : PersonalizationId {
     Pin,
     Pin2,
     Pin3,
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt
index 6f7acaba65..77a68278f8 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/PersonalizationConfigStore.kt
@@ -6,21 +6,21 @@ import androidx.core.content.edit
 import com.google.gson.Gson
 import com.tangem.tangemtest.AppTangemDemo
 import com.tangem.tangemtest.commons.Store
-import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizeConfig
+import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizationConfig
 
-class PersonalizationConfigStore(context: Context) : Store<PersonalizeConfig> {
+class PersonalizationConfigStore(context: Context) : Store<PersonalizationConfig> {
 
     private val key = "personalization_config"
 
     private val sp: SharedPreferences = (context.applicationContext as AppTangemDemo).sharedPreferences()
     private val gson: Gson = Gson()
 
-    override fun save(config: PersonalizeConfig) {
+    override fun save(config: PersonalizationConfig) {
         sp.edit(true) { putString(key, gson.toJson(config)) }
     }
 
-    override fun restore(): PersonalizeConfig {
-        val json = sp.getString(key, gson.toJson(PersonalizeConfig()))
-        return gson.fromJson(json, PersonalizeConfig::class.java)
+    override fun restore(): PersonalizationConfig {
+        val json = sp.getString(key, gson.toJson(PersonalizationConfig()))
+        return gson.fromJson(json, PersonalizationConfig::class.java)
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt
index 54ad12d4ab..49dd2faa8d 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt
@@ -4,16 +4,16 @@ import com.tangem.commands.EllipticCurve
 import com.tangem.tangemtest._arch.structure.Id
 import com.tangem.tangemtest._arch.structure.impl.KeyValue
 import com.tangem.tangemtest.ucase.variants.personalize.*
-import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizeConfig
+import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizationConfig
 import ru.dev.gbixahue.eu4d.lib.kotlin.common.BaseTypedHolder
 
 /**
 [REDACTED_AUTHOR]
  */
-class PersonalizeConfigValuesHolder : BaseTypedHolder<Id, Value>() {
+class ConfigValuesHolder : BaseTypedHolder<Id, Value>() {
 
     // All registered association values can't be objects
-    fun init(default: PersonalizeConfig) {
+    fun init(default: PersonalizationConfig) {
         register(CardNumber.Series, Value(default.series))
         register(CardNumber.Number, Value(default.startNumber))
         register(CardNumber.BatchId, Value(default.batchId))
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizeConfigConverter.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizationConfigConverter.kt
similarity index 55%
rename from tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizeConfigConverter.kt
rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizationConfigConverter.kt
index 6b9b041b49..7fbf672259 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizeConfigConverter.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/PersonalizationConfigConverter.kt
@@ -4,23 +4,23 @@ import com.tangem.tangemtest._arch.structure.abstraction.Item
 import com.tangem.tangemtest._arch.structure.abstraction.ItemsToModel
 import com.tangem.tangemtest._arch.structure.abstraction.ModelConverter
 import com.tangem.tangemtest._arch.structure.abstraction.ModelToItems
-import com.tangem.tangemtest.ucase.variants.personalize.converter.fromTo.ItemsToPersonalizeConfig
-import com.tangem.tangemtest.ucase.variants.personalize.converter.fromTo.PersonalizeConfigToItem
-import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizeConfig
+import com.tangem.tangemtest.ucase.variants.personalize.converter.fromTo.ItemsToPersonalizationConfig
+import com.tangem.tangemtest.ucase.variants.personalize.converter.fromTo.PersonalizationConfigToItems
+import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizationConfig
 
 /**
 [REDACTED_AUTHOR]
  */
-class PersonalizeConfigConverter : ModelConverter<PersonalizeConfig> {
+class PersonalizationConfigConverter : ModelConverter<PersonalizationConfig> {
 
-    private val toModel: ItemsToModel<PersonalizeConfig> = ItemsToPersonalizeConfig()
-    private val toItems: ModelToItems<PersonalizeConfig> = PersonalizeConfigToItem()
+    private val toModel: ItemsToModel<PersonalizationConfig> = ItemsToPersonalizationConfig()
+    private val toItems: ModelToItems<PersonalizationConfig> = PersonalizationConfigToItems()
 
-    override fun convert(from: List<Item>, default: PersonalizeConfig): PersonalizeConfig {
+    override fun convert(from: List<Item>, default: PersonalizationConfig): PersonalizationConfig {
         return toModel.convert(from, default)
     }
 
-    override fun convert(from: PersonalizeConfig): List<Item> {
+    override fun convert(from: PersonalizationConfig): List<Item> {
         return toItems.convert(from)
     }
 }
\ No newline at end of file
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemsToPersonalizeConfig.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemsToPersonalizationConfig.kt
similarity index 92%
rename from tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemsToPersonalizeConfig.kt
rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemsToPersonalizationConfig.kt
index 177ac87463..95fd18908d 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemsToPersonalizeConfig.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemsToPersonalizationConfig.kt
@@ -4,17 +4,17 @@ import com.tangem.tangemtest._arch.structure.Id
 import com.tangem.tangemtest._arch.structure.abstraction.*
 import com.tangem.tangemtest._arch.structure.impl.ListValueWrapper
 import com.tangem.tangemtest.ucase.variants.personalize.*
-import com.tangem.tangemtest.ucase.variants.personalize.converter.PersonalizeConfigValuesHolder
-import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizeConfig
+import com.tangem.tangemtest.ucase.variants.personalize.converter.ConfigValuesHolder
+import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizationConfig
 import ru.dev.gbixahue.eu4d.lib.android.global.log.Log
 
 /**
 [REDACTED_AUTHOR]
  */
-class ItemsToPersonalizeConfig : ItemsToModel<PersonalizeConfig> {
-    protected val valuesHolder = PersonalizeConfigValuesHolder()
+class ItemsToPersonalizationConfig : ItemsToModel<PersonalizationConfig> {
+    protected val valuesHolder = ConfigValuesHolder()
 
-    override fun convert(from: List<Item>, default: PersonalizeConfig): PersonalizeConfig {
+    override fun convert(from: List<Item>, default: PersonalizationConfig): PersonalizationConfig {
         valuesHolder.init(default)
         mapListItems(from)
         return createModel()
@@ -34,8 +34,8 @@ class ItemsToPersonalizeConfig : ItemsToModel<PersonalizeConfig> {
         }
     }
 
-    private fun createModel(): PersonalizeConfig {
-        val export = PersonalizeConfig()
+    private fun createModel(): PersonalizationConfig {
+        val export = PersonalizationConfig()
         export.series = getTyped(CardNumber.Series)
         export.startNumber = getTyped(CardNumber.Number)
         export.curveID = getTyped(Common.Curve)
@@ -101,7 +101,7 @@ class ItemsToPersonalizeConfig : ItemsToModel<PersonalizeConfig> {
         return getTypedBy<Type>(valuesHolder, id)!!
     }
 
-    private inline fun <reified Type> getTypedBy(holder: PersonalizeConfigValuesHolder, id: Id): Type? {
+    private inline fun <reified Type> getTypedBy(holder: ConfigValuesHolder, id: Id): Type? {
         Log.d(this, "getTyped for id: $id")
         var typedValue = holder.get(id)?.get()
 
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/PersonalizeConfigTo.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/PersonalizeConfigTo.kt
index eb560d496d..30a581378f 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/PersonalizeConfigTo.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/PersonalizeConfigTo.kt
@@ -11,19 +11,19 @@ import com.tangem.tangemtest._arch.structure.abstraction.*
 import com.tangem.tangemtest._arch.structure.impl.*
 import com.tangem.tangemtest.ucase.domain.paramsManager.PayloadKey
 import com.tangem.tangemtest.ucase.variants.personalize.*
-import com.tangem.tangemtest.ucase.variants.personalize.converter.PersonalizeConfigValuesHolder
-import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizeConfig
+import com.tangem.tangemtest.ucase.variants.personalize.converter.ConfigValuesHolder
+import com.tangem.tangemtest.ucase.variants.personalize.dto.PersonalizationConfig
 import ru.dev.gbixahue.eu4d.lib.kotlin.common.Converter
 import java.util.*
 
 /**
 [REDACTED_AUTHOR]
  */
-class PersonalizeConfigToItem : ModelToItems<PersonalizeConfig> {
-    private val valuesHolder = PersonalizeConfigValuesHolder()
+class PersonalizationConfigToItems : ModelToItems<PersonalizationConfig> {
+    private val valuesHolder = ConfigValuesHolder()
     private val itemTypes = ItemTypes()
 
-    override fun convert(from: PersonalizeConfig): List<Item> {
+    override fun convert(from: PersonalizationConfig): List<Item> {
         valuesHolder.init(from)
         val blocList = mutableListOf<Item>()
         blocList.add(cardNumber())
@@ -183,7 +183,7 @@ class PersonalizeConfigToItem : ModelToItems<PersonalizeConfig> {
         return ListItemBlock(id).apply { addItem(TextItem(id)) }
     }
 
-    private fun addPayload(block: Block, from: PersonalizeConfig) {
+    private fun addPayload(block: Block, from: PersonalizationConfig) {
         block.payload[PayloadKey.incomingJson] = from
     }
 
@@ -201,9 +201,9 @@ class PersonalizeConfigToItem : ModelToItems<PersonalizeConfig> {
     }
 }
 
-class PersonalizeConfigToCardConfig : Converter<PersonalizeConfig, CardConfig> {
+class PersonalizeConfigToCardConfig : Converter<PersonalizationConfig, CardConfig> {
 
-    override fun convert(from: PersonalizeConfig): CardConfig {
+    override fun convert(from: PersonalizationConfig): CardConfig {
         val signingMethod = com.tangem.commands.SigningMethod.build(
                 signHash = from.SigningMethod0,
                 signRaw = from.SigningMethod1,
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/DefaultPersonalizeParams.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/DefaultPersonalizationParams.kt
similarity index 97%
rename from tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/DefaultPersonalizeParams.kt
rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/DefaultPersonalizationParams.kt
index c8d9afa0d1..d82099cab8 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/DefaultPersonalizeParams.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/DefaultPersonalizationParams.kt
@@ -9,7 +9,7 @@ import com.tangem.common.KeyPair
 [REDACTED_AUTHOR]
  */
 
-interface DefaultPersonalizeParams {
+interface DefaultPersonalizationParams {
     companion object {
 
         fun issuer(): Issuer {
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeConfig.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizationConfig.kt
similarity index 98%
rename from tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeConfig.kt
rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizationConfig.kt
index bc855da8b1..1b09726453 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeConfig.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizationConfig.kt
@@ -3,7 +3,7 @@ package com.tangem.tangemtest.ucase.variants.personalize.dto
 /**
 [REDACTED_AUTHOR]
  */
-class PersonalizeConfig {
+class PersonalizationConfig {
 
     // Card number
     var series = "BB"
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizeFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
similarity index 86%
rename from tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizeFragment.kt
rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
index 740eeb0dde..dc6a412473 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizeFragment.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt
@@ -9,27 +9,27 @@ import com.tangem.tangemtest._arch.structure.abstraction.Item
 import com.tangem.tangemtest._arch.widget.WidgetBuilder
 import com.tangem.tangemtest.ucase.domain.paramsManager.ItemsManager
 import com.tangem.tangemtest.ucase.domain.paramsManager.PayloadKey
-import com.tangem.tangemtest.ucase.domain.paramsManager.managers.PersonalizeItemsManager
+import com.tangem.tangemtest.ucase.domain.paramsManager.managers.PersonalizationItemsManager
 import com.tangem.tangemtest.ucase.tunnel.ActionView
 import com.tangem.tangemtest.ucase.tunnel.CardError
 import com.tangem.tangemtest.ucase.tunnel.ItemError
 import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment
 import com.tangem.tangemtest.ucase.variants.personalize.PersonalizationConfigStore
-import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.PersonalizeItemBuilder
+import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.PersonalizationItemBuilder
 import ru.dev.gbixahue.eu4d.lib.android.global.log.Log
 
 /**
 [REDACTED_AUTHOR]
  */
-class PersonalizeFragment : BaseCardActionFragment() {
+class PersonalizationFragment : BaseCardActionFragment() {
 
-    override val itemsManager: ItemsManager by lazy { PersonalizeItemsManager(PersonalizationConfigStore(requireContext())) }
+    override val itemsManager: ItemsManager by lazy { PersonalizationItemsManager(PersonalizationConfigStore(requireContext())) }
 
-    override fun getLayoutId(): Int = R.layout.fg_personalize
+    override fun getLayoutId(): Int = R.layout.fg_personalization
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        lifecycle.addObserver(itemsManager as PersonalizeItemsManager)
+        lifecycle.addObserver(itemsManager as PersonalizationItemsManager)
     }
 
     override fun initFab() {
@@ -44,7 +44,7 @@ class PersonalizeFragment : BaseCardActionFragment() {
             Log.d(this, "ldBlockList size: ${list.size}")
             itemList.clear()
             itemList.addAll(list)
-            itemList.forEach { WidgetBuilder(PersonalizeItemBuilder()).build(it, itemContainer) }
+            itemList.forEach { WidgetBuilder(PersonalizationItemBuilder()).build(it, itemContainer) }
             actionVM.attachToPayload(mutableMapOf(
                     PayloadKey.actionView to this as ActionView,
                     PayloadKey.itemList to itemList
diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/PersonalizeItemBuilder.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/PersonalizationItemBuilder.kt
similarity index 93%
rename from tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/PersonalizeItemBuilder.kt
rename to tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/PersonalizationItemBuilder.kt
index 30788d1e70..53b6c336e4 100644
--- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/PersonalizeItemBuilder.kt
+++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/widgets/PersonalizationItemBuilder.kt
@@ -9,7 +9,7 @@ import com.tangem.tangemtest._arch.widget.abstraction.ViewWidget
 /**
 [REDACTED_AUTHOR]
  */
-class PersonalizeItemBuilder : ItemWidgetBuilder {
+class PersonalizationItemBuilder : ItemWidgetBuilder {
     override fun build(item: BaseItem<*>, parent: ViewGroup): ViewWidget? {
         return when (item) {
             is TextItem -> BlockHeadWidget(parent, item)
diff --git a/tangem-demo/src/main/res/layout/fg_personalize.xml b/tangem-demo/src/main/res/layout/fg_personalization.xml
similarity index 100%
rename from tangem-demo/src/main/res/layout/fg_personalize.xml
rename to tangem-demo/src/main/res/layout/fg_personalization.xml
diff --git a/tangem-demo/src/main/res/navigation/navigation.xml b/tangem-demo/src/main/res/navigation/navigation.xml
index 8107b48599..1cc5427895 100644
--- a/tangem-demo/src/main/res/navigation/navigation.xml
+++ b/tangem-demo/src/main/res/navigation/navigation.xml
@@ -67,9 +67,9 @@
 
     <fragment
         android:id="@+id/nav_personalize"
-        android:name="com.tangem.tangemtest.ucase.variants.personalize.ui.PersonalizeFragment"
+        android:name="com.tangem.tangemtest.ucase.variants.personalize.ui.PersonalizationFragment"
         android:label="@string/action_personalize"
-        tools:layout="@layout/fg_personalize" />
+        tools:layout="@layout/fg_personalization" />
 
     <fragment
         android:id="@+id/nav_depersonalize"