diff --git a/circle/firewall/admin.py b/circle/firewall/admin.py
index f1850c5..b0dcf04 100644
--- a/circle/firewall/admin.py
+++ b/circle/firewall/admin.py
@@ -38,7 +38,7 @@ class HostAdmin(admin.ModelAdmin):
 
 class HostInline(contrib.admin.TabularInline):
     model = Host
-    fields = ('hostname', 'ipv4', 'ipv6', 'pub_ipv4', 'mac', 'shared_ip',
+    fields = ('hostname', 'ipv4', 'ipv6', 'external_ipv4', 'mac', 'shared_ip',
               'owner', 'reverse')
 
 
diff --git a/circle/vm/models/network.py b/circle/vm/models/network.py
index 94767d0..b695e89 100644
--- a/circle/vm/models/network.py
+++ b/circle/vm/models/network.py
@@ -120,10 +120,10 @@ class Interface(Model):
             host.owner = owner
             if vlan.network_type == 'public':
                 host.shared_ip = False
-                host.pub_ipv4 = None
+                host.external_ipv4 = None
             elif vlan.network_type == 'portforward':
                 host.shared_ip = True
-                host.pub_ipv4 = vlan.snat_ip
+                host.external_ipv4 = vlan.snat_ip
             host.full_clean()
             host.save()
             host.enable_net()