Change <self/> (etc) to <tenant/> (etc). "self" always was a really

bad choice for something implemented in Python, holdover from an older
specification, but Django ORM's troubles with "self" as a keyword
argument were the last straw.  Enough already.  Backwards
compatability should be a straightforward data migration.

svn path=/branches/tk705/; revision=6134

2 files changed, 71 insertions, 71 deletions

diff --git a/ca/tests/left-right-protocol-samples.xml b/ca/tests/left-right-protocol-samples.xml
index 7b97386d..2cdcb1c4 100644
--- a/ca/tests/left-right-protocol-samples.xml
+++ b/ca/tests/left-right-protocol-samples.xml
@@ -37,15 +37,15 @@
 <completely_gratuitous_wrapper_element_to_let_me_run_this_through_xmllint>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<self action="create" tag="a000" self_handle="42"/>
+	<tenant action="create" tag="a000" tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<self action="create" tag="a000" self_handle="42"/>
+	<tenant action="create" tag="a000" tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<self action="set" self_handle="42"
+	<tenant action="set" tenant_handle="42"
 		rekey="yes"
 		reissue="yes"
 		revoke="yes"
@@ -92,19 +92,19 @@
 		YyMNrG2xMOtIC7T4+IOHgT8PgrNhaeDg9ctewj0X8Qi9nI9nXeinicLX8vj6hdEq
 		3ORv7RZMJNYqv1HQ3wUE2B7fCPFv7EUwzaCds1kgRQ==
 	    </bpki_glue>
-	</self>
+	</tenant>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<self action="set" self_handle="42"/>
+	<tenant action="set" tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<self action="get" self_handle="42"/>
+	<tenant action="get" tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<self action="get" self_handle="42">
+	<tenant action="get" tenant_handle="42">
 	    <bpki_cert>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 		BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
@@ -143,15 +143,15 @@
 		YyMNrG2xMOtIC7T4+IOHgT8PgrNhaeDg9ctewj0X8Qi9nI9nXeinicLX8vj6hdEq
 		3ORv7RZMJNYqv1HQ3wUE2B7fCPFv7EUwzaCds1kgRQ==
 	    </bpki_glue>
-	</self>
+	</tenant>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<self action="list"/>
+	<tenant action="list"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<self action="list" self_handle="42">
+	<tenant action="list" tenant_handle="42">
 	    <bpki_cert>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
 		BAMTGVRlc3QgQ2VydGlmaWNhdGUgQm9iIFJvb3QwHhcNMDcwODAxMTk1MzEwWhcN
@@ -190,22 +190,22 @@
 		YyMNrG2xMOtIC7T4+IOHgT8PgrNhaeDg9ctewj0X8Qi9nI9nXeinicLX8vj6hdEq
 		3ORv7RZMJNYqv1HQ3wUE2B7fCPFv7EUwzaCds1kgRQ==
 	    </bpki_glue>
-	</self>
-	<self action="list" self_handle="99"/>
+	</tenant>
+	<tenant action="list" tenant_handle="99"/>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<self action="destroy" self_handle="42"/>
+	<tenant action="destroy" tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<self action="destroy" self_handle="42"/>
+	<tenant action="destroy" tenant_handle="42"/>
     </msg>
     
     <!-- ==== -->
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<bsc action="create" self_handle="42" bsc_handle="17"
+	<bsc action="create" tenant_handle="42" bsc_handle="17"
 		generate_keypair="yes"
 		key_type="rsa"
 		hash_alg="sha256"
@@ -233,13 +233,13 @@
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<bsc action="create" self_handle="42" bsc_handle="17">
+	<bsc action="create" tenant_handle="42" bsc_handle="17">
 	    <pkcs10_request>cmVxdWVzdAo=</pkcs10_request>
 	</bsc>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<bsc action="set" self_handle="42" bsc_handle="17">
