diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
@@ -1365,8 +1365,8 @@ void MainServer::HandleAnnounce(QStringList &slist, QStringList commands,
         sockListLock.unlock();
 
         if (eventsMode != kPBSEvents_None && commands[2] != "tzcheck")
-            SendMythSystemEvent(QString("CLIENT_CONNECTED HOSTNAME %1")
-                                        .arg(commands[2]));
+            gCoreContext->SendSystemEvent(
+                QString("CLIENT_CONNECTED HOSTNAME %1").arg(commands[2]));
     }
     if (commands[1] == "MediaServer")
     {
@@ -1386,8 +1386,8 @@ void MainServer::HandleAnnounce(QStringList &slist, QStringList commands,
         playbackList.push_back(pbs);
         sockListLock.unlock();
 
-        SendMythSystemEvent(QString("CLIENT_CONNECTED HOSTNAME %1")
-                                .arg(commands[2]));
+        gCoreContext->SendSystemEvent(
+            QString("CLIENT_CONNECTED HOSTNAME %1").arg(commands[2]));
     }
     else if (commands[1] == "SlaveBackend")
     {
@@ -1454,8 +1454,8 @@ void MainServer::HandleAnnounce(QStringList &slist, QStringList commands,
 
         autoexpireUpdateTimer->start(1000);
 
-        SendMythSystemEvent(QString("SLAVE_CONNECTED HOSTNAME %1")
-                                    .arg(commands[2]));
+        gCoreContext->SendSystemEvent(
+            QString("SLAVE_CONNECTED HOSTNAME %1").arg(commands[2]));
     }
     else if (commands[1] == "FileTransfer")
     {
@@ -2107,7 +2107,7 @@ void MainServer::DoDeleteInDB(DeleteStruct *ds)
     // Notify the frontend so it can requery for Free Space
     QString msg = QString("RECORDING_LIST_CHANGE DELETE %1 %2")
         .arg(ds->m_chanid).arg(ds->m_recstartts.toString(Qt::ISODate));
-    RemoteSendEvent(MythEvent(msg));
+    gCoreContext->SendEvent(MythEvent(msg));
 
     // sleep a little to let frontends reload the recordings list
     sleep(3);
@@ -2621,9 +2621,10 @@ void MainServer::DoHandleDeleteRecording(
     // Tell MythTV frontends that the recording list needs to be updated.
     if (fileExists || !recinfo.GetFilesize() || forceMetadataDelete)
     {
-        SendMythSystemEvent(QString("REC_DELETED CHANID %1 STARTTIME %2")
-                            .arg(recinfo.GetChanID())
-                            .arg(recinfo.GetRecordingStartTime(ISODate)));
+        gCoreContext->SendSystemEvent(
+            QString("REC_DELETED CHANID %1 STARTTIME %2")
+                    .arg(recinfo.GetChanID())
+                    .arg(recinfo.GetRecordingStartTime(ISODate)));
 
         recinfo.SendDeletedEvent();
     }
@@ -5702,13 +5703,15 @@ void MainServer::connectionClosed(MythSocket *socket)
                 MythEvent me2("RECORDING_LIST_CHANGE");
                 gCoreContext->dispatch(me2);
 
-                SendMythSystemEvent(QString("SLAVE_DISCONNECTED HOSTNAME %1")
-                                    .arg(pbs->getHostname()));
+                gCoreContext->SendSystemEvent(
+                    QString("SLAVE_DISCONNECTED HOSTNAME %1")
+                            .arg(pbs->getHostname()));
             }
             else if (ismaster && pbs->getHostname() != "tzcheck")
             {
-                SendMythSystemEvent(QString("CLIENT_DISCONNECTED HOSTNAME %1")
-                                    .arg(pbs->getHostname()));
+                gCoreContext->SendSystemEvent(
+                    QString("CLIENT_DISCONNECTED HOSTNAME %1")
+                            .arg(pbs->getHostname()));
             }
 
             LiveTVChain *chain;

diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
@@ -2092,7 +2092,7 @@ bool Scheduler::HandleReschedule(void)
         p->future = false;
     }
 
-    SendMythSystemEvent("SCHEDULER_RAN");
+    gCoreContext->SendSystemEvent("SCHEDULER_RAN");
 
     return true;
 }

diff --git a/mythtv/programs/mythcommflag/main.cpp b/mythtv/programs/mythcommflag/main.cpp
@@ -478,7 +478,7 @@ static void commDetectorGotNewCommercialBreakList(void)
     LOG(VB_COMMFLAG, LOG_INFO,
         QString("mythcommflag sending update: %1").arg(message));
 
-    RemoteSendMessage(message);
+    gCoreContext->SendMessage(message);
 }
 
 static void incomingCustomEvent(QEvent* e)
