diff --git a/repository/conf/mediator/scriptInlineFunctionSynapseConfig.xml b/repository/conf/mediator/scriptInlineFunctionSynapseConfig.xml
index b26b6baa27..a1b170663e 100644
--- a/repository/conf/mediator/scriptInlineFunctionSynapseConfig.xml
+++ b/repository/conf/mediator/scriptInlineFunctionSynapseConfig.xml
@@ -22,7 +22,7 @@
     <proxy name="scriptMediatorJSInlineTestProxy" transports="http">
         <target>
             <inSequence>
-                <script language="js">var symbol = mc.getPayloadXML()..*::Code.toString();
+                <script language="rhinoJs">var symbol = mc.getPayloadXML()..*::Code.toString();
                     mc.setPayloadXML(
                     &lt;m:getQuote xmlns:m="http://services.samples"&gt;
                     &lt;m:request&gt;
@@ -36,7 +36,7 @@
                 </send>
             </inSequence>
             <outSequence>
-                <script language="js" key="stockQuoteJsScript" function="transformResponse"/>
+                <script language="rhinoJs" key="stockQuoteJsScript" function="transformResponse"/>
                 <send/>
             </outSequence>
         </target>
diff --git a/repository/conf/sample/synapse_sample_252.xml b/repository/conf/sample/synapse_sample_252.xml
index 77a1c78f4a..6290ac57da 100644
--- a/repository/conf/sample/synapse_sample_252.xml
+++ b/repository/conf/sample/synapse_sample_252.xml
@@ -24,7 +24,7 @@
     <sequence name="text_proxy">
         <log level="full"/>
         <header name="Action" value="urn:placeOrder"/>
-        <script language="js">
+        <script language="rhinoJs">
             var args = mc.getPayloadXML().toString().split(" ");
             mc.setPayloadXML(
             &lt;placeOrder xmlns="http://services.samples"&gt;
diff --git a/repository/conf/sample/synapse_sample_350.xml b/repository/conf/sample/synapse_sample_350.xml
index 7e77e8ab57..7e9d31687b 100644
--- a/repository/conf/sample/synapse_sample_350.xml
+++ b/repository/conf/sample/synapse_sample_350.xml
@@ -34,7 +34,7 @@
     <sequence name="main">
         <in>
             <!-- transform the custom quote request into a standard quote request expected by the service -->
-            <script language="js" key="stockquoteScript" function="transformRequest"/>
+            <script language="rhinoJs" key="stockquoteScript" function="transformRequest"/>
             <send>
                 <endpoint>
                     <address uri="http://localhost:9000/services/SimpleStockQuoteService"/>
@@ -43,7 +43,7 @@
         </in>
         <out>
             <!-- transform the standard response back into the custom format the client expects -->
-            <script language="js" key="script/stockquoteTransformResponse.js"
+            <script language="rhinoJs" key="script/stockquoteTransformResponse.js"
                     function="transformResponse"/>
             <send/>
         </out>
diff --git a/repository/conf/sample/synapse_sample_351.xml b/repository/conf/sample/synapse_sample_351.xml
index a384154d93..0bb64d9f89 100644
--- a/repository/conf/sample/synapse_sample_351.xml
+++ b/repository/conf/sample/synapse_sample_351.xml
@@ -24,7 +24,7 @@
     <sequence name="main">
         <in>
             <!-- transform the custom quote request into a standard quote requst expected by the service -->
-            <script language="js">
+            <script language="rhinoJs">
                 var symbol = mc.getPayloadXML()..*::Code.toString();
                 mc.setPayloadXML(
                 &lt;m:getQuote xmlns:m="http://services.samples"&gt;
@@ -41,7 +41,7 @@
         </in>
         <out>
             <!-- transform the standard response back into the custom format the client expects -->
-            <script language="js">
+            <script language="rhinoJs">
                 var symbol = mc.getPayloadXML()..*::symbol.toString();
                 var price = mc.getPayloadXML()..*::last.toString();
                 mc.setPayloadXML(
diff --git a/repository/conf/sample/synapse_sample_352.xml b/repository/conf/sample/synapse_sample_352.xml
index eddd6793b0..b6ead96e3f 100644
--- a/repository/conf/sample/synapse_sample_352.xml
+++ b/repository/conf/sample/synapse_sample_352.xml
@@ -24,7 +24,7 @@
     <sequence name="main">
         <in>
             <!-- change the MessageContext into a response and set a response payload -->
-            <script language="js">
+            <script language="rhinoJs">
                 mc.setTo(mc.getReplyTo());
                 mc.setProperty("RESPONSE", "true");
                 mc.setPayloadXML(