diff --git a/py25/bacpypes/bvllservice.py b/py25/bacpypes/bvllservice.py
index e90f53b..b17301d 100755
--- a/py25/bacpypes/bvllservice.py
+++ b/py25/bacpypes/bvllservice.py
@@ -15,7 +15,7 @@ from .task import OneShotTask, RecurringTask
 from .comm import Client, Server, bind, \
     ServiceAccessPoint, ApplicationServiceElement
 
-from .pdu import Address, LocalBroadcast, LocalStation, PDU, \
+from .pdu import Address, LocalBroadcast, PDU, \
     unpack_ip_addr
 from .bvll import BVLPDU, DeleteForeignDeviceTableEntry, \
     DistributeBroadcastToNetwork, FDTEntry, ForwardedNPDU, \
@@ -916,7 +916,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -941,7 +941,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -975,7 +975,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -993,7 +993,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1215,7 +1215,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1240,7 +1240,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1274,7 +1274,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1296,7 +1296,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
diff --git a/py27/bacpypes/bvllservice.py b/py27/bacpypes/bvllservice.py
index 8cc4ab8..558ac68 100755
--- a/py27/bacpypes/bvllservice.py
+++ b/py27/bacpypes/bvllservice.py
@@ -15,7 +15,7 @@ from .task import OneShotTask, RecurringTask
 from .comm import Client, Server, bind, \
     ServiceAccessPoint, ApplicationServiceElement
 
-from .pdu import Address, LocalBroadcast, LocalStation, PDU, \
+from .pdu import Address, LocalBroadcast, PDU, \
     unpack_ip_addr
 from .bvll import BVLPDU, DeleteForeignDeviceTableEntry, \
     DistributeBroadcastToNetwork, FDTEntry, ForwardedNPDU, \
@@ -911,7 +911,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -936,7 +936,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -970,7 +970,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -988,7 +988,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1209,7 +1209,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1234,7 +1234,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1268,7 +1268,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1290,7 +1290,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
diff --git a/py34/bacpypes/bvllservice.py b/py34/bacpypes/bvllservice.py
index a2a2248..42a0856 100755
--- a/py34/bacpypes/bvllservice.py
+++ b/py34/bacpypes/bvllservice.py
@@ -15,7 +15,7 @@ from .task import OneShotTask, RecurringTask
 from .comm import Client, Server, bind, \
     ServiceAccessPoint, ApplicationServiceElement
 
-from .pdu import Address, LocalBroadcast, LocalStation, PDU, \
+from .pdu import Address, LocalBroadcast, PDU, \
     unpack_ip_addr
 from .bvll import BVLPDU, DeleteForeignDeviceTableEntry, \
     DistributeBroadcastToNetwork, FDTEntry, ForwardedNPDU, \
@@ -910,7 +910,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -935,7 +935,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -969,7 +969,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -987,7 +987,7 @@ class BIPBBMD(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1208,7 +1208,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1233,7 +1233,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation( addr )
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1267,7 +1267,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")
 
@@ -1289,7 +1289,7 @@ class BIPNAT(BIPSAP, Client, Server, RecurringTask, DebugContents):
         if isinstance(addr, Address):
             pass
         elif isinstance(addr, str):
-            addr = LocalStation(addr)
+            addr = Address(addr)
         else:
             raise TypeError("addr must be a string or an Address")