diff --git a/src/cas/example/simple/exAsyncPV.cc b/src/cas/example/simple/exAsyncPV.cc
index 46aff2b47..91c1bf8b9 100644
--- a/src/cas/example/simple/exAsyncPV.cc
+++ b/src/cas/example/simple/exAsyncPV.cc
@@ -56,7 +56,7 @@ caStatus exAsyncPV::write ( const casCtx &ctx, const gdd &valueIn )
 exAsyncWriteIO::exAsyncWriteIO ( const casCtx &ctxIn, exAsyncPV &pvIn, 
     const gdd &valueIn ) :
 	casAsyncWriteIO ( ctxIn ), pv ( pvIn ), 
-        timer ( pvIn.getCAS()->timerQueue().createTimer () ), pValue(valueIn)
+        timer ( pvIn.getCAS()->createTimer () ), pValue(valueIn)
 {
     this->timer.start ( *this, 0.1 );
 }
@@ -88,7 +88,7 @@ epicsTimerNotify::expireStatus exAsyncWriteIO::expire ( const epicsTime & curren
 exAsyncReadIO::exAsyncReadIO ( const casCtx &ctxIn, exAsyncPV &pvIn, 
     gdd &protoIn ) :
 	casAsyncReadIO ( ctxIn ), pv ( pvIn ), 
-        timer ( pvIn.getCAS()->timerQueue().createTimer() ), pProto ( protoIn )
+        timer ( pvIn.getCAS()->createTimer() ), pProto ( protoIn )
 {
     this->timer.start ( *this, 0.1 );
 }
diff --git a/src/cas/example/simple/exPV.cc b/src/cas/example/simple/exPV.cc
index 6cbc09803..afdca22ca 100644
--- a/src/cas/example/simple/exPV.cc
+++ b/src/cas/example/simple/exPV.cc
@@ -22,7 +22,7 @@ class exFixedStringDestructor: public gddDestructor {
 // exPV::exPV()
 //
 exPV::exPV ( pvInfo &setup, bool preCreateFlag, bool scanOnIn ) : 
-    timer ( this->getCAS()->timerQueue().createTimer() ),
+    timer ( this->getCAS()->createTimer() ),
     info ( setup ),
     interest ( false ),
     preCreate ( preCreateFlag ),
diff --git a/src/cas/example/simple/exServer.cc b/src/cas/example/simple/exServer.cc
index cf7d7c42a..383297ba0 100644
--- a/src/cas/example/simple/exServer.cc
+++ b/src/cas/example/simple/exServer.cc
@@ -318,7 +318,7 @@ void exServer::show (unsigned level) const
 exAsyncExistIO::exAsyncExistIO ( const pvInfo &pviIn, const casCtx &ctxIn,
         exServer &casIn ) :
     casAsyncPVExistIO ( ctxIn ), pvi ( pviIn ), 
-        timer ( casIn.timerQueue().createTimer () ), cas ( casIn ) 
+        timer ( casIn.createTimer () ), cas ( casIn ) 
 {
     this->timer.start ( *this, 0.00001 );
 }
@@ -352,7 +352,7 @@ epicsTimerNotify::expireStatus exAsyncExistIO::expire ( const epicsTime & curren
 exAsyncCreateIO::exAsyncCreateIO ( pvInfo &pviIn, exServer &casIn, 
     const casCtx &ctxIn, bool scanOnIn ) :
     casAsyncPVAttachIO ( ctxIn ), pvi ( pviIn ), 
-        timer ( casIn.timerQueue().createTimer () ), 
+        timer ( casIn.createTimer () ), 
         cas ( casIn ), scanOn ( scanOnIn ) 
 {
     this->timer.start ( *this, 0.00001 );
diff --git a/src/cas/generic/caServer.cc b/src/cas/generic/caServer.cc
index 1a311daea..3fbcc393c 100644
--- a/src/cas/generic/caServer.cc
+++ b/src/cas/generic/caServer.cc
@@ -208,11 +208,9 @@ epicsShareFunc casEventMask caServer::alarmEventMask () const
 //
 // caServer::alarmEventMask ()
 //
-// for now, this assumes that everything is single threaded
-//
-class epicsTimerQueue & caServer::timerQueue()
+class epicsTimer & caServer::createTimer()
 {
-    return fileDescriptorManager.timerQueueRef();
+    return fileDescriptorManager.createTimer();
 }
 
 //
diff --git a/src/cas/generic/casdef.h b/src/cas/generic/casdef.h
index e2fdebedd..489856f9a 100644
--- a/src/cas/generic/casdef.h
+++ b/src/cas/generic/casdef.h
@@ -373,7 +373,7 @@ public:
     epicsShareFunc void clearEventsPostedCounter (void);
 #endif
 
-    epicsShareFunc class epicsTimerQueue & timerQueue ();
+    epicsShareFunc class epicsTimer & createTimer ();
 
 	//caStatus enableClients ();
 	//caStatus disableClients ();
diff --git a/src/cas/generic/st/caServerOS.cc b/src/cas/generic/st/caServerOS.cc
index 5d5b6d7cd..c8211aed2 100644
--- a/src/cas/generic/st/caServerOS.cc
+++ b/src/cas/generic/st/caServerOS.cc
@@ -27,7 +27,7 @@ private:
 };
 
 casBeaconTimer::casBeaconTimer ( double delay, caServerOS &osIn ) :
-    timer ( fileDescriptorManager.timerQueueRef().createTimer() ), os ( osIn ) 
+    timer ( fileDescriptorManager.createTimer() ), os ( osIn ) 
 {
     this->timer.start ( *this, delay );
 }
diff --git a/src/cas/generic/st/casDGIntfOS.cc b/src/cas/generic/st/casDGIntfOS.cc
index c49f82362..42b6aeaf6 100644
--- a/src/cas/generic/st/casDGIntfOS.cc
+++ b/src/cas/generic/st/casDGIntfOS.cc
@@ -130,7 +130,7 @@ casDGIntfOS::~casDGIntfOS()
 // casDGEvWakeup::casDGEvWakeup()
 //
 casDGEvWakeup::casDGEvWakeup ( casDGIntfOS &osIn ) : 
-		timer ( fileDescriptorManager.timerQueueRef().createTimer() ), os ( osIn ) 
+		timer ( fileDescriptorManager.createTimer() ), os ( osIn ) 
 {
     this->timer.start ( *this, 0.0 );
 }
@@ -168,7 +168,7 @@ epicsTimerNotify::expireStatus casDGEvWakeup::expire( const epicsTime & currentT
 // casDGIOWakeup::casDGIOWakeup()
 //
 casDGIOWakeup::casDGIOWakeup ( casDGIntfOS &osIn ) : 
-	timer ( fileDescriptorManager.timerQueueRef().createTimer() ), os ( osIn ) 
+	timer ( fileDescriptorManager.createTimer() ), os ( osIn ) 
 {
     this->timer.start ( *this, 0.0 );
 }
diff --git a/src/cas/generic/st/casStreamOS.cc b/src/cas/generic/st/casStreamOS.cc
index 1cfed3f7f..60bc57e58 100644
--- a/src/cas/generic/st/casStreamOS.cc
+++ b/src/cas/generic/st/casStreamOS.cc
@@ -122,7 +122,7 @@ private:
 // casStreamEvWakeup()
 //
 casStreamEvWakeup::casStreamEvWakeup ( casStreamOS &osIn ) : 
-		timer ( fileDescriptorManager.timerQueueRef().createTimer() ), os(osIn) 
+		timer ( fileDescriptorManager.createTimer() ), os(osIn) 
 {
     this->timer.start ( *this, 0.0 );
 }
@@ -191,7 +191,7 @@ private:
 // casStreamIOWakeup::casStreamIOWakeup()
 //
 casStreamIOWakeup::casStreamIOWakeup ( casStreamOS &osIn ) : 
-	timer ( fileDescriptorManager.timerQueueRef().createTimer() ), os(osIn) 
+	timer ( fileDescriptorManager.createTimer() ), os(osIn) 
 {
     this->timer.start ( *this, 0.0 );
 }