diff --git a/beast/Net.h b/beast/Net.h
index 99a348be..cd03ad11 100644
--- a/beast/Net.h
+++ b/beast/Net.h
@@ -23,15 +23,9 @@
 #include "net/BufferType.h"
 #include "net/DynamicBuffer.h"
 
-#include "net/IPAddress.h"
+#include "net/IPEndpoint.h"
 #include "net/IPAddressV4.h"
 #include "net/IPAddressV6.h"
 #include "net/IPEndpoint.h"
 
-// VFALCO DEPRECATED, REMOVE ASAP!
-namespace beast {
-typedef IP::Endpoint IPAddress;
-}
-
-
 #endif
diff --git a/beast/insight/StatsDCollector.h b/beast/insight/StatsDCollector.h
index 33a86820..b5efbbc8 100644
--- a/beast/insight/StatsDCollector.h
+++ b/beast/insight/StatsDCollector.h
@@ -22,7 +22,7 @@
 
 #include "Collector.h"
 
-#include "../net/IPAddress.h"
+#include "../net/IPEndpoint.h"
 
 namespace beast {
 namespace insight {
@@ -39,7 +39,7 @@ public:
         @param prefix A string pre-pended before each metric name.
         @param journal Destination for logging output.
     */
-    static std::shared_ptr <StatsDCollector> New (IPAddress const& address,
+    static std::shared_ptr <StatsDCollector> New (IP::Endpoint const& address,
         std::string const& prefix, Journal journal);
 };
 
diff --git a/beast/insight/impl/StatsDCollector.cpp b/beast/insight/impl/StatsDCollector.cpp
index 9f475a4e..4625bc11 100644
--- a/beast/insight/impl/StatsDCollector.cpp
+++ b/beast/insight/impl/StatsDCollector.cpp
@@ -200,7 +200,7 @@ private:
     typedef SharedData <StateType> State;
 
     Journal m_journal;
-    IPAddress m_address;
+    IP::Endpoint m_address;
     std::string m_prefix;
     boost::asio::io_service m_io_service;
     boost::optional <boost::asio::io_service::work> m_work;
@@ -213,7 +213,7 @@ private:
     std::thread m_thread;
 
     static boost::asio::ip::udp::endpoint to_endpoint (
-        IPAddress const &address)
+        IP::Endpoint const &address)
     {
         if (address.is_v4 ())
         {
@@ -230,7 +230,7 @@ private:
 
 public:
     StatsDCollectorImp (
-        IPAddress const& address,
+        IP::Endpoint const& address,
         std::string const& prefix,
         Journal journal)
         : m_journal (journal)
@@ -697,7 +697,7 @@ void StatsDMeterImpl::do_process ()
 //------------------------------------------------------------------------------
 
 std::shared_ptr <StatsDCollector> StatsDCollector::New (
-    IPAddress const& address, std::string const& prefix, Journal journal)
+    IP::Endpoint const& address, std::string const& prefix, Journal journal)
 {
     return std::make_shared <detail::StatsDCollectorImp> (
         address, prefix, journal);
diff --git a/beast/net/impl/IPAddress.cpp b/beast/net/impl/IPAddress.cpp
index c8314019..e01e74c8 100644
--- a/beast/net/impl/IPAddress.cpp
+++ b/beast/net/impl/IPAddress.cpp
@@ -389,7 +389,7 @@ public:
         testParse <Endpoint> ("Parse Endpoint");
     }
 
-    IPAddressTests () : UnitTest ("IPAddress", "beast")
+    IPAddressTests () : UnitTest ("IP::Endpoint", "beast")
     {
     }
 };
diff --git a/beast/net/impl/IPEndpoint.cpp b/beast/net/impl/IPEndpoint.cpp
index a5815f8d..0f6f2325 100644
--- a/beast/net/impl/IPEndpoint.cpp
+++ b/beast/net/impl/IPEndpoint.cpp
@@ -17,6 +17,8 @@
 */
 //==============================================================================
 
+#include "../detail/Parse.h"
+
 namespace beast {
 namespace IP {