diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp
index a4a157f02..d3bbacefa 100644
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -37,7 +37,7 @@ cac::cac () :
         }
     }
 
-	if (!bsdSockAttach()) {
+	if ( ! osiSockAttach() ) {
         throwWithLocation ( caErrorCode (ECA_INTERNAL) );
 	}
 
@@ -218,7 +218,7 @@ cac::~cac ()
 
     semMutexDestroy (this->ca_client_lock);
 
-	bsdSockRelease ();
+    osiSockRelease ();
 }
 
 void cac::safeDestroyNMIU (unsigned id)
diff --git a/src/ca/repeater.cpp b/src/ca/repeater.cpp
index 7d6fb9dd4..f22414e91 100644
--- a/src/ca/repeater.cpp
+++ b/src/ca/repeater.cpp
@@ -395,7 +395,7 @@ void epicsShareAPI ca_repeater ()
     unsigned short port;
     makeSocketReturn msr;
 
-    assert (bsdSockAttach());
+    assert ( osiSockAttach() );
 
     port = envGetInetPortConfigParam ( &EPICS_CA_REPEATER_PORT, CA_REPEATER_PORT );
 
@@ -407,12 +407,12 @@ void epicsShareAPI ca_repeater ()
          * test for server was already started
          */
         if ( msr.errNumber == SOCK_EADDRINUSE ) {
-            bsdSockRelease ();
+            osiSockRelease ();
             exit (0);
         }
         ca_printf("%s: Unable to create repeater socket because %d=\"%s\" - fatal\n",
             __FILE__, msr.errNumber, msr.pErrStr);
-        bsdSockRelease ();
+        osiSockRelease ();
         exit(0);
     }