diff --git a/src/base/orgs/Create.svelte b/src/base/orgs/Create.svelte
index 5013fcbd7..3c29d9376 100644
--- a/src/base/orgs/Create.svelte
+++ b/src/base/orgs/Create.svelte
@@ -79,7 +79,7 @@
     <span slot="body">
       <table>
         <tr><td class="label">Address</td><td>{org.address}</td></tr>
-        <tr><td class="label">Owner</td><td>{org.safe}</td></tr>
+        <tr><td class="label">Owner</td><td>{org.owner}</td></tr>
       </table>
     </span>
 
diff --git a/src/base/orgs/Org.ts b/src/base/orgs/Org.ts
index 9f7ae048a..2842ce22b 100644
--- a/src/base/orgs/Org.ts
+++ b/src/base/orgs/Org.ts
@@ -40,13 +40,13 @@ const orgAbi = [
 
 export class Org {
   address: string
-  safe: string
+  owner: string
 
-  constructor(address: string, safe: string) {
+  constructor(address: string, owner: string) {
     assert(ethers.utils.isAddress(address), "address must be valid");
 
     this.address = address.toLowerCase(); // Don't store address checksum.
-    this.safe = safe;
+    this.owner = owner;
   }
 
   async lookupAddress(config: Config): Promise<string> {
@@ -77,7 +77,7 @@ export class Org {
   }
 
   async getMembers(config: Config): Promise<Array<string>> {
-    const safe = await utils.getSafe(this.safe, config);
+    const safe = await utils.getSafe(this.owner, config);
     if (safe) {
       return safe.owners;
     }
@@ -123,9 +123,9 @@ export class Org {
 
     if (event && event.args) {
       let address = event.args[0];
-      let safe = event.args[1];
+      let owner = event.args[1];
 
-      return new Org(address, safe);
+      return new Org(address, owner);
     }
     return null;
   }
@@ -141,9 +141,9 @@ export class Org {
     );
 
     try {
-      const safe = await org.owner();
+      const owner = await org.owner();
       const resolved = await org.resolvedAddress;
-      return new Org(resolved, safe);
+      return new Org(resolved, owner);
     } catch (e) {
       console.error(e);
       return null;
diff --git a/src/base/orgs/View.svelte b/src/base/orgs/View.svelte
index 1ede5d2ac..03eae8f1c 100644
--- a/src/base/orgs/View.svelte
+++ b/src/base/orgs/View.svelte
@@ -45,7 +45,7 @@
 
   $: label = name && parseEnsLabel(name, config);
   $: isOwner = (org: Org): boolean => {
-    return org.safe === ($session && $session.address);
+    return org.owner === ($session && $session.address);
   };
 </script>
 
@@ -150,7 +150,7 @@
         <div></div>
         <!-- Owner -->
         <div class="label">Owner</div>
-        <div><Address resolve {config} address={org.safe} /></div>
+        <div><Address resolve {config} address={org.owner} /></div>
         <div>
           {#if isOwner(org)}
             <button class="tiny secondary" on:click={transferOwnership}>