+	<bsc action="set" tenant_handle="42" bsc_handle="17">
 	    <signing_cert>
 		MIIDHTCCAgWgAwIBAgIJAKUUCoKn9ovVMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 		BAMTG1Rlc3QgQ2VydGlmaWNhdGUgQWxpY2UgUm9vdDAeFw0wNzA4MDExOTUzMDda
@@ -274,15 +274,15 @@
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<bsc action="set" self_handle="42" bsc_handle="17"/>
+	<bsc action="set" tenant_handle="42" bsc_handle="17"/>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<bsc action="get" self_handle="42" bsc_handle="17"/>
+	<bsc action="get" tenant_handle="42" bsc_handle="17"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<bsc action="get" self_handle="42" bsc_handle="17">
+	<bsc action="get" tenant_handle="42" bsc_handle="17">
 	    <signing_cert>
 		MIIDHTCCAgWgAwIBAgIJAKUUCoKn9ovVMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 		BAMTG1Rlc3QgQ2VydGlmaWNhdGUgQWxpY2UgUm9vdDAeFw0wNzA4MDExOTUzMDda
@@ -306,11 +306,11 @@
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<bsc action="list" self_handle="42"/>
+	<bsc action="list" tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<bsc action="get" self_handle="42" bsc_handle="17">
+	<bsc action="get" tenant_handle="42" bsc_handle="17">
 	    <signing_cert>
 		MIIDHTCCAgWgAwIBAgIJAKUUCoKn9ovVMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
 		BAMTG1Rlc3QgQ2VydGlmaWNhdGUgQWxpY2UgUm9vdDAeFw0wNzA4MDExOTUzMDda
@@ -334,17 +334,17 @@
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<bsc action="destroy" self_handle="42" bsc_handle="17"/>
+	<bsc action="destroy" tenant_handle="42" bsc_handle="17"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<bsc action="destroy" self_handle="42" bsc_handle="17"/>
+	<bsc action="destroy" tenant_handle="42" bsc_handle="17"/>
     </msg>
     
     <!-- ==== -->
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<parent action="create" self_handle="42" parent_handle="666"
+	<parent action="create" tenant_handle="42" parent_handle="666"
 		peer_contact_uri="https://re.bar.example/bandicoot/"
 		sia_base="rsync://repo.foo.example/wombat/"
 		bsc_handle="17"
@@ -393,11 +393,11 @@
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<parent action="create" self_handle="42" parent_handle="666"/>
+	<parent action="create" tenant_handle="42" parent_handle="666"/>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<parent action="set" self_handle="42" parent_handle="666"
+	<parent action="set" tenant_handle="42" parent_handle="666"
 		peer_contact_uri="https://re.bar.example/bandicoot/"
 		sia_base="rsync://repo.foo.example/wombat/"
 		bsc_handle="17"
@@ -447,15 +447,15 @@
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<parent action="set" self_handle="42" parent_handle="666"/>
+	<parent action="set" tenant_handle="42" parent_handle="666"/>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<parent action="get" self_handle="42" parent_handle="666"/>
+	<parent action="get" tenant_handle="42" parent_handle="666"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<parent action="get" self_handle="42" parent_handle="666"
+	<parent action="get" tenant_handle="42" parent_handle="666"
 		peer_contact_uri="https://re.bar.example/bandicoot/"
 		sia_base="rsync://repo.foo.example/wombat/"
 		bsc_handle="17"
@@ -502,11 +502,11 @@
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<parent action="list" self_handle="42"/>
+	<parent action="list" tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<parent action="list" self_handle="42" parent_handle="666"
+	<parent action="list" tenant_handle="42" parent_handle="666"
 		peer_contact_uri="https://re.bar.example/bandicoot/"
 		sia_base="rsync://repo.foo.example/wombat/"
 		bsc_handle="17"
@@ -553,17 +553,17 @@
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<parent action="destroy" self_handle="42"
+	<parent action="destroy" tenant_handle="42"
     parent_handle="666"/> </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<parent action="destroy" self_handle="42" parent_handle="666"/>
