1 files changed, 12 insertions, 12 deletions

diff --git a/swift/src/Ice/ObjectAdapterI.swift b/swift/src/Ice/ObjectAdapterI.swift
index 779a6d62145..350b5309274 100644
--- a/swift/src/Ice/ObjectAdapterI.swift
+++ b/swift/src/Ice/ObjectAdapterI.swift
@@ -62,33 +62,33 @@ class ObjectAdapterI: LocalObject<ICEObjectAdapter>, ObjectAdapter, ICEBlobjectF
         return handle.destroy()
     }
 
-    func add(servant: Object, id: Identity) throws -> ObjectPrx {
+    func add(servant: Disp, id: Identity) throws -> ObjectPrx {
         return try addFacet(servant: servant, id: id, facet: "")
     }
 
-    func addFacet(servant: Object, id: Identity, facet: String) throws -> ObjectPrx {
+    func addFacet(servant: Disp, id: Identity, facet: String) throws -> ObjectPrx {
         precondition(!id.name.isEmpty, "Identity cannot have an empty name")
         try servantManager.addServant(servant: servant, id: id, facet: facet)
         return try createProxy(id).ice_facet(facet)
     }
 
-    func addWithUUID(_ servant: Object) throws -> ObjectPrx {
+    func addWithUUID(_ servant: Disp) throws -> ObjectPrx {
         return try addFacetWithUUID(servant: servant, facet: "")
     }
 
-    func addFacetWithUUID(servant: Object, facet: String) throws -> ObjectPrx {
+    func addFacetWithUUID(servant: Disp, facet: String) throws -> ObjectPrx {
         return try addFacet(servant: servant, id: Identity(name: UUID().uuidString, category: ""), facet: facet)
     }
 
-    func addDefaultServant(servant: Object, category: String) throws {
+    func addDefaultServant(servant: Disp, category: String) throws {
         try servantManager.addDefaultServant(servant: servant, category: category)
     }
 
-    func remove(_ id: Identity) throws -> Object {
+    func remove(_ id: Identity) throws -> Disp {
         return try removeFacet(id: id, facet: "")
     }
 
-    func removeFacet(id: Identity, facet: String) throws -> Object {
+    func removeFacet(id: Identity, facet: String) throws -> Disp {
         precondition(!id.name.isEmpty, "Identity cannot have an empty name")
         return try servantManager.removeServant(id: id, facet: facet)
     }
@@ -98,15 +98,15 @@ class ObjectAdapterI: LocalObject<ICEObjectAdapter>, ObjectAdapter, ICEBlobjectF
         return try servantManager.removeAllFacets(id: id)
     }
 
-    func removeDefaultServant(_ category: String) throws -> Object {
+    func removeDefaultServant(_ category: String) throws -> Disp {
         return try servantManager.removeDefaultServant(category: category)
     }
 
-    func find(_ id: Identity) -> Object? {
+    func find(_ id: Identity) -> Disp? {
         return findFacet(id: id, facet: "")
     }
 
-    func findFacet(id: Identity, facet: String) -> Object? {
+    func findFacet(id: Identity, facet: String) -> Disp? {
         return servantManager.findServant(id: id, facet: facet)
     }
 
@@ -114,7 +114,7 @@ class ObjectAdapterI: LocalObject<ICEObjectAdapter>, ObjectAdapter, ICEBlobjectF
         return servantManager.findAllFacets(id: id)
     }
 
-    func findByProxy(_ proxy: ObjectPrx) -> Object? {
+    func findByProxy(_ proxy: ObjectPrx) -> Disp? {
         return findFacet(id: proxy.ice_getIdentity(), facet: proxy.ice_getFacet())
     }
 
@@ -130,7 +130,7 @@ class ObjectAdapterI: LocalObject<ICEObjectAdapter>, ObjectAdapter, ICEBlobjectF
         return servantManager.findServantLocator(category: category)
     }
 
-    func findDefaultServant(_ category: String) -> Object? {
+    func findDefaultServant(_ category: String) -> Disp? {
         return servantManager.findDefaultServant(category: category)
     }