@@ -574,7 +574,7 @@ static int DoFlagCommercials(
             "mythcommflag sending COMMFLAG_START notification");
         QString message = "COMMFLAG_START ";
         message += program_info->MakeUniqueKey();
-        RemoteSendMessage(message);
+        gCoreContext->SendMessage(message);
     }
 
     bool result = commDetector->go();

diff --git a/mythtv/programs/mythfilldatabase/main.cpp b/mythtv/programs/mythfilldatabase/main.cpp
@@ -760,9 +760,9 @@ int main(int argc, char *argv[])
     if (grab_data || mark_repeats)
         ScheduledRecording::signalChange(-1);
 
-    RemoteSendMessage("CLEAR_SETTINGS_CACHE");
+    gCoreContext->SendMessage("CLEAR_SETTINGS_CACHE");
 
-    SendMythSystemEvent("MYTHFILLDATABASE_RAN");
+    gCoreContext->SendSystemEvent("MYTHFILLDATABASE_RAN");
 
     LOG(VB_GENERAL, LOG_NOTICE, "mythfilldatabase run complete.");
 

diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
@@ -1007,7 +1007,7 @@ static void TVMenuCallback(void *data, QString &selection)
         GetMythUI()->RemoveCurrentLocation();
 
         gCoreContext->ActivateSettingsCache(true);
-        RemoteSendMessage("CLEAR_SETTINGS_CACHE");
+        gCoreContext->SendMessage("CLEAR_SETTINGS_CACHE");
 
         if (sel == "settings general" ||
             sel == "settings generalrecpriorities")
@@ -1395,7 +1395,7 @@ static void resetAllKeys(void)
 
 static void signal_USR1_handler(int){
       LOG(VB_GENERAL, LOG_NOTICE, "SIGUSR1 received, reloading theme");
-      RemoteSendMessage("CLEAR_SETTINGS_CACHE");
+      gCoreContext->SendMessage("CLEAR_SETTINGS_CACHE");
       gCoreContext->ActivateSettingsCache(false);
       GetMythMainWindow()->JumpTo("Reload Theme");
       gCoreContext->ActivateSettingsCache(true);

diff --git a/mythtv/programs/mythfrontend/networkcontrol.cpp b/mythtv/programs/mythfrontend/networkcontrol.cpp
@@ -325,7 +325,7 @@ void NetworkControl::deleteClient(void)
     LOG(VB_GENERAL, LOG_INFO, LOC + "Client Socket disconnected");
     QMutexLocker locker(&clientLock);
 
-    SendMythSystemEvent("NET_CTRL_DISCONNECTED");
+    gCoreContext->SendSystemEvent("NET_CTRL_DISCONNECTED");
 
     QList<NetworkControlClient *>::const_iterator it;
     for (it = clients.begin(); it != clients.end(); ++it)
@@ -359,7 +359,7 @@ void NetworkControl::newConnection()
 
     LOG(VB_GENERAL, LOG_INFO, LOC + QString("New connection established."));
 
-    SendMythSystemEvent("NET_CTRL_CONNECTED");
+    gCoreContext->SendSystemEvent("NET_CTRL_CONNECTED");
 
     QTcpSocket           *client = this->nextPendingConnection();
     NetworkControlClient *ncc = new NetworkControlClient(client);

diff --git a/mythtv/programs/mythfrontend/themechooser.cpp b/mythtv/programs/mythfrontend/themechooser.cpp
@@ -794,7 +794,7 @@ void ThemeChooser::customEvent(QEvent *e)
             QString event = QString("THEME_INSTALLED PATH %1")
                                     .arg(GetConfDir() + "/themes/" +
                                          m_downloadTheme->GetDirectoryName());
-            SendMythSystemEvent(event);
+            gCoreContext->SendSystemEvent(event);
 
             gCoreContext->SaveSetting("Theme", m_downloadTheme->GetDirectoryName());
             GetMythMainWindow()->JumpTo("Reload Theme");

diff --git a/mythtv/programs/mythshutdown/main.cpp b/mythtv/programs/mythshutdown/main.cpp
@@ -175,7 +175,7 @@ static int unlockShutdown()
         MythDB::DBError("unlockShutdown -- unlock", query);
 
     // tell the master BE to reset its idle time
-    RemoteSendMessage("RESET_IDLETIME");
+    gCoreContext->SendMessage("RESET_IDLETIME");
 
     return 0;
 }

