--- a/samples/main-simple.cc	Mon Jun 04 17:54:56 2007 +0200
+++ b/samples/main-simple.cc	Mon Jun 04 17:57:01 2007 +0200
@@ -41,7 +41,7 @@
   Ptr<Node> a = Create<InternetNode> ();
 
   InterfaceId iid = InterfaceId::LookupByName ("IUdp");
-  Ptr<ISocketFactory> socketFactory = a->QueryInterface<ISocketFactory> (iid);
+  Ptr<SocketFactory> socketFactory = a->QueryInterface<SocketFactory> (iid);
 
   Ptr<Socket> sink = socketFactory->CreateSocket ();
   sink->Bind (80);

--- a/src/applications/onoff-application.cc	Mon Jun 04 17:54:56 2007 +0200
+++ b/src/applications/onoff-application.cc	Mon Jun 04 17:57:01 2007 +0200
@@ -141,7 +141,7 @@
   if (!m_socket)
     {
       InterfaceId iid = InterfaceId::LookupByName (m_iid);
-      Ptr<ISocketFactory> socketFactory = GetNode ()->QueryInterface<ISocketFactory> (iid);
+      Ptr<SocketFactory> socketFactory = GetNode ()->QueryInterface<SocketFactory> (iid);
       m_socket = socketFactory->CreateSocket ();
       m_socket->Bind ();
       m_socket->Connect (m_peerIp, m_peerPort);

--- a/src/node/i-udp.cc	Mon Jun 04 17:54:56 2007 +0200
+++ b/src/node/i-udp.cc	Mon Jun 04 17:57:01 2007 +0200
@@ -22,7 +22,7 @@
 
 namespace ns3 {
 
-const InterfaceId IUdp::iid = MakeInterfaceId ("IUdp", ISocketFactory::iid);
+const InterfaceId IUdp::iid = MakeInterfaceId ("IUdp", SocketFactory::iid);
 
 IUdp::IUdp ()
 {

--- a/src/node/i-udp.h	Mon Jun 04 17:54:56 2007 +0200
+++ b/src/node/i-udp.h	Mon Jun 04 17:57:01 2007 +0200
@@ -27,7 +27,7 @@
 
 class Socket;
 
-class IUdp : public ISocketFactory
+class IUdp : public SocketFactory
 {
 public:
   static const InterfaceId iid;

--- a/src/node/socket-factory.cc	Mon Jun 04 17:54:56 2007 +0200
+++ b/src/node/socket-factory.cc	Mon Jun 04 17:57:01 2007 +0200
@@ -22,11 +22,11 @@
 
 namespace ns3 {
 
-const InterfaceId ISocketFactory::iid = MakeInterfaceId ("ISocketFactory", Object::iid);
+const InterfaceId SocketFactory::iid = MakeInterfaceId ("SocketFactory", Object::iid);
 
-ISocketFactory::ISocketFactory ()
+SocketFactory::SocketFactory ()
 {
-  SetInterfaceId (ISocketFactory::iid);
+  SetInterfaceId (SocketFactory::iid);
 }
 
 } // namespace ns3

--- a/src/node/socket-factory.h	Mon Jun 04 17:54:56 2007 +0200
+++ b/src/node/socket-factory.h	Mon Jun 04 17:57:01 2007 +0200
@@ -28,12 +28,12 @@
 
 class Socket;
 
-class ISocketFactory : public Object
+class SocketFactory : public Object
 {
 public:
   static const InterfaceId iid;
 
-  ISocketFactory ();
+  SocketFactory ();
 
   virtual Ptr<Socket> CreateSocket (void) = 0;
 };