diff --git a/indra/llplugin/llplugininstance.cpp b/indra/llplugin/llplugininstance.cpp
index e46bc7d15c13f9a9a98932ce881543b03943f925..fab8d4750fc212bee7f584773b5ffe774b390ec1 100644
--- a/indra/llplugin/llplugininstance.cpp
+++ b/indra/llplugin/llplugininstance.cpp
@@ -40,7 +40,7 @@
 /**
  * TODO:DOC describe how it's used
  */
-const char *LLPluginInstance::PLUGIN_INIT_FUNCTION_NAME = "LLPluginInitEntryPoint";
+const char *LLPluginInstance::PLUGIN_INIT_FUNCTION_NAME = "ALPluginInitEntryPoint";
 
 /**
  * Constructor.
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp
index 0e3e843c214dcea551f1fb01867c582456a5bab0..581759e0d63d235c2c2d22772143016cca410a5c 100644
--- a/indra/llplugin/llpluginprocesschild.cpp
+++ b/indra/llplugin/llpluginprocesschild.cpp
@@ -385,7 +385,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
             passMessage = false;
 
             std::string message_name = parsed.getName();
-            if (message_name == "load_plugin")
+            if (message_name == "load_plugin_alchemy")
             {
                 mPluginFile = parsed.getValue("file");
                 mPluginDir = parsed.getValue("dir");
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index b810c497ee5e27ed213f59cd8c9387f0b6439416..a1949e52a58ff0f73a96bb8fada5c7fb1a204aa2 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -627,7 +627,7 @@ void LLPluginProcessParent::idle(void)
 
                 // Send the message to load the plugin
                 {
-                    LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "load_plugin");
+                    LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_INTERNAL, "load_plugin_alchemy");
                     message.setValue("file", mPluginFile);
                     message.setValue("dir", mPluginDir);
                     sendMessage(message);
diff --git a/indra/media_plugins/base/media_plugin_base.cpp b/indra/media_plugins/base/media_plugin_base.cpp
index ccaa43cfb50b168bc829cfa5c556efd56d490938..f1b5e59e915dffcd1147bec0c9ef255259be1aee 100644
--- a/indra/media_plugins/base/media_plugin_base.cpp
+++ b/indra/media_plugins/base/media_plugin_base.cpp
@@ -32,7 +32,7 @@
 #include "media_plugin_base.h"
 
 
-// TODO: Make sure that the only symbol exported from this library is LLPluginInitEntryPoint
+// TODO: Make sure that the only symbol exported from this library is ALPluginInitEntryPoint
 ////////////////////////////////////////////////////////////////////////////////
 /// Media plugin constructor.
 ///
@@ -176,7 +176,7 @@ void MediaPluginBase::sendStatus()
 
 extern "C"
 {
-    LLSYMEXPORT int LLPluginInitEntryPoint(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data);
+    LLSYMEXPORT int ALPluginInitEntryPoint(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data);
 }
 
 /**
@@ -191,7 +191,7 @@ extern "C"
  *
  */
 LLSYMEXPORT int
-LLPluginInitEntryPoint(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data)
+ALPluginInitEntryPoint(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data)
 {
     return init_media_plugin(host_send_func, host_user_data, plugin_send_func, plugin_user_data);
 }