diff --git a/mythtv/programs/mythtv-setup/exitprompt.cpp b/mythtv/programs/mythtv-setup/exitprompt.cpp
@@ -136,7 +136,7 @@ void ExitPrompter::quit()
         // No need to run this if the backend has just restarted
         if (gCoreContext->BackendIsRunning())
         {
-            RemoteSendMessage("CLEAR_SETTINGS_CACHE");
+            gCoreContext->SendMessage("CLEAR_SETTINGS_CACHE");
         }
     }
 

diff --git a/mythtv/programs/mythutil/backendutils.cpp b/mythtv/programs/mythutil/backendutils.cpp
@@ -14,7 +14,7 @@ static int RawSendEvent(const QString &eventString)
 
     if (gCoreContext->ConnectToMasterServer(false, false))
     {
-        RemoteSendMessage(eventString);
+        gCoreContext->SendMessage(eventString);
         return GENERIC_EXIT_OK;
     }
     return GENERIC_EXIT_CONNECT_ERROR;
@@ -24,7 +24,7 @@ static int ClearSettingsCache(const MythUtilCommandLineParser &cmdline)
 {
     if (gCoreContext->ConnectToMasterServer(false, false))
     {
-        RemoteSendMessage("CLEAR_SETTINGS_CACHE");
+        gCoreContext->SendMessage("CLEAR_SETTINGS_CACHE");
         LOG(VB_GENERAL, LOG_INFO, "Sent CLEAR_SETTINGS_CACHE message");
         return GENERIC_EXIT_OK;
     }

diff --git a/mythtv/programs/mythwelcome/welcomedialog.cpp b/mythtv/programs/mythwelcome/welcomedialog.cpp
@@ -250,7 +250,7 @@ bool WelcomeDialog::keyPressEvent(QKeyEvent *event)
             MythWelcomeSettings settings;
             if (kDialogCodeAccepted == settings.exec())
             {
-                RemoteSendMessage("CLEAR_SETTINGS_CACHE");
+                gCoreContext->SendMessage("CLEAR_SETTINGS_CACHE");
                 updateStatus();
                 updateScreen();
 
@@ -262,7 +262,7 @@ bool WelcomeDialog::keyPressEvent(QKeyEvent *event)
         {
             MythShutdownSettings settings;
             if (kDialogCodeAccepted == settings.exec())
-                RemoteSendMessage("CLEAR_SETTINGS_CACHE");
+                gCoreContext->SendMessage("CLEAR_SETTINGS_CACHE");
         }
         else if (action == "0")
         {