+	<parent action="destroy" tenant_handle="42" parent_handle="666"/>
     </msg>
     
     <!-- ==== -->
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<child action="create" self_handle="42" child_handle="3"
+	<child action="create" tenant_handle="42" child_handle="3"
 		bsc_handle="17">
 	    <bpki_cert>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
@@ -588,11 +588,11 @@
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<child action="create" self_handle="42" child_handle="3"/>
+	<child action="create" tenant_handle="42" child_handle="3"/>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<child action="set" self_handle="42" child_handle="3"
+	<child action="set" tenant_handle="42" child_handle="3"
 		bsc_handle="17"
 		reissue="yes">
 	    <bpki_cert>
@@ -618,15 +618,15 @@
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<child action="set" self_handle="42" child_handle="3"/>
+	<child action="set" tenant_handle="42" child_handle="3"/>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<child action="get" self_handle="42" child_handle="3"/>
+	<child action="get" tenant_handle="42" child_handle="3"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<child action="get" self_handle="42" child_handle="3"
+	<child action="get" tenant_handle="42" child_handle="3"
 		bsc_handle="17">
 	    <bpki_cert>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
@@ -651,11 +651,11 @@
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<child action="list" self_handle="42"/>
+	<child action="list" tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<child action="list" self_handle="42" child_handle="3"
+	<child action="list" tenant_handle="42" child_handle="3"
 		bsc_handle="17">
 	    <bpki_cert>
 		MIIDGzCCAgOgAwIBAgIJAKi+/+wUhQlxMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
@@ -680,17 +680,17 @@
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<child action="destroy" self_handle="42" child_handle="3"/>
+	<child action="destroy" tenant_handle="42" child_handle="3"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<child action="destroy" self_handle="42" child_handle="3"/>
+	<child action="destroy" tenant_handle="42" child_handle="3"/>
     </msg>
     
     <!-- ==== -->
 
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<repository action="create" self_handle="42" repository_handle="120"
+	<repository action="create" tenant_handle="42" repository_handle="120"
 		peer_contact_uri="https://re.bar.example/bandicoot/"
 		bsc_handle="17">
 	    <bpki_cert>
@@ -735,11 +735,11 @@
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<repository action="create" self_handle="42" repository_handle="120"/>
+	<repository action="create" tenant_handle="42" repository_handle="120"/>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<repository action="set" self_handle="42" repository_handle="120"
+	<repository action="set" tenant_handle="42" repository_handle="120"
 		peer_contact_uri="https://re.bar.example/bandicoot/"
 		bsc_handle="17">
 	    <bpki_cert>
@@ -784,15 +784,15 @@
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<repository action="set" self_handle="42" repository_handle="120"/>
+	<repository action="set" tenant_handle="42" repository_handle="120"/>
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<repository action="get" self_handle="42" repository_handle="120"/>
+	<repository action="get" tenant_handle="42" repository_handle="120"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<repository action="get" self_handle="42" repository_handle="120"
+	<repository action="get" tenant_handle="42" repository_handle="120"
 		peer_contact_uri="https://re.bar.example/bandicoot/"
 		bsc_handle="17">
 	    <bpki_cert>
@@ -837,11 +837,11 @@
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<repository action="list" self_handle="42"/>
+	<repository action="list" tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<repository action="list" self_handle="42" repository_handle="120"
+	<repository action="list" tenant_handle="42" repository_handle="120"
 		peer_contact_uri="https://re.bar.example/bandicoot/"
 		bsc_handle="17">
 	    <bpki_cert>
@@ -886,21 +886,21 @@
     </msg>
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<repository action="destroy" self_handle="42" repository_handle="120"/>
+	<repository action="destroy" tenant_handle="42" repository_handle="120"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<repository action="destroy" self_handle="42" repository_handle="120"/>
+	<repository action="destroy" tenant_handle="42" repository_handle="120"/>
     </msg>
 
     <!-- ==== -->
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<list_resources self_handle="42" child_handle="289"/>
+	<list_resources tenant_handle="42" child_handle="289"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<list_resources self_handle="42" child_handle="289"
+	<list_resources tenant_handle="42" child_handle="289"
 			valid_until="2008-04-01T00:00:00Z"
 			ipv4="10.0.0.44/32,10.3.0.44/32"
 			ipv6="fe80:deed:f00d::/48,fe80:dead:beef:2::-fe80:dead:beef:2::49"
