Index: trunk/Nebulous/nebclient/nebulous.wsdl
===================================================================
--- trunk/Nebulous/nebclient/nebulous.wsdl	(revision 13096)
+++ trunk/Nebulous/nebclient/nebulous.wsdl	(revision 20110)
@@ -35,8 +35,16 @@
 
     <message name="rename_objectRequest">
-        <part name="key" type="xsd:string" />
-        <part name="newkey" type="xsd:string" />
+        <part name="key1" type="xsd:string" />
+        <part name="key2" type="xsd:string" />
     </message>
     <message name="rename_objectResponse">
+        <part name="result" type="xsd:int" />
+    </message>
+
+    <message name="swap_objectsRequest">
+        <part name="key1" type="xsd:string" />
+        <part name="key2" type="xsd:string" />
+    </message>
+    <message name="swap_objectsResponse">
         <part name="result" type="xsd:string" />
     </message>
@@ -114,4 +122,11 @@
             -->
         </operation>
+        <operation name="swap_objects">
+            <input  message="tns:swap_objectsRequest" />
+            <output message="tns:swap_objectsResponse" />
+            <!--
+                <fault name="" message="" />
+            -->
+        </operation>
         <operation name="replicate_object">
             <input  message="tns:replicate_objectRequest" />
@@ -180,16 +195,16 @@
         </operation>
         <operation name="rename_object">
-            <soap:operation soapAction="urn:Nebulous/Server/SOAP#create_object" />
-            <input>
-                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
-                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-            </input>
-            <output>
-                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
-                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
-            </output>
-        </operation>
-        <operation name="rename_object">
             <soap:operation soapAction="urn:Nebulous/Server/SOAP#rename_object" />
+            <input>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
+                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </input>
+            <output>
+                <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"
+                    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+            </output>
+        </operation>
+        <operation name="swap_objects">
+            <soap:operation soapAction="urn:Nebulous/Server/SOAP#swap_objects" />
             <input>
                 <soap:body use="encoded" namespace="urn:Nebulous/Server/SOAP"