diff --git a/src/ca/syncGroup.h b/src/ca/syncGroup.h
index 3070d8486..2639b9823 100644
--- a/src/ca/syncGroup.h
+++ b/src/ca/syncGroup.h
@@ -103,7 +103,7 @@ private:
     void exception ( int status, const char *pContext, unsigned type, arrayElementCount count );
 };
 
-class oldCAC;
+struct oldCAC;
 
 struct CASG : public chronIntIdRes < CASG >, private casgRecycle {
 public:
diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp
index 11d4c2213..f24bd3827 100644
--- a/src/ca/tcpiiu.cpp
+++ b/src/ca/tcpiiu.cpp
@@ -258,7 +258,7 @@ extern "C" void cacRecvThreadTCP ( void *pParam )
         // appear to impact performance.
         //
         unsigned nBytesIn;
-        if ( piiu->pCAC()->preemptiveCallbackEnable() ) {
+        if ( piiu->pCAC()->preemptiveCallbakIsEnabled() ) {
             nBytesIn = pComBuf->fillFromWire ( *piiu );
             if ( nBytesIn == 0u ) {
                 break;
@@ -286,7 +286,7 @@ extern "C" void cacRecvThreadTCP ( void *pParam )
         // this lock get a chance to run
         callbackAutoMutex autoMutex ( *piiu->pCAC() );
 
-        if ( ! piiu->pCAC()->preemptiveCallbackEnable() ) {
+        if ( ! piiu->pCAC()->preemptiveCallbakIsEnabled() ) {
             nBytesIn = pComBuf->fillFromWire ( *piiu );
             if ( nBytesIn == 0u ) {
                 // outer loop checks to see if state is connected
diff --git a/src/ca/udpiiu.cpp b/src/ca/udpiiu.cpp
index b52c6031a..62028c81d 100644
--- a/src/ca/udpiiu.cpp
+++ b/src/ca/udpiiu.cpp
@@ -196,7 +196,7 @@ void udpiiu::recvMsg ()
     osiSockAddr src;
     int status;
 
-    if ( this->pCAC()->preemptiveCallbackEnable() ) {
+    if ( this->pCAC()->preemptiveCallbakIsEnabled() ) {
         osiSocklen_t src_size = sizeof ( src );
         status = recvfrom ( this->sock, this->recvBuf, sizeof ( this->recvBuf ), 0,
                             &src.sa, &src_size );
@@ -214,7 +214,7 @@ void udpiiu::recvMsg ()
     {
         callbackAutoMutex autoMutex ( *this->pCAC() );
 
-        if ( ! this->pCAC()->preemptiveCallbackEnable() ) {
+        if ( ! this->pCAC()->preemptiveCallbakIsEnabled() ) {
             osiSocklen_t src_size = sizeof ( src );
             status = recvfrom ( this->sock, this->recvBuf, sizeof ( this->recvBuf ), 0,
                             &src.sa, &src_size );