@@ -910,16 +910,16 @@
     <!-- === -->
     
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<list_roa_requests self_handle="42"/>
+	<list_roa_requests tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<list_roa_requests self_handle="42"
+	<list_roa_requests tenant_handle="42"
 			asn="666"
 			ipv4="10.0.0.44/32,10.3.0.44/32"
 			ipv6="fe80:deed:f00d::/48,fe80:dead:beef::/48-56"
 			/>
-	<list_roa_requests self_handle="42"
+	<list_roa_requests tenant_handle="42"
 			asn="12345"
 			ipv4="10.0.0.44/32"
 			ipv6="2002:a00::/48-56"
@@ -929,11 +929,11 @@
     <!-- === -->
 
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<list_received_resources self_handle="42"/>
+	<list_received_resources tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<list_received_resources self_handle="42"
+	<list_received_resources tenant_handle="42"
 				 parent_handle="Alice"
 				 notBefore="2010-02-22T03:44:23Z"
 				 notAfter="2011-02-21T11:03:49Z"
@@ -942,7 +942,7 @@
 				 aia_uri="rsync://arin.rpki.net/arin/arin.cer"
 				 asn="1280,3557"
 				 ipv4="149.20.0.0/16,192.5.4.0/23,204.152.184.0/21"/>
-	<list_received_resources self_handle="42"
+	<list_received_resources tenant_handle="42"
 				 parent_handle="Bob"
 				 uri="rsync://arin.rpki.net/arin/1/uWqpa8GkcEDBZkEsmOEofeDKk9s.cer"
 				 notBefore="2010-02-22T03:44:20Z"
@@ -958,11 +958,11 @@
     <!-- === -->
 
     <msg version="1" type="query" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<list_published_objects self_handle="42"/>
+	<list_published_objects tenant_handle="42"/>
     </msg>
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<list_published_objects self_handle="42" uri="rsync://rpki.example.org/rpki/DEMEtlxZrZes7TNGbe7XwVSMgW0.crl">
+	<list_published_objects tenant_handle="42" uri="rsync://rpki.example.org/rpki/DEMEtlxZrZes7TNGbe7XwVSMgW0.crl">
 		MIIBrjCBlwIBATANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEygwQzQzMDRCNjVDNTlBRDk3
 		QUNFRDMzNDY2REVFRDdDMTU0OEM4MTZEFw0wOTA5MjgyMDUxNDlaFw0wOTA5MjgyMTUxNDla
 		oDAwLjAfBgNVHSMEGDAWgBQMQwS2XFmtl6ztM0Zt7tfBVIyBbTALBgNVHRQEBAICAWkwDQYJ
@@ -973,7 +973,7 @@
 		fBk4i7H945v/zs7bLLMJxTs8+ao4iCDuknjbGhjWmi9xrTXDtcCXx607rPDkJQcJE2WnRS/U
 		HIA=
 	</list_published_objects>
-	<list_published_objects self_handle="42" uri="rsync://rpki.example.org/rpki/DEMEtlxZrZes7TNGbe7XwVSMgW0.mft">
+	<list_published_objects tenant_handle="42" uri="rsync://rpki.example.org/rpki/DEMEtlxZrZes7TNGbe7XwVSMgW0.mft">
 		MIIHBQYJKoZIhvcNAQcCoIIG9jCCBvICAQMxDTALBglghkgBZQMEAgEwggEfBgsqhkiG9w0B
 		CRABGqCCAQ4EggEKMIIBBgICAWoYDzIwMDkwOTI4MjA1MTQ5WhgPMjAwOTA5MjgyMTUxNDla
 		BglghkgBZQMEAgEwgdIwRBYfREVNRXRseFpyWmVzN1ROR2JlN1h3VlNNZ1cwLmNybAMhAPgd
