diff --git a/Library/Package.resolved b/Library/Package.resolved
index 367acf85..82bd861f 100644
--- a/Library/Package.resolved
+++ b/Library/Package.resolved
@@ -41,7 +41,7 @@
       "kind" : "remoteSourceControl",
       "location" : "git@github.com:passepartoutvpn/passepartoutkit-source",
       "state" : {
-        "revision" : "51288509f90b0d4dd2c4ceee2af5cfb36e6319f1"
+        "revision" : "4d9cb52344de9c4a075389966a706574af936c08"
       }
     },
     {
diff --git a/Library/Package.swift b/Library/Package.swift
index 82083ded..d9197aaa 100644
--- a/Library/Package.swift
+++ b/Library/Package.swift
@@ -52,7 +52,7 @@ let package = Package(
     ],
     dependencies: [
 //        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.12.0"),
-        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "51288509f90b0d4dd2c4ceee2af5cfb36e6319f1"),
+        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "4d9cb52344de9c4a075389966a706574af936c08"),
 //        .package(path: "../../passepartoutkit-source"),
         .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", from: "0.9.1"),
 //        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", revision: "031863a1cd683962a7dfe68e20b91fa820a1ecce"),
diff --git a/Library/Sources/AppDataProviders/Strategy/CDVPNProviderServerRepositoryV3.swift b/Library/Sources/AppDataProviders/Strategy/CDVPNProviderServerRepositoryV3.swift
index 9f5f2cd4..9b612cae 100644
--- a/Library/Sources/AppDataProviders/Strategy/CDVPNProviderServerRepositoryV3.swift
+++ b/Library/Sources/AppDataProviders/Strategy/CDVPNProviderServerRepositoryV3.swift
@@ -39,7 +39,7 @@ final class CDVPNProviderServerRepositoryV3: VPNProviderServerRepository {
         self.providerId = providerId
     }
 
-    func availableOptions<Configuration>(for configurationType: Configuration.Type) async throws -> VPNFilterOptions where Configuration: ConfigurationIdentifiable {
+    func availableOptions<Configuration>(for configurationType: Configuration.Type) async throws -> VPNFilterOptions where Configuration: IdentifiableConfiguration {
         try await context.perform {
             let mapper = DomainMapper()
 
diff --git a/Library/Sources/AppUIMain/Views/Providers/ProviderContentModifier.swift b/Library/Sources/AppUIMain/Views/Providers/ProviderContentModifier.swift
index 9db663e1..5128826a 100644
--- a/Library/Sources/AppUIMain/Views/Providers/ProviderContentModifier.swift
+++ b/Library/Sources/AppUIMain/Views/Providers/ProviderContentModifier.swift
@@ -29,7 +29,7 @@ import PassepartoutKit
 import SwiftUI
 import UILibrary
 
-struct ProviderContentModifier<Entity, ProviderRows>: ViewModifier where Entity: ProviderEntityType, ProviderRows: View {
+struct ProviderContentModifier<Entity, ProviderRows>: ViewModifier where Entity: ProviderEntity, ProviderRows: View {
 
     @EnvironmentObject
     private var providerManager: ProviderManager
diff --git a/Library/Sources/AppUIMain/Views/VPN/VPNProviderContentModifier.swift b/Library/Sources/AppUIMain/Views/VPN/VPNProviderContentModifier.swift
index b9f8dfb4..a9d529f9 100644
--- a/Library/Sources/AppUIMain/Views/VPN/VPNProviderContentModifier.swift
+++ b/Library/Sources/AppUIMain/Views/VPN/VPNProviderContentModifier.swift
@@ -28,7 +28,7 @@ import CommonLibrary
 import PassepartoutKit
 import SwiftUI
 
-struct VPNProviderContentModifier<Configuration, ProviderRows>: ViewModifier where Configuration: ConfigurationIdentifiable, ProviderRows: View {
+struct VPNProviderContentModifier<Configuration, ProviderRows>: ViewModifier where Configuration: IdentifiableConfiguration, ProviderRows: View {
     var apis: [APIMapper] = API.shared
 
     @Binding
diff --git a/Library/Sources/AppUIMain/Views/VPN/VPNProviderServerCoordinator.swift b/Library/Sources/AppUIMain/Views/VPN/VPNProviderServerCoordinator.swift
index 86e5ea46..ed5e9324 100644
--- a/Library/Sources/AppUIMain/Views/VPN/VPNProviderServerCoordinator.swift
+++ b/Library/Sources/AppUIMain/Views/VPN/VPNProviderServerCoordinator.swift
@@ -27,7 +27,7 @@ import CommonUtils
 import PassepartoutKit
 import SwiftUI
 
-struct VPNProviderServerCoordinator<Configuration>: View where Configuration: ConfigurationIdentifiable {
+struct VPNProviderServerCoordinator<Configuration>: View where Configuration: IdentifiableConfiguration {
 
     @Environment(\.dismiss)
     private var dismiss
diff --git a/Library/Sources/AppUIMain/Views/VPN/VPNProviderServerView.swift b/Library/Sources/AppUIMain/Views/VPN/VPNProviderServerView.swift
index 0ccd2f52..0d59b032 100644
--- a/Library/Sources/AppUIMain/Views/VPN/VPNProviderServerView.swift
+++ b/Library/Sources/AppUIMain/Views/VPN/VPNProviderServerView.swift
@@ -29,7 +29,7 @@ import CommonUtils
 import PassepartoutKit
 import SwiftUI
 
-struct VPNProviderServerView<Configuration>: View where Configuration: ConfigurationIdentifiable {
+struct VPNProviderServerView<Configuration>: View where Configuration: IdentifiableConfiguration {
 
     @EnvironmentObject
     private var providerManager: ProviderManager
diff --git a/Library/Sources/UILibrary/Extensions/ModuleDraftEditing+UI.swift b/Library/Sources/UILibrary/Extensions/ModuleDraftEditing+UI.swift
index f57efab9..11353283 100644
--- a/Library/Sources/UILibrary/Extensions/ModuleDraftEditing+UI.swift
+++ b/Library/Sources/UILibrary/Extensions/ModuleDraftEditing+UI.swift
@@ -43,7 +43,7 @@ extension ModuleDraftEditing where Draft: MutableProviderSelecting {
         }
     }
 
-    public var providerEntity: Binding<Draft.CustomSelectionType.EntityType?> {
+    public var providerEntity: Binding<Draft.CustomProviderSelection.Entity?> {
         Binding {
             draft.providerEntity.wrappedValue
         } set: {
@@ -51,7 +51,7 @@ extension ModuleDraftEditing where Draft: MutableProviderSelecting {
         }
     }
 
-    public var providerOptions: Binding<Set<Draft.CustomSelectionType.OptionType>?> {
+    public var providerOptions: Binding<Set<Draft.CustomProviderSelection.Option>?> {
         Binding {
             draft.providerOptions.wrappedValue
         } set: {