diff --git a/Package.swift b/Package.swift
index c680de3..e0e603d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -3,22 +3,22 @@
 import PackageDescription
 
 let package = Package(
-    name: "PushAPI",
+    name: "PushMessageDefinitions",
     platforms: [
        .macOS(.v10_15),
        .iOS(.v13)
     ],
     products: [
         .library(
-            name: "PushAPI",
-            targets: ["PushAPI"]),
+            name: "PushMessageDefinitions",
+            targets: ["PushMessageDefinitions"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/kylebrowning/APNSwift.git", "3.0.0" ..< "5.0.0"),
+        .package(url: "https://github.com/swift-server-community/APNSwift.git", from: "3.0.0"),
     ],
     targets: [
         .target(
-            name: "PushAPI",
+            name: "PushMessageDefinitions",
             dependencies: [.product(name: "APNSwift", package: "APNSwift")])
     ]
 )
diff --git a/README.md b/README.md
index 48f7996..5c77fd9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Push-API
 
-This package contains message definitions, routes and information specifying the interface to a [Push-Server](https://christophhagen.de/git/ch/Push-Server.git). The package is  used to implement both the client and the server using common definitions to ensure compatibility.
+This package contains message definitions, routes and information specifying the interface to a [Push-Server](https://christophhagen.de/git/ch/Push-Server.git). The package is used to implement both the client and the server using common definitions to ensure compatibility.
 
 The package depends on [APNSwift](https://github.com/swift-server-community/APNSwift.git), which provides the definitions for push message contents and is used by the server to connect to the Apple Push Notification Service (APNs).
 
@@ -9,11 +9,11 @@ The package depends on [APNSwift](https://github.com/swift-server-community/APNS
 Add the package dependency in your `Package.swift` file:
 ```swift
 dependencies: [
-    .package(url: "https://christophhagen.de/git/ch/Push-API.git", from: "0.4.0"),
+    .package(url: "https://christophhagen.de/git/ch/Push-Definitions.git", from: "1.0.0"),
 ],
 ```
 
 Then import the module in your code:
 ```swift
-import PushAPI
+import PushMessageDefinitions
 ```
diff --git a/Sources/PushAPI/AdminRequest.swift b/Sources/PushMessageDefinitions/AdminRequest.swift
similarity index 100%
rename from Sources/PushAPI/AdminRequest.swift
rename to Sources/PushMessageDefinitions/AdminRequest.swift
diff --git a/Sources/PushAPI/AuthenticatedPushMessage.swift b/Sources/PushMessageDefinitions/AuthenticatedPushMessage.swift
similarity index 100%
rename from Sources/PushAPI/AuthenticatedPushMessage.swift
rename to Sources/PushMessageDefinitions/AuthenticatedPushMessage.swift
diff --git a/Sources/PushAPI/DeviceAuthentication.swift b/Sources/PushMessageDefinitions/DeviceAuthentication.swift
similarity index 100%
rename from Sources/PushAPI/DeviceAuthentication.swift
rename to Sources/PushMessageDefinitions/DeviceAuthentication.swift
diff --git a/Sources/PushAPI/DeviceDecision.swift b/Sources/PushMessageDefinitions/DeviceDecision.swift
similarity index 100%
rename from Sources/PushAPI/DeviceDecision.swift
rename to Sources/PushMessageDefinitions/DeviceDecision.swift
diff --git a/Sources/PushAPI/DeviceRegistration.swift b/Sources/PushMessageDefinitions/DeviceRegistration.swift
similarity index 100%
rename from Sources/PushAPI/DeviceRegistration.swift
rename to Sources/PushMessageDefinitions/DeviceRegistration.swift
diff --git a/Sources/PushAPI/DeviceUpdate.swift b/Sources/PushMessageDefinitions/DeviceUpdate.swift
similarity index 100%
rename from Sources/PushAPI/DeviceUpdate.swift
rename to Sources/PushMessageDefinitions/DeviceUpdate.swift
diff --git a/Sources/PushAPI/Push.swift b/Sources/PushMessageDefinitions/Push.swift
similarity index 100%
rename from Sources/PushAPI/Push.swift
rename to Sources/PushMessageDefinitions/Push.swift
diff --git a/Sources/PushAPI/PushMessage.swift b/Sources/PushMessageDefinitions/PushMessage.swift
similarity index 100%
rename from Sources/PushAPI/PushMessage.swift
rename to Sources/PushMessageDefinitions/PushMessage.swift