@@ -1009,7 +1009,7 @@
 		yML8lQJAFAyjnXJ+doGbqfTUpVH4q4drqRb73WbL0zf/Z2HGwhDlTmsAdjparWdQcfXIVrJF
 		ynS1fab9XZfj+VtBFKjooDjaLw==
 	</list_published_objects>
-	<list_published_objects self_handle="42" uri="rsync://rpki.example.org/rpki/ldvxcHGdr3oKHcPj-gukmetNRZ0.roa">
+	<list_published_objects tenant_handle="42" uri="rsync://rpki.example.org/rpki/ldvxcHGdr3oKHcPj-gukmetNRZ0.roa">
 		MIIGnQYJKoZIhvcNAQcCoIIGjjCCBooCAQMxDTALBglghkgBZQMEAgEwMQYLKoZIhvcNAQkQ
 		ARigIgQgMB4CAg3lMBgwFgQCAAEwEDAGAwQAwAUEMAYDBADABQWgggSTMIIEjzCCA3egAwIB
 		AgIBAjANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEygwQzQzMDRCNjVDNTlBRDk3QUNFRDMz
@@ -1043,7 +1043,7 @@
 		+N931gu2r5I/XB/MGgGvXNWozK7RuMn55i5hMqI2NQs+/b7/AQU0+/i3g7SlLA8iZwHq49U2
 		ZXRCjLXcy0tQOWVsMnGfReN8oNDhHbc=
 	</list_published_objects>
-	<list_published_objects self_handle="42" uri="rsync://rpki.example.org/rpki/xopNGcsB_p7eafYqXatmVV8HZd0.roa">
+	<list_published_objects tenant_handle="42" uri="rsync://rpki.example.org/rpki/xopNGcsB_p7eafYqXatmVV8HZd0.roa">
 		MIIGoQYJKoZIhvcNAQcCoIIGkjCCBo4CAQMxDTALBglghkgBZQMEAgEwMAYLKoZIhvcNAQkQ
 		ARigIQQfMB0CAgUAMBcwFQQCAAEwDzAFAwMAlRQwBgMEA8yYuKCCBJgwggSUMIIDfKADAgEC
 		AgEDMA0GCSqGSIb3DQEBCwUAMDMxMTAvBgNVBAMTKDBDNDMwNEI2NUM1OUFEOTdBQ0VEMzM0
@@ -1083,11 +1083,11 @@
     <!-- === -->
     
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<report_error self_handle="42" error_code="your_hair_is_on_fire">text string</report_error>
+	<report_error tenant_handle="42" error_code="your_hair_is_on_fire">text string</report_error>
     </msg>
 
     <msg version="1" type="reply" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-	<report_error self_handle="42" error_code="your_hair_is_on_fire"/>
+	<report_error tenant_handle="42" error_code="your_hair_is_on_fire"/>
     </msg>
 
 </completely_gratuitous_wrapper_element_to_let_me_run_this_through_xmllint>
diff --git a/ca/tests/smoketest.py b/ca/tests/smoketest.py
index f52ce984..5f18119c 100644
--- a/ca/tests/smoketest.py
+++ b/ca/tests/smoketest.py
@@ -663,7 +663,7 @@ class allocation(object):
       cb()
 
     if target is None:
-      logger.info("Rekeying <self/> %s", self.name)
+      logger.info("Rekeying <tenant/> %s", self.name)
       self.call_rpkid([rpki.left_right.self_elt.make_pdu(
         action = "set", self_handle = self.name, rekey = "yes")], cb = done)
     else:
@@ -680,7 +680,7 @@ class allocation(object):
       cb()
 
     if target is None:
-      logger.info("Revoking <self/> %s", self.name)
+      logger.info("Revoking <tenant/> %s", self.name)
       self.call_rpkid([rpki.left_right.self_elt.make_pdu(
         action = "set", self_handle = self.name, revoke = "yes")], cb = done)
     else: