diff --git a/Sources/GRPCCore/Server.swift b/Sources/GRPCCore/GRPCServer.swift
similarity index 98%
rename from Sources/GRPCCore/Server.swift
rename to Sources/GRPCCore/GRPCServer.swift
index 43a48041f..07c92715e 100644
--- a/Sources/GRPCCore/Server.swift
+++ b/Sources/GRPCCore/GRPCServer.swift
@@ -34,7 +34,7 @@ import Atomics
 /// The following example demonstrates how to create and configure a server.
 ///
 /// ```swift
-/// let server = Server()
+/// let server = GRPCServer()
 ///
 /// // Create and add an in-process transport.
 /// let inProcessTransport = InProcessServerTransport()
@@ -66,7 +66,7 @@ import Atomics
 /// that need their lifecycles managed you should consider using [Swift Service
 /// Lifecycle](https://github.com/swift-server/swift-service-lifecycle).
 @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
-public final class Server: Sendable {
+public final class GRPCServer: Sendable {
   typealias Stream = RPCStream<ServerTransport.Inbound, ServerTransport.Outbound>
 
   /// A collection of ``ServerTransport`` implementations that the server uses to listen
@@ -406,7 +406,7 @@ public final class Server: Sendable {
 }
 
 @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
-extension Server {
+extension GRPCServer {
   /// The transports which provide a bidirectional communication channel with clients.
   ///
   /// You can add a new transport by calling ``add(_:)``.
@@ -456,14 +456,14 @@ extension Server {
 }
 
 @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
-extension Server.Transports: CustomStringConvertible {
+extension GRPCServer.Transports: CustomStringConvertible {
   public var description: String {
     return String(describing: self.values)
   }
 }
 
 @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
-extension Server.Services: CustomStringConvertible {
+extension GRPCServer.Services: CustomStringConvertible {
   public var description: String {
     // List the fully qualified all methods ordered by service and then method
     let rpcs = self.router.methods.map { $0.fullyQualifiedMethod }.sorted()
@@ -472,7 +472,7 @@ extension Server.Services: CustomStringConvertible {
 }
 
 @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
-extension Server.Interceptors: CustomStringConvertible {
+extension GRPCServer.Interceptors: CustomStringConvertible {
   public var description: String {
     return String(describing: self.values.map { String(describing: type(of: $0)) })
   }
diff --git a/Tests/GRPCCoreTests/ServerTests.swift b/Tests/GRPCCoreTests/GRPCServerTests.swift
similarity index 97%
rename from Tests/GRPCCoreTests/ServerTests.swift
rename to Tests/GRPCCoreTests/GRPCServerTests.swift
index 2fbc2f9be..e99a46914 100644
--- a/Tests/GRPCCoreTests/ServerTests.swift
+++ b/Tests/GRPCCoreTests/GRPCServerTests.swift
@@ -18,7 +18,7 @@ import GRPCCore
 import XCTest
 
 @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
-final class ServerTests: XCTestCase {
+final class GRPCServerTests: XCTestCase {
   func makeInProcessPair() -> (client: InProcessClientTransport, server: InProcessServerTransport) {
     let server = InProcessServerTransport()
     let client = InProcessClientTransport(
@@ -32,10 +32,10 @@ final class ServerTests: XCTestCase {
   func withInProcessClientConnectedToServer(
     services: [any RegistrableRPCService],
     interceptors: [any ServerInterceptor] = [],
-    _ body: (InProcessClientTransport, Server) async throws -> Void
+    _ body: (InProcessClientTransport, GRPCServer) async throws -> Void
   ) async throws {
     let inProcess = self.makeInProcessPair()
-    let server = Server()
+    let server = GRPCServer()
     server.transports.add(inProcess.server)
 
     for service in services {
@@ -308,7 +308,7 @@ final class ServerTests: XCTestCase {
   func testCancelRunningServer() async throws {
     let inProcess = self.makeInProcessPair()
     let task = Task {
-      let server = Server()
+      let server = GRPCServer()
       server.services.register(BinaryEcho())
       server.transports.add(inProcess.server)
       try await server.run()
@@ -329,7 +329,7 @@ final class ServerTests: XCTestCase {
   }
 
   func testTestRunServerWithNoTransport() async throws {
-    let server = Server()
+    let server = GRPCServer()
     await XCTAssertThrowsErrorAsync(ofType: ServerError.self) {
       try await server.run()
     } errorHandler: { error in
@@ -338,7 +338,7 @@ final class ServerTests: XCTestCase {
   }
 
   func testTestRunStoppedServer() async throws {
-    let server = Server()
+    let server = GRPCServer()
     server.transports.add(InProcessServerTransport())
     // Run the server.
     let task = Task { try await server.run() }
@@ -354,7 +354,7 @@ final class ServerTests: XCTestCase {
   }
 
   func testRunServerWhenTransportThrows() async throws {
-    let server = Server()
+    let server = GRPCServer()
     server.transports.add(ThrowOnRunServerTransport())
     await XCTAssertThrowsErrorAsync(ofType: ServerError.self) {
       try await server.run()
@@ -364,7 +364,7 @@ final class ServerTests: XCTestCase {
   }
 
   func testRunServerDrainsRunningTransportsWhenOneFailsToStart() async throws {
-    let server = Server()
+    let server = GRPCServer()
 
     // Register the in process transport first and allow it to come up.
     let inProcess = self.makeInProcessPair()
@@ -406,7 +406,7 @@ final class ServerTests: XCTestCase {
   }
 
   func testInterceptorsDescription() async throws {
-    let server = Server()
+    let server = GRPCServer()
     server.interceptors.add(.rejectAll(with: .init(code: .aborted, message: "")))
     server.interceptors.add(.requestCounter(.init(0)))
     let description = String(describing: server.interceptors)
@@ -415,7 +415,7 @@ final class ServerTests: XCTestCase {
   }
 
   func testServicesDescription() async throws {
-    let server = Server()
+    let server = GRPCServer()
     let methods: [(String, String)] = [
       ("helloworld.Greeter", "SayHello"),
       ("echo.Echo", "Foo"),