diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 26d3cefb..ac177cde 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,6 +2,7 @@
 name: "Release Libraries"
 
 env:
+  JAVA_VERSION: 11
   RUST_VERSION: "1.73.0"
   CROSS_VERSION: "0.2.4"
 
diff --git a/.scripts/TemplatePackage.swift b/.scripts/TemplatePackage.swift
index 0e945777..d6b462d4 100644
--- a/.scripts/TemplatePackage.swift
+++ b/.scripts/TemplatePackage.swift
@@ -17,11 +17,11 @@ let package = Package(
     targets: [
         .target(
             name: "AnoncredsSwift",
-            dependencies: ["anoncredsFFI"],
+            dependencies: ["anoncreds_wrapperFFI"],
             path: "uniffi/output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/Swift"
         ),
         .target(
-            name: "anoncredsFFI",
+            name: "anoncreds_wrapperFFI",
             dependencies: ["libanoncreds"],
             path: "uniffi/output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/C"),
         // LOCAL
diff --git a/uniffi/build-release-apple-universal.sh b/uniffi/build-release-apple-universal.sh
index 518f72fe..865630fc 100755
--- a/uniffi/build-release-apple-universal.sh
+++ b/uniffi/build-release-apple-universal.sh
@@ -71,9 +71,9 @@ rm -f "$dest_dir/$zip_name" || true
 (cd $source_dir && zip -r "../../$dest_dir/$zip_name" $target_dir_name)
 
 echo "Copy .swift binders"
-rm -f "./output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/Swift/anoncreds.swift" || true
+rm -f "./output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/Swift/anoncreds_wrapper.swift" || true
 mkdir -p ./output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/Swift || true
-mv "./wrappers/swift/anoncreds/anoncreds.swift" "./output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/Swift/anoncreds.swift"
+mv "./wrappers/swift/anoncreds/anoncreds_wrapper.swift" "./output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/Swift/anoncreds_wrapper.swift"
 
-rm -f "/wrappers/swift/anoncreds/anoncreds.swift" || true
+rm -f "/wrappers/swift/anoncreds/anoncreds_wrapper.swift" || true
 
diff --git a/uniffi/output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/C/include/bridge.h b/uniffi/output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/C/include/bridge.h
index 0da7f777..34458d0f 100644
--- a/uniffi/output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/C/include/bridge.h
+++ b/uniffi/output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/C/include/bridge.h
@@ -8,6 +8,6 @@
 #ifndef Header_h
 #define Header_h
 
-#include "anoncredsFFI.h"
+#include "anoncreds_wrapperFFI.h"
 
 #endif /* Header_h */
diff --git a/uniffi/output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/Swift/anoncreds.swift b/uniffi/output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/Swift/anoncreds_wrapper.swift
similarity index 100%
rename from uniffi/output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/Swift/anoncreds.swift
rename to uniffi/output-frameworks/anoncreds-swift/AnoncredsSwift/Sources/Swift/anoncreds_wrapper.swift