diff --git a/Sources/ElixxirDAppsSDK/GetDefaultCmixParams.swift b/Sources/ElixxirDAppsSDK/GetCmixParams.swift
similarity index 61%
rename from Sources/ElixxirDAppsSDK/GetDefaultCmixParams.swift
rename to Sources/ElixxirDAppsSDK/GetCmixParams.swift
index acafe907daaccff392578551c74e28f86bc30e68..6cec08fedf48901971c1f9828226ff898da0a045 100644
--- a/Sources/ElixxirDAppsSDK/GetDefaultCmixParams.swift
+++ b/Sources/ElixxirDAppsSDK/GetCmixParams.swift
@@ -1,7 +1,7 @@
 import Bindings
 import XCTestDynamicOverlay
 
-public struct GetDefaultCmixParams {
+public struct GetCmixParams {
   public var run: () -> Data
 
   public func callAsFunction() -> Data {
@@ -9,8 +9,8 @@ public struct GetDefaultCmixParams {
   }
 }
 
-extension GetDefaultCmixParams {
-  public static let live = GetDefaultCmixParams {
+extension GetCmixParams {
+  public static let liveDefault = GetCmixParams {
     guard let data = BindingsGetDefaultCMixParams() else {
       fatalError("BindingsGetDefaultCMixParams returned `nil`")
     }
@@ -18,8 +18,8 @@ extension GetDefaultCmixParams {
   }
 }
 
-extension GetDefaultCmixParams {
-  public static let unimplemented = GetDefaultCmixParams(
+extension GetCmixParams {
+  public static let unimplemented = GetCmixParams(
     run: XCTUnimplemented("\(Self.self)")
   )
 }
diff --git a/Sources/ElixxirDAppsSDK/GetDefaultE2EParams.swift b/Sources/ElixxirDAppsSDK/GetE2EParams.swift
similarity index 61%
rename from Sources/ElixxirDAppsSDK/GetDefaultE2EParams.swift
rename to Sources/ElixxirDAppsSDK/GetE2EParams.swift
index fb067fd190a7e706f3e5a6a7e5f94e649d1a3718..2ef4cbac2327187cc6791898fba3a5f52301240d 100644
--- a/Sources/ElixxirDAppsSDK/GetDefaultE2EParams.swift
+++ b/Sources/ElixxirDAppsSDK/GetE2EParams.swift
@@ -1,7 +1,7 @@
 import Bindings
 import XCTestDynamicOverlay
 
-public struct GetDefaultE2EParams {
+public struct GetE2EParams {
   public var run: () -> Data
 
   public func callAsFunction() -> Data {
@@ -9,8 +9,8 @@ public struct GetDefaultE2EParams {
   }
 }
 
-extension GetDefaultE2EParams {
-  public static let live = GetDefaultE2EParams {
+extension GetE2EParams {
+  public static let liveDefault = GetE2EParams {
     guard let data = BindingsGetDefaultE2EParams() else {
       fatalError("BindingsGetDefaultE2EParams returned `nil`")
     }
@@ -18,8 +18,8 @@ extension GetDefaultE2EParams {
   }
 }
 
-extension GetDefaultE2EParams {
-  public static let unimplemented = GetDefaultE2EParams(
+extension GetE2EParams {
+  public static let unimplemented = GetE2EParams(
     run: XCTUnimplemented("\(Self.self)")
   )
 }