From 3cc60a0626ba614a1f56f36e1d33769bd456ac54 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 28 Mar 2014 11:08:53 -0400
Subject: [PATCH] CRM-14383 - Update cj closures

---
 CRM/Core/Region.php                                  |  2 +-
 js/AutoComplete.js                                   |  2 +-
 templates/CRM/Activity/Form/Activity.tpl             |  4 ++--
 templates/CRM/Activity/Form/ActivityLinks.tpl        |  2 +-
 templates/CRM/Activity/Form/Search.tpl               |  2 +-
 templates/CRM/Activity/Form/Search/Common.tpl        |  2 +-
 templates/CRM/Activity/Form/Task/FileOnCase.tpl      |  2 +-
 templates/CRM/Activity/Selector/Selector.tpl         |  2 +-
 templates/CRM/Admin/Form/MessageTemplates.tpl        |  2 +-
 templates/CRM/Admin/Form/Preferences/Display.tpl     |  2 +-
 templates/CRM/Admin/Form/ScheduleReminders.tpl       |  8 ++++----
 templates/CRM/Admin/Form/Setting/Mapping.tpl         |  2 +-
 templates/CRM/Admin/Form/Setting/Smtp.tpl            |  2 +-
 templates/CRM/Admin/Form/WordReplacements.tpl        |  2 +-
 templates/CRM/Admin/Page/Extensions.tpl              |  6 +++---
 templates/CRM/Admin/Page/MessageTemplates.tpl        |  2 +-
 templates/CRM/Admin/Page/Navigation.tpl              |  2 +-
 templates/CRM/Admin/Page/Tag.tpl                     |  2 +-
 templates/CRM/Badge/Form/Layout.js                   |  2 +-
 templates/CRM/Batch/Form/Entry.js                    |  2 +-
 templates/CRM/Batch/Form/Entry.tpl                   |  2 +-
 templates/CRM/Batch/Form/Search.tpl                  |  2 +-
 templates/CRM/Block/RecentlyViewed.tpl               |  2 +-
 templates/CRM/Campaign/Form/Gotv.tpl                 |  4 ++--
 templates/CRM/Campaign/Form/Petition.tpl             |  2 +-
 templates/CRM/Campaign/Form/Search/Campaign.tpl      |  6 +++---
 templates/CRM/Campaign/Form/Search/Common.tpl        |  2 +-
 templates/CRM/Campaign/Form/Search/Petition.tpl      |  6 +++---
 templates/CRM/Campaign/Form/Search/Survey.tpl        |  6 +++---
 templates/CRM/Campaign/Form/Survey/Main.tpl          |  2 +-
 templates/CRM/Campaign/Form/Task/Interview.tpl       |  2 +-
 templates/CRM/Campaign/Form/Task/Reserve.tpl         |  2 +-
 templates/CRM/Campaign/Page/Vote.tpl                 |  2 +-
 templates/CRM/Case/Form/Activity.tpl                 |  4 ++--
 templates/CRM/Case/Form/Activity/LinkCases.tpl       |  2 +-
 templates/CRM/Case/Form/ActivityChangeStatusJs.tpl   |  2 +-
 templates/CRM/Case/Form/ActivityTab.tpl              |  4 ++--
 templates/CRM/Case/Form/ActivityToCase.tpl           |  2 +-
 templates/CRM/Case/Form/CaseView.tpl                 |  6 +++---
 templates/CRM/Case/Form/Search.tpl                   |  2 +-
 templates/CRM/Case/Page/CustomDataView.tpl           |  2 +-
 templates/CRM/Contact/Form/Contact.tpl               |  2 +-
 templates/CRM/Contact/Form/CustomData.tpl            |  2 +-
 templates/CRM/Contact/Form/Edit/Address.tpl          |  2 +-
 .../Contact/Form/Edit/CommunicationPreferences.tpl   |  2 +-
 templates/CRM/Contact/Form/Edit/Individual.tpl       |  2 +-
 templates/CRM/Contact/Form/Edit/Lock.tpl             |  2 +-
 .../Contact/Form/Inline/CommunicationPreferences.tpl |  2 +-
 templates/CRM/Contact/Form/Inline/Demographics.tpl   |  2 +-
 templates/CRM/Contact/Form/Inline/Email.tpl          |  2 +-
 templates/CRM/Contact/Form/Inline/IM.tpl             |  2 +-
 templates/CRM/Contact/Form/Inline/OpenID.tpl         |  2 +-
 templates/CRM/Contact/Form/Inline/Phone.tpl          |  2 +-
 templates/CRM/Contact/Form/Inline/Website.tpl        |  2 +-
 templates/CRM/Contact/Form/OnBehalfOf.tpl            |  2 +-
 templates/CRM/Contact/Form/Relationship.tpl          |  2 +-
 .../CRM/Contact/Form/Search/AdvancedCriteria.tpl     |  2 +-
 templates/CRM/Contact/Form/Search/BasicCriteria.tpl  |  2 +-
 templates/CRM/Contact/Form/Search/Criteria/Basic.tpl |  2 +-
 .../CRM/Contact/Form/Search/Criteria/ChangeLog.tpl   |  2 +-
 .../CRM/Contact/Form/Search/Criteria/Location.tpl    |  2 +-
 templates/CRM/Contact/Form/Search/Custom.tpl         |  2 +-
 .../Contact/Form/Search/Custom/ActivitySearch.tpl    |  2 +-
 .../CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl  |  2 +-
 .../Form/Search/Custom/ContributionAggregate.tpl     |  2 +-
 .../Form/Search/Custom/MultipleValuesCriteria.tpl    |  2 +-
 .../CRM/Contact/Form/Search/Custom/Proximity.tpl     |  2 +-
 templates/CRM/Contact/Form/Search/ResultTasks.tpl    |  2 +-
 templates/CRM/Contact/Form/Selector.tpl              |  2 +-
 templates/CRM/Contact/Form/ShareAddress.tpl          |  2 +-
 templates/CRM/Contact/Form/Task.tpl                  |  2 +-
 templates/CRM/Contact/Form/Task/EmailCommon.js       |  2 +-
 templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl  |  2 +-
 templates/CRM/Contact/Form/Task/SMSCommon.tpl        |  2 +-
 templates/CRM/Contact/Import/Form/MapTable.tpl       |  2 +-
 templates/CRM/Contact/Import/Form/Preview.tpl        |  2 +-
 templates/CRM/Contact/Page/DashBoardDashlet.tpl      |  2 +-
 templates/CRM/Contact/Page/Dashlet.tpl               |  2 +-
 templates/CRM/Contact/Page/View/GroupContact.tpl     |  2 +-
 templates/CRM/Contact/Page/View/Log.tpl              |  2 +-
 .../CRM/Contact/Page/View/RelationshipSelector.tpl   |  2 +-
 templates/CRM/Contact/Page/View/Summary.tpl          |  2 +-
 .../Contribute/Form/AdditionalInfo/CreditCard.tpl    |  2 +-
 templates/CRM/Contribute/Form/AdditionalPayment.tpl  |  8 ++++----
 templates/CRM/Contribute/Form/Contribution.tpl       | 12 ++++++------
 templates/CRM/Contribute/Form/Contribution/Main.tpl  |  4 ++--
 .../Contribute/Form/Contribution/MembershipBlock.tpl |  6 +++---
 .../CRM/Contribute/Form/Contribution/OnBehalfOf.tpl  |  2 +-
 .../Contribute/Form/Contribution/PremiumBlock.tpl    |  4 ++--
 templates/CRM/Contribute/Form/ContributionCharts.tpl |  2 +-
 .../CRM/Contribute/Form/ContributionPage/Amount.tpl  |  2 +-
 .../CRM/Contribute/Form/ContributionPage/Premium.tpl |  2 +-
 .../CRM/Contribute/Form/ContributionPage/Widget.tpl  |  2 +-
 templates/CRM/Contribute/Form/Search.tpl             |  2 +-
 templates/CRM/Contribute/Form/SoftCredit.tpl         |  2 +-
 templates/CRM/Contribute/Page/DashBoard.js           |  2 +-
 templates/CRM/Contribute/Page/PaymentInfo.tpl        |  2 +-
 templates/CRM/Core/APIDoc.tpl                        |  2 +-
 templates/CRM/Core/AjaxDoc.tpl                       |  2 +-
 templates/CRM/Core/BillingBlock.js                   |  2 +-
 templates/CRM/Core/BillingBlock.tpl                  |  2 +-
 templates/CRM/Custom/Form/ContactReference.tpl       |  2 +-
 templates/CRM/Custom/Form/CustomData.tpl             |  2 +-
 templates/CRM/Custom/Form/Group.tpl                  |  2 +-
 templates/CRM/Custom/Page/CustomDataView.tpl         |  2 +-
 templates/CRM/Event/Form/EventFees.tpl               |  2 +-
 templates/CRM/Event/Form/ManageEvent/EventInfo.tpl   |  2 +-
 templates/CRM/Event/Form/ManageEvent/Fee.tpl         |  2 +-
 .../CRM/Event/Form/ManageEvent/Registration.tpl      |  2 +-
 .../CRM/Event/Form/ManageEvent/ScheduleReminders.tpl |  2 +-
 templates/CRM/Event/Form/ManageEvent/Tab.tpl         |  2 +-
 templates/CRM/Event/Form/Participant.tpl             |  6 +++---
 templates/CRM/Event/Form/ParticipantFeeSelection.tpl |  4 ++--
 templates/CRM/Event/Form/Registration/Register.tpl   |  2 +-
 templates/CRM/Event/Form/Search.tpl                  |  2 +-
 templates/CRM/Event/Form/Search/Common.tpl           |  2 +-
 templates/CRM/Event/Form/Task/Batch.tpl              |  2 +-
 templates/CRM/Financial/Form/BatchTransaction.tpl    |  2 +-
 templates/CRM/Financial/Form/Export.tpl              |  2 +-
 templates/CRM/Financial/Form/FinancialBatch.tpl      |  2 +-
 templates/CRM/Financial/Form/Search.tpl              |  2 +-
 templates/CRM/Financial/Page/BatchTransaction.tpl    |  2 +-
 templates/CRM/Form/attachment.tpl                    |  2 +-
 templates/CRM/Form/attachmentjs.tpl                  |  2 +-
 templates/CRM/Form/validate.tpl                      |  2 +-
 templates/CRM/Grant/Form/Grant.tpl                   |  4 ++--
 templates/CRM/Grant/Form/Search.tpl                  |  2 +-
 templates/CRM/Group/Form/Search.tpl                  |  2 +-
 templates/CRM/Mailing/Form/Approve.tpl               |  2 +-
 templates/CRM/Mailing/Form/Count.tpl                 |  2 +-
 templates/CRM/Mailing/Form/Group.tpl                 |  2 +-
 templates/CRM/Mailing/Form/InsertTokens.tpl          |  8 ++++----
 templates/CRM/Mailing/Form/Schedule.tpl              |  4 ++--
 templates/CRM/Mailing/Form/Settings.tpl              |  2 +-
 templates/CRM/Mailing/Form/Test.tpl                  |  2 +-
 templates/CRM/Mailing/Page/Event.tpl                 |  2 +-
 templates/CRM/Mailing/Page/Tab.tpl                   |  2 +-
 templates/CRM/Member/Form/Membership.js              |  2 +-
 templates/CRM/Member/Form/Membership.tpl             | 10 +++++-----
 templates/CRM/Member/Form/MembershipBlock.tpl        |  2 +-
 templates/CRM/Member/Form/MembershipRenewal.tpl      |  4 ++--
 templates/CRM/Member/Form/MembershipStandalone.js    |  2 +-
 templates/CRM/Member/Form/MembershipType.tpl         |  4 ++--
 templates/CRM/Member/Form/Search.tpl                 |  2 +-
 templates/CRM/Member/Form/Task/Label.js              |  2 +-
 templates/CRM/Pledge/Form/Pledge.tpl                 |  4 ++--
 templates/CRM/Pledge/Form/Search.tpl                 |  2 +-
 templates/CRM/Profile/Form/Search.tpl                |  4 ++--
 .../CRM/Profile/Page/MultipleRecordFieldsListing.tpl |  2 +-
 templates/CRM/Queue/Page/Runner.tpl                  |  2 +-
 templates/CRM/Report/Form/Case/Detail.tpl            |  2 +-
 templates/CRM/Report/Form/Fields.tpl                 |  2 +-
 templates/CRM/Report/Form/Instance.tpl               |  2 +-
 templates/CRM/Report/Form/Layout/Graph.tpl           |  2 +-
 templates/CRM/Report/Page/InstanceList.tpl           |  2 +-
 templates/CRM/Report/Page/TemplateList.tpl           |  2 +-
 templates/CRM/SMS/Form/Group.tpl                     |  2 +-
 templates/CRM/SMS/Form/Schedule.tpl                  |  4 ++--
 templates/CRM/Tag/Form/Tag.tpl                       |  2 +-
 templates/CRM/UF/Form/AdvanceSetting.tpl             |  2 +-
 templates/CRM/UF/Form/Block.tpl                      |  2 +-
 templates/CRM/UF/Form/Field.tpl                      |  6 +++---
 templates/CRM/UF/Page/Group.tpl                      |  2 +-
 templates/CRM/Widget/Page/Inline/Example.tpl         |  2 +-
 templates/CRM/common/Navigation.tpl                  |  2 +-
 templates/CRM/common/TabHeader.js                    |  4 ++--
 templates/CRM/common/TrackingFields.tpl              |  3 +--
 templates/CRM/common/additionalBlocks.tpl            |  2 +-
 templates/CRM/common/batchCopy.tpl                   |  2 +-
 templates/CRM/common/crmeditable.tpl                 |  2 +-
 templates/CRM/common/dashboard.tpl                   |  2 +-
 templates/CRM/common/enableDisableApi.tpl            |  2 +-
 templates/CRM/common/formNavigate.tpl                |  2 +-
 templates/CRM/common/highLightImport.tpl             |  2 +-
 templates/CRM/common/jcalendar.tpl                   |  2 +-
 templates/CRM/common/jsortable.tpl                   |  2 +-
 templates/CRM/common/pager.tpl                       |  2 +-
 templates/CRM/common/paymentBlock.tpl                |  2 +-
 templates/CRM/common/searchResultTasks.tpl           |  2 +-
 templates/CRM/common/stateCountry.tpl                |  2 +-
 tests/phpunit/CRM/Core/RegionTest.php                |  2 +-
 .../templates/ActivitySearch.tpl                     |  2 +-
 182 files changed, 231 insertions(+), 232 deletions(-)

diff --git a/CRM/Core/Region.php b/CRM/Core/Region.php
index bc125a4281..c3b25ec0e5 100644
--- a/CRM/Core/Region.php
+++ b/CRM/Core/Region.php
@@ -175,7 +175,7 @@ class CRM_Core_Region {
           }
           break;
         case 'jquery':
-          $snippet['script'] = sprintf("cj(function(\$){\n%s\n});", $snippet['jquery']);
+          $snippet['script'] = sprintf("CRM.\$(function(\$) {\n%s\n});", $snippet['jquery']);
           // no break - continue processing as script
         case 'script':
           if (!$allowCmsOverride || !$cms->addScript($snippet['script'], $this->_name)) {
diff --git a/js/AutoComplete.js b/js/AutoComplete.js
index 8304d0e047..ee38992cf7 100644
--- a/js/AutoComplete.js
+++ b/js/AutoComplete.js
@@ -1,4 +1,4 @@
-cj(function ($) {
+CRM.$(function($) {
   'use strict';
 
   // Behind the scenes method deals with browser for setting cursor position
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index 6b6c969e65..ace2049703 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -238,7 +238,7 @@
       </div><!-- /.crm-accordion-wrapper -->
       {literal}
         <script type="text/javascript">
-          cj(function($) {
+          CRM.$(function($) {
             cj().crmAccordions();
             cj('.crm-accordion-body').each( function() {
               //open tab if form rule throws error
@@ -292,7 +292,7 @@
   {include file="CRM/common/customData.tpl"}
     {literal}
     <script type="text/javascript">
-    cj(function() {
+    CRM.$(function($) {
     {/literal}
     {if $customDataSubType}
       CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
diff --git a/templates/CRM/Activity/Form/ActivityLinks.tpl b/templates/CRM/Activity/Form/ActivityLinks.tpl
index 94ae229c2f..eda8494f5b 100644
--- a/templates/CRM/Activity/Form/ActivityLinks.tpl
+++ b/templates/CRM/Activity/Form/ActivityLinks.tpl
@@ -38,7 +38,7 @@
 </select>
 {literal}
 <script type="text/javascript">
-  cj(function($) {
+  CRM.$(function($) {
     $('[name=other_activity].crm-action-menu').change(function() {
       var
         $el = $(this),
diff --git a/templates/CRM/Activity/Form/Search.tpl b/templates/CRM/Activity/Form/Search.tpl
index 8cae98554f..1bcabfd1e5 100644
--- a/templates/CRM/Activity/Form/Search.tpl
+++ b/templates/CRM/Activity/Form/Search.tpl
@@ -87,7 +87,7 @@
 {/if}
 {literal}
   <script type="text/javascript">
-    cj(function () {
+    CRM.$(function($) {
       cj().crmAccordions();
 
       var roleId = cj('input[name=activity_role]:checked', '#Search').val();
diff --git a/templates/CRM/Activity/Form/Search/Common.tpl b/templates/CRM/Activity/Form/Search/Common.tpl
index ad1bd5ea85..4844599817 100644
--- a/templates/CRM/Activity/Form/Search/Common.tpl
+++ b/templates/CRM/Activity/Form/Search/Common.tpl
@@ -127,7 +127,7 @@ campaignContext="componentSearch" campaignTrClass='' campaignTdClass=''}
 
 {literal}
 <script type="text/javascript">
-  cj(function() {
+  CRM.$(function($) {
     //Searchable activity custom fields which extend ALL activity types are always displayed in the form
     //hence hide remaining activity custom data
     cj('#activityCustom').children( ).each( function( ) {
diff --git a/templates/CRM/Activity/Form/Task/FileOnCase.tpl b/templates/CRM/Activity/Form/Task/FileOnCase.tpl
index 145bab90fe..1c81d51d38 100644
--- a/templates/CRM/Activity/Form/Task/FileOnCase.tpl
+++ b/templates/CRM/Activity/Form/Task/FileOnCase.tpl
@@ -45,7 +45,7 @@
 </div>
 {literal}
 <script type="text/javascript">
-cj(function($) {
+CRM.$(function($) {
   var $form = $("#{/literal}{$form.formName}{literal}");
   $('input[name=unclosed_case_id]', $form).select2({
     placeholder: {/literal}'{ts escape="js"}- select case -{/ts}'{literal},
diff --git a/templates/CRM/Activity/Selector/Selector.tpl b/templates/CRM/Activity/Selector/Selector.tpl
index e770ff6259..9eaea86692 100644
--- a/templates/CRM/Activity/Selector/Selector.tpl
+++ b/templates/CRM/Activity/Selector/Selector.tpl
@@ -61,7 +61,7 @@
 <script type="text/javascript">
   var {/literal}{$context}{literal}oTable;
 
-  cj(function ( ) {
+  CRM.$(function($) {
     cj().crmAccordions();
     var context = {/literal}"{$context}"{literal};
     var filterSearchOnLoad = false;
diff --git a/templates/CRM/Admin/Form/MessageTemplates.tpl b/templates/CRM/Admin/Form/MessageTemplates.tpl
index 7ae58700a6..9b393555dd 100644
--- a/templates/CRM/Admin/Form/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Form/MessageTemplates.tpl
@@ -125,7 +125,7 @@
 {include file="CRM/Mailing/Form/InsertTokens.tpl"}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index 03ec78cb46..faf3b1c383 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -227,7 +227,7 @@
 {if $form.contact_edit_options.html}
   {literal}
     <script type="text/javascript">
-      cj(function () {
+      CRM.$(function($) {
         cj("#contactEditBlocks").sortable({
           placeholder: 'ui-state-highlight',
           update: getSorting
diff --git a/templates/CRM/Admin/Form/ScheduleReminders.tpl b/templates/CRM/Admin/Form/ScheduleReminders.tpl
index e81dd4888d..f92f6cd91a 100644
--- a/templates/CRM/Admin/Form/ScheduleReminders.tpl
+++ b/templates/CRM/Admin/Form/ScheduleReminders.tpl
@@ -176,7 +176,7 @@
 
 {literal}
 <script type='text/javascript'>
-  cj(function($) {
+  CRM.$(function($) {
     $().crmAccordions();
   });
     var entityMapping = eval({/literal}{$entityMapping}{literal});
@@ -193,7 +193,7 @@
         }
     });
 
-    cj(function() {
+    CRM.$(function($) {
         if (cj('#absolute_date_display').val()) {
             cj('#relativeDate').hide();
             cj('#relativeDateRepeat').hide();
@@ -207,7 +207,7 @@
          });
      });
 
-  cj(function () {
+  CRM.$(function($) {
     loadMsgBox();
     cj('#mode').change(function () {
       loadMsgBox();
@@ -246,7 +246,7 @@
     }
   }
 
-  cj(function () {
+  CRM.$(function($) {
     if (cj('#is_recipient_listing').val()) {
       cj('#recipientList').show();
     }
diff --git a/templates/CRM/Admin/Form/Setting/Mapping.tpl b/templates/CRM/Admin/Form/Setting/Mapping.tpl
index 847e543a61..bdb6e786c1 100644
--- a/templates/CRM/Admin/Form/Setting/Mapping.tpl
+++ b/templates/CRM/Admin/Form/Setting/Mapping.tpl
@@ -54,7 +54,7 @@
 </div>
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
   showHideMapAPIkey( cj('#mapProvider').val( ) );
 });
 function showHideMapAPIkey( mapProvider ) {
diff --git a/templates/CRM/Admin/Form/Setting/Smtp.tpl b/templates/CRM/Admin/Form/Setting/Smtp.tpl
index a01a15ea1d..758f550228 100644
--- a/templates/CRM/Admin/Form/Setting/Smtp.tpl
+++ b/templates/CRM/Admin/Form/Setting/Smtp.tpl
@@ -100,7 +100,7 @@
 
 {literal}
 <script type="text/javascript">
-    cj( function( ) {
+    CRM.$(function($) {
       var mailSetting = cj("input[name='outBound_option']:checked").val( );
 
       var archiveWarning = "{/literal}{ts escape='js'}WARNING: You are switching from a testing mode (Redirect to Database) to a live mode. Check Mailings > Archived Mailings, and delete any test mailings that are not in Completed status prior to running the mailing cron job for the first time. This will ensure that test mailings are not actually sent out.{/ts}{literal}"
diff --git a/templates/CRM/Admin/Form/WordReplacements.tpl b/templates/CRM/Admin/Form/WordReplacements.tpl
index f6a4118ef1..013dbb5502 100644
--- a/templates/CRM/Admin/Form/WordReplacements.tpl
+++ b/templates/CRM/Admin/Form/WordReplacements.tpl
@@ -100,7 +100,7 @@ function buildStringOverrideRow( curInstance )
    });
 }
 
-cj( function( ) {
+CRM.$(function($) {
   {/literal}
   {if $stringOverrideInstances}
      {foreach from=$stringOverrideInstances key="index" item="instance"}
diff --git a/templates/CRM/Admin/Page/Extensions.tpl b/templates/CRM/Admin/Page/Extensions.tpl
index 5de7a7cd4c..bf7021136a 100644
--- a/templates/CRM/Admin/Page/Extensions.tpl
+++ b/templates/CRM/Admin/Page/Extensions.tpl
@@ -84,7 +84,7 @@
     {* Expand/Collapse *}
     {literal}
     <script type="text/javascript">
-      cj( function( ) {
+      CRM.$(function($) {
           cj('.collapsed').click( function( ) {
               var currentObj = cj( this );
               if ( currentObj.hasClass( 'expanded') ) {
@@ -108,7 +108,7 @@
 
     {literal}
 
-    cj( function() {
+    CRM.$(function($) {
       var tabIndex = cj('#tab_' + selectedTab).prevAll().length;
       cj("#mainTabContainer").tabs({active: tabIndex});
       cj(".crm-tab-button").addClass("ui-corner-bottom");
@@ -119,7 +119,7 @@
     {* Refresh buttons *}
     {literal}
     <script type="text/javascript">
-    cj(function() {
+    CRM.$(function($) {
       cj('.crm-extensions-refresh').click(function(event){
         event.stopPropagation();
         CRM.alert('', '{/literal}{ts escape="js"}Refreshing...{/ts}{literal}', 'crm-msg-loading', {expires: 0});
diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl
index a33b67042b..23ea5bde5d 100644
--- a/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -161,7 +161,7 @@
     var selectedTab = 'user';
     {if $selectedChild}selectedTab = '{$selectedChild}';{/if}
     {literal}
-      cj( function() {
+      CRM.$(function($) {
         var tabIndex = cj('#tab_' + selectedTab).prevAll().length
         cj("#mainTabContainer").tabs( {active: tabIndex} );
       });
diff --git a/templates/CRM/Admin/Page/Navigation.tpl b/templates/CRM/Admin/Page/Navigation.tpl
index d38672c0fc..a058ff84b2 100644
--- a/templates/CRM/Admin/Page/Navigation.tpl
+++ b/templates/CRM/Admin/Page/Navigation.tpl
@@ -52,7 +52,7 @@
     }
   </style>
   <script type="text/javascript">
-  cj(function($) {
+  CRM.$(function($) {
     cj("#navigation-tree").jstree({
     plugins : [ "themes", "json_data", "dnd","ui", "crrm","contextmenu" ],
     json_data  : {
diff --git a/templates/CRM/Admin/Page/Tag.tpl b/templates/CRM/Admin/Page/Tag.tpl
index 4ec3b2338d..f700e3253f 100644
--- a/templates/CRM/Admin/Page/Tag.tpl
+++ b/templates/CRM/Admin/Page/Tag.tpl
@@ -100,7 +100,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function($) {
+CRM.$(function($) {
   var tag;
   $('.merge_tag').click(function(e) {
     tag = $(this).crmEditableEntity();
diff --git a/templates/CRM/Badge/Form/Layout.js b/templates/CRM/Badge/Form/Layout.js
index 3398ba757d..5586588947 100644
--- a/templates/CRM/Badge/Form/Layout.js
+++ b/templates/CRM/Badge/Form/Layout.js
@@ -1,5 +1,5 @@
 // http://civicrm.org/licensing
-cj(function ($) {
+CRM.$(function($) {
   function openKCFinder(field) {
     var field = $(this);
     window.KCFinder = {
diff --git a/templates/CRM/Batch/Form/Entry.js b/templates/CRM/Batch/Form/Entry.js
index 6b81bd1962..3fe3693d5e 100644
--- a/templates/CRM/Batch/Form/Entry.js
+++ b/templates/CRM/Batch/Form/Entry.js
@@ -1,6 +1,6 @@
 //@todo functions partially moved from tpl but still need an enclosure / cleanup
 // jslinting etc
-cj(function () {
+CRM.$(function($) {
   cj('.selector-rows').change(function () {
     var options = {
       'url': CRM.url('civicrm/ajax/batch')
diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl
index 9acd70bd75..90c43bd65f 100644
--- a/templates/CRM/Batch/Form/Entry.tpl
+++ b/templates/CRM/Batch/Form/Entry.tpl
@@ -106,7 +106,7 @@
 </div>
 {literal}
 <script type="text/javascript">
-cj(function () {
+CRM.$(function($) {
   cj('.selector-rows').change(function () {
     var options = {
       'url': {/literal}"{crmURL p='civicrm/ajax/batch' h=0}"{literal}
diff --git a/templates/CRM/Batch/Form/Search.tpl b/templates/CRM/Batch/Form/Search.tpl
index 3d92c35613..3d1e08b11d 100644
--- a/templates/CRM/Batch/Form/Search.tpl
+++ b/templates/CRM/Batch/Form/Search.tpl
@@ -56,7 +56,7 @@
 
 {literal}
 <script type="text/javascript">
-cj( function() {
+CRM.$(function($) {
   buildBatchSelector( false );
   cj('#_qf_Search_refresh').click( function() {
     buildBatchSelector(true);
diff --git a/templates/CRM/Block/RecentlyViewed.tpl b/templates/CRM/Block/RecentlyViewed.tpl
index 986d9dadbc..2c65ec024a 100644
--- a/templates/CRM/Block/RecentlyViewed.tpl
+++ b/templates/CRM/Block/RecentlyViewed.tpl
@@ -45,7 +45,7 @@
 </div>
 {literal}
 <script type="text/javascript">
-    cj( function( ) {
+    CRM.$(function($) {
       if (cj('#crm-recently-viewed').offset().left > 150) {
         cj('#crm-recently-viewed').removeClass('left').addClass('right');
           }
diff --git a/templates/CRM/Campaign/Form/Gotv.tpl b/templates/CRM/Campaign/Form/Gotv.tpl
index 853c85d2ac..173f58a57e 100755
--- a/templates/CRM/Campaign/Form/Gotv.tpl
+++ b/templates/CRM/Campaign/Form/Gotv.tpl
@@ -41,7 +41,7 @@
 
        {literal}
        <script type="text/javascript">
-       cj( function( ){
+       CRM.$(function($) {
            loadVoterList( );
        });
        </script>
@@ -84,7 +84,7 @@
  {* load selector when force *}
  {if $force and !$buildSelector}
  {literal}
- cj( function( ) {
+ CRM.$(function($) {
     searchVoters( {/literal}'{$qfKey}'{literal} );
  });
 
diff --git a/templates/CRM/Campaign/Form/Petition.tpl b/templates/CRM/Campaign/Form/Petition.tpl
index 6865964bb7..cca8e77cb9 100644
--- a/templates/CRM/Campaign/Form/Petition.tpl
+++ b/templates/CRM/Campaign/Form/Petition.tpl
@@ -127,7 +127,7 @@
 {literal}
   <script type="text/javascript">
     //show edit profile field links
-    cj(function () {
+    CRM.$(function($) {
       // show edit for both contact and activity profile
       cj('select[id$="profile_id"]').change(function () {
         buildLinks(cj(this), cj(this).val());
diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl
index 6bb051a526..8c3ffb0e9e 100755
--- a/templates/CRM/Campaign/Form/Search/Campaign.tpl
+++ b/templates/CRM/Campaign/Form/Search/Campaign.tpl
@@ -43,7 +43,7 @@
 
   {literal}
     <script type="text/javascript">
-      cj(function () {
+      CRM.$(function($) {
         loadCampaignList();
       });
     </script>
@@ -141,7 +141,7 @@
 {literal}
 <script type="text/javascript">
 
-  cj(function () {
+  CRM.$(function($) {
     cj().crmAccordions();
   });
 
@@ -149,7 +149,7 @@
   {* load selector when force *}
   {if $force and !$buildSelector}
   {literal}
-  cj(function () {
+  CRM.$(function($) {
     searchCampaigns({/literal}'{$qfKey}'{literal});
   });
 
diff --git a/templates/CRM/Campaign/Form/Search/Common.tpl b/templates/CRM/Campaign/Form/Search/Common.tpl
index 0dc3e50bf9..4618a0a5df 100755
--- a/templates/CRM/Campaign/Form/Search/Common.tpl
+++ b/templates/CRM/Campaign/Form/Search/Common.tpl
@@ -156,7 +156,7 @@
 {literal}
 <script type="text/javascript">
 
-  cj(function() {
+  CRM.$(function($) {
     cj().crmAccordions();
 
     {/literal}
diff --git a/templates/CRM/Campaign/Form/Search/Petition.tpl b/templates/CRM/Campaign/Form/Search/Petition.tpl
index e39d2dbcfb..37819a5d51 100755
--- a/templates/CRM/Campaign/Form/Search/Petition.tpl
+++ b/templates/CRM/Campaign/Form/Search/Petition.tpl
@@ -46,7 +46,7 @@
 
        {literal}
        <script type="text/javascript">
-       cj( function( ){
+       CRM.$(function($) {
            loadPetitionList( );
        });
        </script>
@@ -123,7 +123,7 @@
 {literal}
 <script type="text/javascript">
 
- cj(function() {
+ CRM.$(function($) {
     cj().crmAccordions();
  });
 
@@ -131,7 +131,7 @@
  {* load selector when force *}
  {if $force and !$buildSelector}
  {literal}
- cj( function( ) {
+ CRM.$(function($) {
     searchPetitions( {/literal}'{$qfKey}'{literal} );
  });
 
diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl
index c2dc85607f..b9286a2e3e 100755
--- a/templates/CRM/Campaign/Form/Search/Survey.tpl
+++ b/templates/CRM/Campaign/Form/Search/Survey.tpl
@@ -45,7 +45,7 @@
 
   {literal}
   <script type="text/javascript">
-    cj( function( ){
+    CRM.$(function($) {
       loadSurveyList( );
     });
   </script>
@@ -131,7 +131,7 @@
 {literal}
 <script type="text/javascript">
 
- cj(function() {
+ CRM.$(function($) {
     cj().crmAccordions();
  });
 
@@ -139,7 +139,7 @@
  {* load selector when force *}
  {if $force and !$buildSelector}
  {literal}
- cj( function( ) {
+ CRM.$(function($) {
     searchSurveys( {/literal}'{$qfKey}'{literal} );
  });
 
diff --git a/templates/CRM/Campaign/Form/Survey/Main.tpl b/templates/CRM/Campaign/Form/Survey/Main.tpl
index 6291ccbef5..17a08d4069 100644
--- a/templates/CRM/Campaign/Form/Survey/Main.tpl
+++ b/templates/CRM/Campaign/Form/Survey/Main.tpl
@@ -95,7 +95,7 @@
 {literal}
 <script type="text/javascript">
     //show edit profile field links
-    cj(function() {
+    CRM.$(function($) {
         // show edit for profile
         cj('select[id="profile_id"]').change( function( ) {
             buildLinks( cj(this), cj(this).val());
diff --git a/templates/CRM/Campaign/Form/Task/Interview.tpl b/templates/CRM/Campaign/Form/Task/Interview.tpl
index 1fb6fcecaa..bd6e3b53cb 100644
--- a/templates/CRM/Campaign/Form/Task/Interview.tpl
+++ b/templates/CRM/Campaign/Form/Task/Interview.tpl
@@ -209,7 +209,7 @@
 <script type="text/javascript">
 var updateVote = "{/literal}{ts escape='js'}Update Response{/ts}{literal}";
 var updateVoteforall = "{/literal}{ts escape='js'}Update Responses for All{/ts}{literal}";
-cj( function( ) {
+CRM.$(function($) {
   var count = 0; var columns='';
 
   cj('#voterRecords th').each( function( ) {
diff --git a/templates/CRM/Campaign/Form/Task/Reserve.tpl b/templates/CRM/Campaign/Form/Task/Reserve.tpl
index 3edbd79ad1..bfb8db8b47 100755
--- a/templates/CRM/Campaign/Form/Task/Reserve.tpl
+++ b/templates/CRM/Campaign/Form/Task/Reserve.tpl
@@ -81,7 +81,7 @@
 {literal}
 <script type="text/javascript">
 
- cj(function() {
+ CRM.$(function($) {
    cj().crmAccordions();
    setDefaultGroup( );
  });
diff --git a/templates/CRM/Campaign/Page/Vote.tpl b/templates/CRM/Campaign/Page/Vote.tpl
index b128261713..93b60ed0ac 100644
--- a/templates/CRM/Campaign/Page/Vote.tpl
+++ b/templates/CRM/Campaign/Page/Vote.tpl
@@ -35,7 +35,7 @@
   <script type="text/javascript">
     {* very crude refresh of tabs - fixme: use datatable native refresh method *}
     {literal}
-    cj(function($) {
+    CRM.$(function($) {
       $('#mainTabContainer').on('tabsbeforeactivate', function(e, ui) {
         // fixme - can't search more than once! Uncomment this code, switching tabs gives qfkey error.
         //if (ui.newTab.is('#tab_reserve')) {
diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl
index 2ca7d88c3c..f5c044f6c8 100644
--- a/templates/CRM/Case/Form/Activity.tpl
+++ b/templates/CRM/Case/Form/Activity.tpl
@@ -249,7 +249,7 @@
   {include file="CRM/common/customData.tpl"}
     {literal}
     <script type="text/javascript">
-    cj(function() {
+    CRM.$(function($) {
     {/literal}
     {if $customDataSubType}
       CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
@@ -278,7 +278,7 @@
   {if $action eq 2 or $action eq 1}
     {literal}
     <script type="text/javascript">
-      cj(function( ) {
+      CRM.$(function($) {
         cj('.crm-with-contact').click(function(){
           cj('#with-contacts-widget').toggle();
           cj('#with-clients').toggle();
diff --git a/templates/CRM/Case/Form/Activity/LinkCases.tpl b/templates/CRM/Case/Form/Activity/LinkCases.tpl
index 5bf08748f5..7f15ada691 100644
--- a/templates/CRM/Case/Form/Activity/LinkCases.tpl
+++ b/templates/CRM/Case/Form/Activity/LinkCases.tpl
@@ -32,7 +32,7 @@
 
 {literal}
 <script type="text/javascript">
-  cj(function($) {
+  CRM.$(function($) {
     var $form = $("#{/literal}{$form.formName}{literal}");
     $('input[name=link_to_case_id]', $form).select2({
       placeholder: {/literal}'{ts escape="js"}- select case -{/ts}'{literal},
diff --git a/templates/CRM/Case/Form/ActivityChangeStatusJs.tpl b/templates/CRM/Case/Form/ActivityChangeStatusJs.tpl
index 6583095d1e..a801e4c396 100644
--- a/templates/CRM/Case/Form/ActivityChangeStatusJs.tpl
+++ b/templates/CRM/Case/Form/ActivityChangeStatusJs.tpl
@@ -26,7 +26,7 @@
 {* CiviCase - change activity status inline *}
 {literal}
   <script type="text/javascript">
-    cj(function($) {
+    CRM.$(function($) {
       // Elements are sometimes in a jQuery dialog box which is outside crm-container,
       // So gotta attach this handler to the whole body - sorry.
       $('body').off('click.changeActivityStatus');
diff --git a/templates/CRM/Case/Form/ActivityTab.tpl b/templates/CRM/Case/Form/ActivityTab.tpl
index bd4214918c..9276acbdcd 100644
--- a/templates/CRM/Case/Form/ActivityTab.tpl
+++ b/templates/CRM/Case/Form/ActivityTab.tpl
@@ -89,7 +89,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function( ) {
+CRM.$(function($) {
   buildCaseActivities(false);
 });
 
@@ -162,4 +162,4 @@ function setSelectorClass( ) {
   });
 }
 </script>
-{/literal}
\ No newline at end of file
+{/literal}
diff --git a/templates/CRM/Case/Form/ActivityToCase.tpl b/templates/CRM/Case/Form/ActivityToCase.tpl
index 74051eeeb9..8a2d232286 100644
--- a/templates/CRM/Case/Form/ActivityToCase.tpl
+++ b/templates/CRM/Case/Form/ActivityToCase.tpl
@@ -49,7 +49,7 @@
     var target_contact_id = '';
     var selectedCaseId = '';
     var contactId = '';
-    cj(function($) {
+    CRM.$(function($) {
       $('input[name=unclosed_case_id]', '#fileOnCaseDialog').select2({
         placeholder: {/literal}'{ts escape="js"}- select case -{/ts}'{literal},
         minimumInputLength: 1,
diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl
index ca2ce8b39f..97be9a3255 100644
--- a/templates/CRM/Case/Form/CaseView.tpl
+++ b/templates/CRM/Case/Form/CaseView.tpl
@@ -182,7 +182,7 @@
   <script type="text/javascript">
   var oTable;
 
-  cj(function() {
+  CRM.$(function($) {
     buildCaseRoles(false);
   });
 
@@ -275,7 +275,7 @@
       {/if}
  {literal}
  <script type="text/javascript">
-   cj(function( ) {
+   CRM.$(function($) {
       buildCaseClientRelationships(false);
    });
 
@@ -357,7 +357,7 @@
  {literal}
  <script type="text/javascript">
 
- cj(function() {
+ CRM.$(function($) {
     buildCaseGlobalRelationships(false);
  });
 
diff --git a/templates/CRM/Case/Form/Search.tpl b/templates/CRM/Case/Form/Search.tpl
index 261022e05b..39e99989b9 100644
--- a/templates/CRM/Case/Form/Search.tpl
+++ b/templates/CRM/Case/Form/Search.tpl
@@ -81,7 +81,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Case/Page/CustomDataView.tpl b/templates/CRM/Case/Page/CustomDataView.tpl
index 672c30140a..8811ad8bfd 100644
--- a/templates/CRM/Case/Page/CustomDataView.tpl
+++ b/templates/CRM/Case/Page/CustomDataView.tpl
@@ -85,7 +85,7 @@
 
 {literal}
 <script type="text/javascript">
-  cj(function() {
+  CRM.$(function($) {
     cj().crmAccordions();
   });
 </script>
diff --git a/templates/CRM/Contact/Form/Contact.tpl b/templates/CRM/Contact/Form/Contact.tpl
index e657a514ac..5748c2c2c2 100644
--- a/templates/CRM/Contact/Form/Contact.tpl
+++ b/templates/CRM/Contact/Form/Contact.tpl
@@ -107,7 +107,7 @@
   {literal}
 
   <script type="text/javascript" >
-  cj(function($) {
+  CRM.$(function($) {
     var action = "{/literal}{$action}{literal}";
     $().crmAccordions();
 
diff --git a/templates/CRM/Contact/Form/CustomData.tpl b/templates/CRM/Contact/Form/CustomData.tpl
index aa2edffc76..807f00a37a 100644
--- a/templates/CRM/Contact/Form/CustomData.tpl
+++ b/templates/CRM/Contact/Form/CustomData.tpl
@@ -52,4 +52,4 @@
   {/if}
 {/if}
 
-{include file="CRM/Form/attachmentjs.tpl"}
\ No newline at end of file
+{include file="CRM/Form/attachmentjs.tpl"}
diff --git a/templates/CRM/Contact/Form/Edit/Address.tpl b/templates/CRM/Contact/Form/Edit/Address.tpl
index 54262146ef..f996ac2bec 100644
--- a/templates/CRM/Contact/Form/Edit/Address.tpl
+++ b/templates/CRM/Contact/Form/Edit/Address.tpl
@@ -111,7 +111,7 @@ function checkLocation( object, noAlert ) {
 {/literal}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl b/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
index 343404c40c..8c9152bc0d 100644
--- a/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
+++ b/templates/CRM/Contact/Form/Edit/CommunicationPreferences.tpl
@@ -129,7 +129,7 @@
 
 {literal}
 <script type="text/javascript">
-cj( function( ) {
+CRM.$(function($) {
     var fields = new Array( 'postal_greeting', 'addressee', 'email_greeting');
     for ( var i = 0; i < 3; i++ ) {
         cj( "#" + fields[i] + "_id").change( function( ) {
diff --git a/templates/CRM/Contact/Form/Edit/Individual.tpl b/templates/CRM/Contact/Form/Edit/Individual.tpl
index 5d23ac1d9b..5998aaedc0 100644
--- a/templates/CRM/Contact/Form/Edit/Individual.tpl
+++ b/templates/CRM/Contact/Form/Edit/Individual.tpl
@@ -26,7 +26,7 @@
 {* tpl for building Individual related fields *}
 <script type="text/javascript">
 {literal}
-cj(function($) {
+CRM.$(function($) {
 {/literal}
   var cid=parseFloat("{$contactId}");//parseInt is octal by default
   var contactIndividual = "{crmURL p='civicrm/ajax/rest' q='entity=contact&action=get&json=1&contact_type=Individual&return=display_name,sort_name,email&rowCount=50' h=0}";
diff --git a/templates/CRM/Contact/Form/Edit/Lock.tpl b/templates/CRM/Contact/Form/Edit/Lock.tpl
index a8807e50fa..0c4c43af10 100644
--- a/templates/CRM/Contact/Form/Edit/Lock.tpl
+++ b/templates/CRM/Contact/Form/Edit/Lock.tpl
@@ -1,6 +1,6 @@
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
   if (cj('#update_modified_date').length == 0) {
     return;
   }
diff --git a/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl b/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
index dc40f63d2f..0e7e3ae67c 100644
--- a/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
+++ b/templates/CRM/Contact/Form/Inline/CommunicationPreferences.tpl
@@ -146,7 +146,7 @@
 
 {literal}
 <script type="text/javascript">
-cj( function( ) {
+CRM.$(function($) {
     var fields = new Array( 'postal_greeting', 'addressee', 'email_greeting');
     for ( var i = 0; i < 3; i++ ) {
       cj( "#" + fields[i] + "_id").change( function( ) {
diff --git a/templates/CRM/Contact/Form/Inline/Demographics.tpl b/templates/CRM/Contact/Form/Inline/Demographics.tpl
index 1987e0706e..7ad19d97d3 100644
--- a/templates/CRM/Contact/Form/Inline/Demographics.tpl
+++ b/templates/CRM/Contact/Form/Inline/Demographics.tpl
@@ -67,7 +67,7 @@ function showDeceasedDate( ) {
   }
 }
 
-cj( function() {
+CRM.$(function($) {
   showDeceasedDate( );
 });
 </script>
diff --git a/templates/CRM/Contact/Form/Inline/Email.tpl b/templates/CRM/Contact/Form/Inline/Email.tpl
index f8746ebba0..73fea94c00 100644
--- a/templates/CRM/Contact/Form/Inline/Email.tpl
+++ b/templates/CRM/Contact/Form/Inline/Email.tpl
@@ -67,7 +67,7 @@
 
 {literal}
 <script type="text/javascript">
-    cj(function($) {
+    CRM.$(function($) {
       // check first primary radio
       $('#Email_1_IsPrimary').prop('checked', true );
     });
diff --git a/templates/CRM/Contact/Form/Inline/IM.tpl b/templates/CRM/Contact/Form/Inline/IM.tpl
index efe4e20ae5..152d2e89c9 100644
--- a/templates/CRM/Contact/Form/Inline/IM.tpl
+++ b/templates/CRM/Contact/Form/Inline/IM.tpl
@@ -62,7 +62,7 @@
 
 {literal}
 <script type="text/javascript">
-    cj(function($) {
+    CRM.$(function($) {
       // check first primary radio
       $('#IM_1_IsPrimary').prop('checked', true );
     });
diff --git a/templates/CRM/Contact/Form/Inline/OpenID.tpl b/templates/CRM/Contact/Form/Inline/OpenID.tpl
index 412b41ca29..c915f9ceda 100644
--- a/templates/CRM/Contact/Form/Inline/OpenID.tpl
+++ b/templates/CRM/Contact/Form/Inline/OpenID.tpl
@@ -62,7 +62,7 @@
 
 {literal}
 <script type="text/javascript">
-    cj(function($) {
+    CRM.$(function($) {
       // check first primary radio
       $('#OpenID_1_IsPrimary').prop('checked', true );
     });
diff --git a/templates/CRM/Contact/Form/Inline/Phone.tpl b/templates/CRM/Contact/Form/Inline/Phone.tpl
index 0d67519df1..327b02dce0 100644
--- a/templates/CRM/Contact/Form/Inline/Phone.tpl
+++ b/templates/CRM/Contact/Form/Inline/Phone.tpl
@@ -62,7 +62,7 @@
 
 {literal}
 <script type="text/javascript">
-  cj(function($) {
+  CRM.$(function($) {
     // check first primary radio
     $('#Phone_1_IsPrimary').prop('checked', true );
   });
diff --git a/templates/CRM/Contact/Form/Inline/Website.tpl b/templates/CRM/Contact/Form/Inline/Website.tpl
index a431c34957..327473a0c9 100644
--- a/templates/CRM/Contact/Form/Inline/Website.tpl
+++ b/templates/CRM/Contact/Form/Inline/Website.tpl
@@ -61,7 +61,7 @@
 
 {literal}
 <script type="text/javascript">
-    cj(function($) {
+    CRM.$(function($) {
       // error handling / show hideen elements duing form validation
       $('tr[id^="Website_Block_"]' ).each( function() {
           if( $(this).find('td:first span').length > 0 ) {
diff --git a/templates/CRM/Contact/Form/OnBehalfOf.tpl b/templates/CRM/Contact/Form/OnBehalfOf.tpl
index 2989bd271e..75c69d1a51 100644
--- a/templates/CRM/Contact/Form/OnBehalfOf.tpl
+++ b/templates/CRM/Contact/Form/OnBehalfOf.tpl
@@ -236,7 +236,7 @@
 {* If mid present in the url, take the required action (poping up related existing contact ..etc) *}
 {if $membershipContactID}
     {literal}
-    cj( function( ) {
+    CRM.$(function($) {
         cj( '#organization_id' ).val("{/literal}{$membershipContactName}{literal}");
         cj( '#organization_name' ).val("{/literal}{$membershipContactName}{literal}");
         cj( '#onbehalfof_id' ).val("{/literal}{$membershipContactID}{literal}");
diff --git a/templates/CRM/Contact/Form/Relationship.tpl b/templates/CRM/Contact/Form/Relationship.tpl
index e6eed44c2e..9a234f6f0b 100644
--- a/templates/CRM/Contact/Form/Relationship.tpl
+++ b/templates/CRM/Contact/Form/Relationship.tpl
@@ -143,7 +143,7 @@
     {include file="CRM/common/customData.tpl" includeWysiwygEditor=TRUE}
     <script type="text/javascript">
       {literal}
-      cj(function($) {
+      CRM.$(function($) {
         var
           $form = $("form#{/literal}{$form.formName}{literal}"),
           relationshipData = {/literal}{$relationshipData|@json_encode}{literal};
diff --git a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
index e45933d255..21212d400d 100644
--- a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
+++ b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
@@ -26,7 +26,7 @@
 {* Advanced Search Criteria Fieldset *}
 {literal}
 <script type="text/javascript">
-cj(function($) {
+CRM.$(function($) {
   $().crmAccordions();
   // Bind first click of accordion header to load crm-accordion-body with snippet
   // everything else is taken care of by crmAccordions()
diff --git a/templates/CRM/Contact/Form/Search/BasicCriteria.tpl b/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
index 258bdfd075..a1db6135c7 100644
--- a/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
+++ b/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
@@ -101,7 +101,7 @@
 {/strip}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
index 2e68782354..6b32376c00 100644
--- a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
@@ -74,7 +74,7 @@
       {$form.group_type.html}
         {literal}
         <script type="text/javascript">
-        cj(function(){
+        CRM.$(function($) {
           function showGroupSearch(){
             cj('#grouptypeselect').hide();
             cj('#groupselect').show();
diff --git a/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl b/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
index 378443abcd..6b4b5d9924 100644
--- a/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/ChangeLog.tpl
@@ -51,7 +51,7 @@
 
 {literal}
   <script type="text/javascript">
-    cj(function () {
+    CRM.$(function($) {
       updateChangeLogLabels();
     });
 
diff --git a/templates/CRM/Contact/Form/Search/Criteria/Location.tpl b/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
index 54955b1d3a..4f3c67434f 100644
--- a/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/Location.tpl
@@ -141,7 +141,7 @@ function processAddressFields( name, loadData ) {
 
 }
 
-cj(function( ) {
+CRM.$(function($) {
   if (  cj('#street_name').val( ).length > 0 ||
         cj('#street_unit').val( ).length > 0 ||
         cj('#street_number').val( ).length > 0 ) {
diff --git a/templates/CRM/Contact/Form/Search/Custom.tpl b/templates/CRM/Contact/Form/Search/Custom.tpl
index 7c9094cd06..e4dee4517e 100644
--- a/templates/CRM/Contact/Form/Search/Custom.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom.tpl
@@ -132,7 +132,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 
diff --git a/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl b/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
index e20a4ef76f..09e63bbcb6 100644
--- a/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
@@ -140,7 +140,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl b/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
index b2f145ddbc..7d368b48dd 100644
--- a/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
@@ -151,7 +151,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
- cj(function() {
+ CRM.$(function($) {
     cj().crmAccordions();
  });
 </script>
diff --git a/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl b/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
index 66d7968a0d..72f710ca40 100644
--- a/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
@@ -143,7 +143,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl b/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
index 264098614f..bb2c561830 100644
--- a/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
@@ -109,7 +109,7 @@
 {/strip}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl b/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
index 9cd5204ff0..70eb60ae7c 100644
--- a/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
@@ -128,7 +128,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Contact/Form/Search/ResultTasks.tpl b/templates/CRM/Contact/Form/Search/ResultTasks.tpl
index e071650e1f..c6f9811868 100644
--- a/templates/CRM/Contact/Form/Search/ResultTasks.tpl
+++ b/templates/CRM/Contact/Form/Search/ResultTasks.tpl
@@ -94,7 +94,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
   toggleTaskAction( );
 });
 </script>
diff --git a/templates/CRM/Contact/Form/Selector.tpl b/templates/CRM/Contact/Form/Selector.tpl
index 814b205d19..a628a5c9cb 100644
--- a/templates/CRM/Contact/Form/Selector.tpl
+++ b/templates/CRM/Contact/Form/Selector.tpl
@@ -146,7 +146,7 @@
 
 <script type="text/javascript">
   {literal}
-  cj(function($) {
+  CRM.$(function($) {
     cj("#toggleSelect, input[id^=mark_x_]").prop('checked', false);
     var cids = [];
     var i = 0;
diff --git a/templates/CRM/Contact/Form/ShareAddress.tpl b/templates/CRM/Contact/Form/ShareAddress.tpl
index a0f87e4c66..19358ad2c8 100644
--- a/templates/CRM/Contact/Form/ShareAddress.tpl
+++ b/templates/CRM/Contact/Form/ShareAddress.tpl
@@ -72,7 +72,7 @@
     }
   }
 
-cj( function( ) {
+CRM.$(function($) {
     var blockNo = {/literal}{$blockId}{literal};
 
     // call this when form loads
diff --git a/templates/CRM/Contact/Form/Task.tpl b/templates/CRM/Contact/Form/Task.tpl
index e385fca50b..6a105d20fa 100644
--- a/templates/CRM/Contact/Form/Task.tpl
+++ b/templates/CRM/Contact/Form/Task.tpl
@@ -50,7 +50,7 @@
 {if $searchtype eq 'ts_sel'}
 {literal}
 <script type="text/javascript">
-  cj(function($) {
+  CRM.$(function($) {
     $("#popupContainer").css({
       "background-color":"#E0E0E0",
       'display':'none',
diff --git a/templates/CRM/Contact/Form/Task/EmailCommon.js b/templates/CRM/Contact/Form/Task/EmailCommon.js
index d58d7e990f..b2ae29ba46 100644
--- a/templates/CRM/Contact/Form/Task/EmailCommon.js
+++ b/templates/CRM/Contact/Form/Task/EmailCommon.js
@@ -1,4 +1,4 @@
-cj(function ($) {
+CRM.$(function($) {
   //do not copy & paste this - find a way to generalise it
   'use strict';
    $().crmAccordions();
diff --git a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
index 0ae4cc2c8e..7cf5bcde41 100644
--- a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
+++ b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
@@ -117,7 +117,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function($) {
+CRM.$(function($) {
   var $form = $('form#{/literal}{$form.formName}{literal}');
   $('#format_id', $form).on('change', function() {
     selectFormat($(this).val());
diff --git a/templates/CRM/Contact/Form/Task/SMSCommon.tpl b/templates/CRM/Contact/Form/Task/SMSCommon.tpl
index 1bb19e0267..6114e7b152 100644
--- a/templates/CRM/Contact/Form/Task/SMSCommon.tpl
+++ b/templates/CRM/Contact/Form/Task/SMSCommon.tpl
@@ -57,7 +57,7 @@
 {include file="CRM/Mailing/Form/InsertTokens.tpl"}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 
diff --git a/templates/CRM/Contact/Import/Form/MapTable.tpl b/templates/CRM/Contact/Import/Form/MapTable.tpl
index 43f1a1b944..799b5742a8 100644
--- a/templates/CRM/Contact/Import/Form/MapTable.tpl
+++ b/templates/CRM/Contact/Import/Form/MapTable.tpl
@@ -168,7 +168,7 @@
 
       {* // Set default location type *}
       {literal}
-      cj(function() {
+      CRM.$(function($) {
         var defaultLocationType = "{/literal}{$defaultLocationType}{literal}";
         if (defaultLocationType.length) {
           cj('#map-field').on('change', 'select[id^="mapper"][id$="_0"]', function() {
diff --git a/templates/CRM/Contact/Import/Form/Preview.tpl b/templates/CRM/Contact/Import/Form/Preview.tpl
index 894d039013..f515df4004 100644
--- a/templates/CRM/Contact/Import/Form/Preview.tpl
+++ b/templates/CRM/Contact/Import/Form/Preview.tpl
@@ -228,7 +228,7 @@ function verify( ) {
 
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 
diff --git a/templates/CRM/Contact/Page/DashBoardDashlet.tpl b/templates/CRM/Contact/Page/DashBoardDashlet.tpl
index d1acaebc61..a7d7cbf8b2 100644
--- a/templates/CRM/Contact/Page/DashBoardDashlet.tpl
+++ b/templates/CRM/Contact/Page/DashBoardDashlet.tpl
@@ -92,7 +92,7 @@
 <div class="clear"></div>
 {literal}
 <script type="text/javascript">
-  cj(function($) {
+  CRM.$(function($) {
     $('#crm-dashboard-configure').click(function() {
       $.ajax({
          url: CRM.url('civicrm/dashlet', 'reset=1&snippet=1'),
diff --git a/templates/CRM/Contact/Page/Dashlet.tpl b/templates/CRM/Contact/Page/Dashlet.tpl
index f08b9aedb7..216edee77b 100644
--- a/templates/CRM/Contact/Page/Dashlet.tpl
+++ b/templates/CRM/Contact/Page/Dashlet.tpl
@@ -59,7 +59,7 @@
 
 {literal}
 <script type="text/javascript">
-  cj(function() {
+  CRM.$(function($) {
       var currentReSortEvent;
     cj(".dash-column").sortable({
       connectWith: '.dash-column',
diff --git a/templates/CRM/Contact/Page/View/GroupContact.tpl b/templates/CRM/Contact/Page/View/GroupContact.tpl
index d43f042b62..9cc96d3f9c 100644
--- a/templates/CRM/Contact/Page/View/GroupContact.tpl
+++ b/templates/CRM/Contact/Page/View/GroupContact.tpl
@@ -169,7 +169,7 @@
 
 {literal}
 <script type="text/javascript">
-  cj(function($) {
+  CRM.$(function($) {
     // load panes function calls for snippet based on id of crm-accordion-header
     function loadPanes() {
       var id = $(this).attr('id');
diff --git a/templates/CRM/Contact/Page/View/Log.tpl b/templates/CRM/Contact/Page/View/Log.tpl
index 58c74b9fbf..e3656ce66a 100644
--- a/templates/CRM/Contact/Page/View/Log.tpl
+++ b/templates/CRM/Contact/Page/View/Log.tpl
@@ -55,7 +55,7 @@
 {if $useLogging}
 {literal}
   <script type="text/javascript">
-  cj(function ($) {
+  CRM.$(function($) {
     $('#changeLog .instance_data').on('crmLoad', function(e, data) {
       CRM.tabHeader.updateCount('#tab_log', data.totalRows);
     });
diff --git a/templates/CRM/Contact/Page/View/RelationshipSelector.tpl b/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
index 1f21d5f2f2..40b31ff166 100644
--- a/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
+++ b/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
@@ -47,7 +47,7 @@
 <script type="text/javascript">
   var {/literal}{$context}{literal}oTable;
 
-  cj(function () {
+  CRM.$(function($) {
     buildContactRelationships{/literal}{$context}{literal}();
   });
 
diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl
index a74171b0c0..09732b141d 100644
--- a/templates/CRM/Contact/Page/View/Summary.tpl
+++ b/templates/CRM/Contact/Page/View/Summary.tpl
@@ -330,7 +330,7 @@
 {* CRM-10560 *}
 {literal}
 <script type="text/javascript">
-cj(function($) {
+CRM.$(function($) {
   $('.crm-inline-edit-container').crmFormContactLock({
     ignoreLabel: "{/literal}{ts escape='js'}Ignore{/ts}{literal}",
     saveAnywayLabel: "{/literal}{ts escape='js'}Save Anyway{/ts}{literal}",
diff --git a/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl b/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
index 0a22ee6aba..ba345d52b9 100644
--- a/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
+++ b/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
@@ -74,7 +74,7 @@
        eval( 'cj( "#recurringPaymentBlock" ).' + funName + "( )" );
    }
 
-   cj( function() {
+   CRM.$(function($) {
        buildRecurBlock( null );
        enablePeriod( );
    });
diff --git a/templates/CRM/Contribute/Form/AdditionalPayment.tpl b/templates/CRM/Contribute/Form/AdditionalPayment.tpl
index 76aea8417c..1004450c26 100644
--- a/templates/CRM/Contribute/Form/AdditionalPayment.tpl
+++ b/templates/CRM/Contribute/Form/AdditionalPayment.tpl
@@ -186,7 +186,7 @@
 
     var url = "{/literal}{$dataUrl}{literal}";
 
-      cj( function( ) {
+      CRM.$(function($) {
         showHideByValue( 'is_email_receipt', '', 'notice', 'table-row', 'radio', false );
         showHideByValue( 'is_email_receipt', '', 'fromEmail', 'table-row', 'radio', false );
       });
@@ -211,7 +211,7 @@
 
     {literal}
     <script type="text/javascript">
-      cj( function( ) {
+      CRM.$(function($) {
         checkEmailDependancies( );
         cj('#is_email_receipt').click( function( ) {
           checkEmailDependancies( );
@@ -233,7 +233,7 @@
 
     // bind first click of accordion header to load crm-accordion-body with snippet
     // everything else taken care of by cj().crm-accordions()
-    cj(function() {
+    CRM.$(function($) {
       cj('#adjust-option-type').hide();
       cj('.crm-ajax-accordion .crm-accordion-header').one('click', function() {
         loadPanes(cj(this).attr('id'));
@@ -290,7 +290,7 @@ cj('#fee_amount').change( function() {
 {/if}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
   cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index a1be20b8a4..79f05effbf 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -347,7 +347,7 @@
 
     {literal}
     <script type="text/javascript">
-      cj( function( ) {
+      CRM.$(function($) {
     {/literal}
     CRM.buildCustomData( '{$customDataType}' );
     {if $customDataSubType}
@@ -360,7 +360,7 @@
 
     // bind first click of accordion header to load crm-accordion-body with snippet
     // everything else taken care of by cj().crm-accordions()
-    cj(function() {
+    CRM.$(function($) {
       cj('#adjust-option-type').hide();
       cj('.crm-ajax-accordion .crm-accordion-header').one('click', function() {
         loadPanes(cj(this).attr('id'));
@@ -395,7 +395,7 @@
   {/literal}
     {if $context eq 'standalone' and $outBound_option != 2 }
       {literal}
-      cj( function( ) {
+      CRM.$(function($) {
         cj("#contact_1").blur( function( ) {
           checkEmail( );
         });
@@ -477,7 +477,7 @@
   {if $action neq 8}
     {literal}
     <script type="text/javascript">
-      cj( function( ) {
+      CRM.$(function($) {
         checkEmailDependancies( );
         cj('#is_email_receipt').click( function( ) {
           checkEmailDependancies( );
@@ -496,7 +496,7 @@
       }
 
     {/literal}{if !$contributionMode}{literal}
-     cj( function( ) {
+     CRM.$(function($) {
       showHideCancelInfo(cj('#contribution_status_id'));
 
       cj('#contribution_status_id').change(function() {
@@ -538,7 +538,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
   cj().crmAccordions();
 });
 
diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl
index 11d9cd5608..f7a4add18f 100644
--- a/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -417,7 +417,7 @@
     toggleConfirmButton();
   });
 
-  cj(function() {
+  CRM.$(function($) {
     toggleConfirmButton();
   });
 
@@ -432,7 +432,7 @@
     }
   }
 
-  cj(function(){
+  CRM.$(function($) {
     // highlight price sets
     function updatePriceSetHighlight() {
       cj('#priceset .price-set-row').removeClass('highlight');
diff --git a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
index d9aa6988c6..feb71e9af2 100644
--- a/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/MembershipBlock.tpl
@@ -91,7 +91,7 @@
 </div>
 {literal}
 <script type="text/javascript">
-cj(function(){
+CRM.$(function($) {
     //if price set is set we use below below code to show for showing auto renew
     var autoRenewOption =  {/literal}'{$autoRenewOption}'{literal};
     cj('#allow_auto_renew').hide();
@@ -240,7 +240,7 @@ cj(function(){
 {if $membershipBlock AND $quickConfig}
 {literal}
 <script type="text/javascript">
-cj(function(){
+CRM.$(function($) {
     showHideAutoRenew( null );
 });
 function showHideAutoRenew( memTypeId )
@@ -291,7 +291,7 @@ function showHideAutoRenew( memTypeId )
 }
 
 {/literal}{if $allowAutoRenewMembership}{literal}
-  cj( function( ) {
+  CRM.$(function($) {
      //keep read only always checked.
      cj( "#auto_renew" ).click(function( ) {
         if ( cj(this).attr( 'readonly' ) ) {
diff --git a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
index f24ef79088..233ecdd541 100644
--- a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
@@ -297,7 +297,7 @@ function selectCreateOrg( orgOption, reset ) {
 {* If mid present in the url, take the required action (poping up related existing contact ..etc) *}
 {if $membershipContactID}
 {literal}
-  cj( function( ) {
+  CRM.$(function($) {
     cj('#organization_id').val("{/literal}{$membershipContactName}{literal}");
     cj('#organization_name').val("{/literal}{$membershipContactName}{literal}");
     cj('#onbehalfof_id').val("{/literal}{$membershipContactID}{literal}");
diff --git a/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl b/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
index 7913197c7b..96f5c6bcac 100644
--- a/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
@@ -127,7 +127,7 @@
   {if $context EQ "makeContribution"}
     {literal}
     <script>
-      cj(function($){
+      CRM.$(function($) {
         var is_separate_payment = {/literal}{if $membershipBlock.is_separate_payment}{$membershipBlock.is_separate_payment}{else}0{/if}{literal};
 
         // select a new premium
@@ -357,7 +357,7 @@
   {else}
     {literal}
     <script>
-      cj(function(){
+      CRM.$(function($) {
         cj('.premium-short').hide();
         cj('.premium-full').show();
       });
diff --git a/templates/CRM/Contribute/Form/ContributionCharts.tpl b/templates/CRM/Contribute/Form/ContributionCharts.tpl
index c69965a7be..e6a721df35 100644
--- a/templates/CRM/Contribute/Form/ContributionCharts.tpl
+++ b/templates/CRM/Contribute/Form/ContributionCharts.tpl
@@ -60,7 +60,7 @@
 {literal}
 <script type="text/javascript">
 
-  cj( function( ) {
+  CRM.$(function($) {
       buildChart( );
   });
 
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
index 9335f9a581..917e3fde1e 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl
@@ -239,7 +239,7 @@
      cj('#amountFields').hide();
   }
 
-  cj(function() {
+  CRM.$(function($) {
     payLater('is_pay_later');
   });
 
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
index a1fab0de7c..f386064e91 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
@@ -140,7 +140,7 @@
 
 <script type="text/javascript">
   {literal}
-  cj(function () {
+  CRM.$(function($) {
     cj().crmAccordions();
 
     // bind click event to premiums_active checkbox
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
index 584023a8fa..26a8d45030 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
@@ -142,7 +142,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Contribute/Form/Search.tpl b/templates/CRM/Contribute/Form/Search.tpl
index 983f993d19..5f10bdcd68 100644
--- a/templates/CRM/Contribute/Form/Search.tpl
+++ b/templates/CRM/Contribute/Form/Search.tpl
@@ -92,7 +92,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Contribute/Form/SoftCredit.tpl b/templates/CRM/Contribute/Form/SoftCredit.tpl
index b46baafc56..43ba52e2ca 100644
--- a/templates/CRM/Contribute/Form/SoftCredit.tpl
+++ b/templates/CRM/Contribute/Form/SoftCredit.tpl
@@ -66,7 +66,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-  cj(function($) {
+  CRM.$(function($) {
     var $form = $("#{/literal}{$form.formName}{literal}");
     $('#showPCP, #showSoftCredit').click(function(){
       return showHideSoftCreditAndPCP();
diff --git a/templates/CRM/Contribute/Page/DashBoard.js b/templates/CRM/Contribute/Page/DashBoard.js
index 120c700c69..b56013ecdf 100644
--- a/templates/CRM/Contribute/Page/DashBoard.js
+++ b/templates/CRM/Contribute/Page/DashBoard.js
@@ -1,7 +1,7 @@
 // http://civicrm.org/licensing
 /*jslint indent: 2 */
 /*global CRM, cj */
-cj(function ($) {
+CRM.$(function($) {
   'use strict';
 
   var load = {
diff --git a/templates/CRM/Contribute/Page/PaymentInfo.tpl b/templates/CRM/Contribute/Page/PaymentInfo.tpl
index 27e172a92c..64bb4ec418 100644
--- a/templates/CRM/Contribute/Page/PaymentInfo.tpl
+++ b/templates/CRM/Contribute/Page/PaymentInfo.tpl
@@ -26,7 +26,7 @@
 {if $show eq 'event-payment'}
 {literal}
 <script type='text/javascript'>
-cj(function($){
+CRM.$(function($) {
   if (cj("#payment-info").length) {
     var dataUrl = {/literal}'{crmURL p="civicrm/payment/view" h=0 q="action=browse&id=$participantId&cid=`$contactId`&component=event&context=payment_info&snippet=4"}'{literal};
     cj.ajax({
diff --git a/templates/CRM/Core/APIDoc.tpl b/templates/CRM/Core/APIDoc.tpl
index ac08b2bb35..191908f4e5 100644
--- a/templates/CRM/Core/APIDoc.tpl
+++ b/templates/CRM/Core/APIDoc.tpl
@@ -63,7 +63,7 @@ function APIDoc(entity){
 }
 
 
-cj(function ($) {
+CRM.$(function($) {
     $('h2.entity').click ( function(){APIDoc($(this).attr('id'))} ); 
     entity=window.location.hash;
     if (entity.substring(0, 1) === '#') {
diff --git a/templates/CRM/Core/AjaxDoc.tpl b/templates/CRM/Core/AjaxDoc.tpl
index a072075065..1110e5ece5 100644
--- a/templates/CRM/Core/AjaxDoc.tpl
+++ b/templates/CRM/Core/AjaxDoc.tpl
@@ -13,7 +13,7 @@ code {line-height:1em;}
 <script>
 {literal}
 
-cj(function($) {
+CRM.$(function($) {
   var restURL = CRM.url("civicrm/ajax/rest");
 
   function toggleField (name, label, type) {
diff --git a/templates/CRM/Core/BillingBlock.js b/templates/CRM/Core/BillingBlock.js
index c78932b1a3..abe4376dfd 100644
--- a/templates/CRM/Core/BillingBlock.js
+++ b/templates/CRM/Core/BillingBlock.js
@@ -79,4 +79,4 @@
   $(function() {
     $('#billing-payment-block').on('crmFormLoad', civicrm_billingblock_creditcard_helper);
   });
-})(cj);
+})(CRM.$);
diff --git a/templates/CRM/Core/BillingBlock.tpl b/templates/CRM/Core/BillingBlock.tpl
index d6b48e1ae0..85a4efe456 100644
--- a/templates/CRM/Core/BillingBlock.tpl
+++ b/templates/CRM/Core/BillingBlock.tpl
@@ -171,7 +171,7 @@
      <script type="text/javascript">
      {literal}
 
-cj( function( ) {
+CRM.$(function($) {
   // build list of ids to track changes on
   var address_fields = {/literal}{$profileAddressFields|@json_encode}{literal};
   var input_ids = {};
diff --git a/templates/CRM/Custom/Form/ContactReference.tpl b/templates/CRM/Custom/Form/ContactReference.tpl
index c85e8a1459..4a25f4e984 100644
--- a/templates/CRM/Custom/Form/ContactReference.tpl
+++ b/templates/CRM/Custom/Form/ContactReference.tpl
@@ -25,7 +25,7 @@
 *}
 {literal}
 <script type="text/javascript">
-cj( function( ) {
+CRM.$(function($) {
     var url       = "{/literal}{$customUrls.$element_name}{literal}";
     var custom    = "{/literal}#{$element_name|replace:']':''|replace:'[':'_'}{literal}";
     var custom_id = "{/literal}input[name=\"{$element_name|cat:'_id'|regex_replace:'/\]_id$/':'_id]'}\"]{literal}";
diff --git a/templates/CRM/Custom/Form/CustomData.tpl b/templates/CRM/Custom/Form/CustomData.tpl
index 55bb4b1b40..a9fd459b5b 100644
--- a/templates/CRM/Custom/Form/CustomData.tpl
+++ b/templates/CRM/Custom/Form/CustomData.tpl
@@ -94,7 +94,7 @@
   {/foreach}
   <script type="text/javascript">
     {literal}
-      cj(function() {
+      CRM.$(function($) {
         cj().crmAccordions();
       });
     {/literal}
diff --git a/templates/CRM/Custom/Form/Group.tpl b/templates/CRM/Custom/Form/Group.tpl
index e83c6a8215..4697876fe2 100644
--- a/templates/CRM/Custom/Form/Group.tpl
+++ b/templates/CRM/Custom/Form/Group.tpl
@@ -85,7 +85,7 @@
 {$initHideBlocks}
 {literal}
 <script type="text/Javascript">
-cj(function($) {
+CRM.$(function($) {
 
   showHideStyle();
   cj('#extends_0').change(function() {
diff --git a/templates/CRM/Custom/Page/CustomDataView.tpl b/templates/CRM/Custom/Page/CustomDataView.tpl
index d74ce3a3cc..db3e48e375 100644
--- a/templates/CRM/Custom/Page/CustomDataView.tpl
+++ b/templates/CRM/Custom/Page/CustomDataView.tpl
@@ -184,7 +184,7 @@
 {/foreach}
 {literal}
   <script type="text/javascript">
-    cj(function () {
+    CRM.$(function($) {
       cj().crmAccordions();
     });
   </script>
diff --git a/templates/CRM/Event/Form/EventFees.tpl b/templates/CRM/Event/Form/EventFees.tpl
index ea5b05a5e8..24dc555c03 100644
--- a/templates/CRM/Event/Form/EventFees.tpl
+++ b/templates/CRM/Event/Form/EventFees.tpl
@@ -204,7 +204,7 @@
 {if $context eq 'standalone' and $outBound_option != 2 }
 <script type="text/javascript">
 {literal}
-cj( function( ) {
+CRM.$(function($) {
     cj("#contact_1").blur( function( ) {
         checkEmail( );
     } );
diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
index 482eaa4eaa..1e5dae1226 100644
--- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
@@ -173,7 +173,7 @@
 </div>
 {literal}
 <script type="text/javascript">
-  cj(function($) {
+  CRM.$(function($) {
     $('#template_id', '#EventInfo').change(function() {
       $('#crm-main-content-wrapper')
         .crmSnippet({url: CRM.url('civicrm/event/add', {action: 'add', reset: 1, template_id: $(this).val()})})
diff --git a/templates/CRM/Event/Form/ManageEvent/Fee.tpl b/templates/CRM/Event/Form/ManageEvent/Fee.tpl
index 0c09689973..4578f064db 100644
--- a/templates/CRM/Event/Form/ManageEvent/Fee.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Fee.tpl
@@ -230,7 +230,7 @@
             {if $discountSection eq 2}
                 <script type="text/javascript">
                 {literal}
-                    cj( function() {
+                    CRM.$(function($) {
                         cj('#discounted_label_1').focus( );
                     });
                 {/literal}
diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/templates/CRM/Event/Form/ManageEvent/Registration.tpl
index 5aacdf529b..ed4d80c2d8 100644
--- a/templates/CRM/Event/Form/ManageEvent/Registration.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Registration.tpl
@@ -425,7 +425,7 @@ invert              = 0
     }
 
     //show edit profile field links
-    cj(function() {
+    CRM.$(function($) {
         // show edit for main profile
         cj(document).on('change', 'select[id^="custom_p"]', function( event ) {
             buildLinks( cj(this), cj(this).val());
diff --git a/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl b/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl
index e9b6fef3fe..bb366944f6 100755
--- a/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl
@@ -180,7 +180,7 @@
 
   {literal}
     <script type='text/javascript'>
-      cj(function() {
+      CRM.$(function($) {
         populateRecipient();
         cj('#recipient').click( function( ) {
           populateRecipient();
diff --git a/templates/CRM/Event/Form/ManageEvent/Tab.tpl b/templates/CRM/Event/Form/ManageEvent/Tab.tpl
index 5f9232e5e3..b148863b4f 100644
--- a/templates/CRM/Event/Form/ManageEvent/Tab.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Tab.tpl
@@ -75,7 +75,7 @@
 
 {literal}
 <script>
-cj(function($) {
+CRM.$(function($) {
   $('body').click(function() {
     $('#crm-event-links-list, #crm-participant-list').hide();
   });
diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl
index def9258e3e..4e085d14b5 100644
--- a/templates/CRM/Event/Form/Participant.tpl
+++ b/templates/CRM/Event/Form/Participant.tpl
@@ -49,7 +49,7 @@
     {literal}
 
     if ( fieldOptionsFull.length > 0 ) {
-      cj(function() {
+      CRM.$(function($) {
         cj("input,#priceset select,#priceset").each(function () {
           if ( cj(this).attr('price') ) {
             switch( cj(this).attr('type') ) {
@@ -341,7 +341,7 @@
 
     <script type="text/javascript">
       {literal}
-      cj(function($) {
+      CRM.$(function($) {
 
         var $form = $('form#{/literal}{$form.formName}{literal}');
 
@@ -610,7 +610,7 @@
     {/literal}
   {/if}
   {literal}
-  cj(function() {
+  CRM.$(function($) {
     cj().crmAccordions();
   });
   {/literal}
diff --git a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
index 498b077d2e..59b7e09447 100644
--- a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
+++ b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
@@ -67,7 +67,7 @@ function populatebalanceFee(updatedAmt) {
   cj('#balance-fee').text(symbol+" "+balanceAmt);
 }
 
-cj(function(){
+CRM.$(function($) {
   // assign statuses
   var partiallyPaid = {/literal}{$partiallyPaid}{literal};
   var pendingRefund = {/literal}{$pendingRefund}{literal};
@@ -193,7 +193,7 @@ cj(function(){
 {/if}
 {literal}
 <script type='text/javascript'>
-cj(function($){
+CRM.$(function($) {
   cj('.total_amount-section').remove(); 
 
   cj('#ParticipantFeeSelection').submit(function(e) {
diff --git a/templates/CRM/Event/Form/Registration/Register.tpl b/templates/CRM/Event/Form/Registration/Register.tpl
index bbf5440dab..8cefbaaa47 100644
--- a/templates/CRM/Event/Form/Registration/Register.tpl
+++ b/templates/CRM/Event/Form/Registration/Register.tpl
@@ -200,7 +200,7 @@
       toggleConfirmButton();
     });
 
-    cj(function () {
+    CRM.$(function($) {
       toggleConfirmButton();
       skipPaymentMethod();
     });
diff --git a/templates/CRM/Event/Form/Search.tpl b/templates/CRM/Event/Form/Search.tpl
index f15da6ef92..8b5c0f54fd 100644
--- a/templates/CRM/Event/Form/Search.tpl
+++ b/templates/CRM/Event/Form/Search.tpl
@@ -79,7 +79,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Event/Form/Search/Common.tpl b/templates/CRM/Event/Form/Search/Common.tpl
index 5e8aa5563c..ca93d528f5 100644
--- a/templates/CRM/Event/Form/Search/Common.tpl
+++ b/templates/CRM/Event/Form/Search/Common.tpl
@@ -89,7 +89,7 @@ campaignTrClass='' campaignTdClass='crm-event-form-block-participant_campaign_id
 
 {literal}
 <script type="text/javascript">
-cj(function($) {
+CRM.$(function($) {
   // FIXME: This could be much simpler as an entityRef field but the priceFieldValue api doesn't currently support the filters we need
   $('#participant_fee_id').select2({
     placeholder: {/literal}'{ts escape="js"}- any -{/ts}'{literal},
diff --git a/templates/CRM/Event/Form/Task/Batch.tpl b/templates/CRM/Event/Form/Task/Batch.tpl
index 925c934298..daa9633093 100644
--- a/templates/CRM/Event/Form/Task/Batch.tpl
+++ b/templates/CRM/Event/Form/Task/Batch.tpl
@@ -92,7 +92,7 @@
 /**
  * Function to update participant status
  */
-cj( function(){
+CRM.$(function($) {
    cj('#status_change').change( function() {
       if ( cj(this).val() ) {
         cj('.crm-copy-fields [name^="field["][name*="[participant_status]"]').val( cj(this).val() );
diff --git a/templates/CRM/Financial/Form/BatchTransaction.tpl b/templates/CRM/Financial/Form/BatchTransaction.tpl
index 7886488749..293e15f531 100644
--- a/templates/CRM/Financial/Form/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Form/BatchTransaction.tpl
@@ -89,7 +89,7 @@
 
 {literal}
 <script type="text/javascript">
-cj( function() {
+CRM.$(function($) {
   cj().crmAccordions();
   cj('#_qf_BatchTransaction_submit-top, #_qf_BatchTransaction_submit-botttom').click(function() {
     cj('.crm-batch_transaction_search-accordion:not(.collapsed)').crmAccordionToggle();
diff --git a/templates/CRM/Financial/Form/Export.tpl b/templates/CRM/Financial/Form/Export.tpl
index 0cec90182c..1368a541ad 100644
--- a/templates/CRM/Financial/Form/Export.tpl
+++ b/templates/CRM/Financial/Form/Export.tpl
@@ -52,7 +52,7 @@
 </div>
 {literal}
 <script type="text/javascript">
-  cj(function(){
+  CRM.$(function($) {
     cj('input[name="export_format"]').filter('[value=IIF]').prop('checked', true);
     cj('#_qf_Export_next').click(function(){
       cj(this).hide();
diff --git a/templates/CRM/Financial/Form/FinancialBatch.tpl b/templates/CRM/Financial/Form/FinancialBatch.tpl
index 3c7db2ad87..8aa74cd7c8 100644
--- a/templates/CRM/Financial/Form/FinancialBatch.tpl
+++ b/templates/CRM/Financial/Form/FinancialBatch.tpl
@@ -94,7 +94,7 @@
 {include file="CRM/Form/validate.tpl"}
 {literal}
 <script type="text/javascript">
-cj(function($){
+CRM.$(function($) {
   $().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Financial/Form/Search.tpl b/templates/CRM/Financial/Form/Search.tpl
index 002c6863f9..5b6ff9a0d7 100644
--- a/templates/CRM/Financial/Form/Search.tpl
+++ b/templates/CRM/Financial/Form/Search.tpl
@@ -67,7 +67,7 @@
 {include file="CRM/Form/validate.tpl"}
 {literal}
 <script type="text/javascript">
-cj(function($) {
+CRM.$(function($) {
   var batchSelector;
   buildBatchSelector();
   $("#batch_update").prop('disabled', false);
diff --git a/templates/CRM/Financial/Page/BatchTransaction.tpl b/templates/CRM/Financial/Page/BatchTransaction.tpl
index 9022e8f559..92d1db1f97 100644
--- a/templates/CRM/Financial/Page/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Page/BatchTransaction.tpl
@@ -76,7 +76,7 @@
 
 {literal}
 <script type="text/javascript">
-cj( function() {
+CRM.$(function($) {
   var entityID = {/literal}{$entityID}{literal};
   batchSummary(entityID);
   cj('#close_batch').click( function() {
diff --git a/templates/CRM/Form/attachment.tpl b/templates/CRM/Form/attachment.tpl
index c0f5becce8..ecd119c93b 100644
--- a/templates/CRM/Form/attachment.tpl
+++ b/templates/CRM/Form/attachment.tpl
@@ -130,7 +130,7 @@
   {if !$noexpand}
     {literal}
     <script type="text/javascript">
-    cj(function() {
+    CRM.$(function($) {
        cj().crmAccordions();
     });
     </script>
diff --git a/templates/CRM/Form/attachmentjs.tpl b/templates/CRM/Form/attachmentjs.tpl
index 75345c5813..f626b779ce 100644
--- a/templates/CRM/Form/attachmentjs.tpl
+++ b/templates/CRM/Form/attachmentjs.tpl
@@ -1,6 +1,6 @@
 <script type="text/javascript">
 {literal}
-  cj(function($) {
+  CRM.$(function($) {
     $('a.delete-attachment').click(function() {
       var $el = $(this),
         $row = $el.closest('.crm-attachment-wrapper'),
diff --git a/templates/CRM/Form/validate.tpl b/templates/CRM/Form/validate.tpl
index 808d209f01..502482b875 100644
--- a/templates/CRM/Form/validate.tpl
+++ b/templates/CRM/Form/validate.tpl
@@ -32,7 +32,7 @@
 
 {literal}
 <script type="text/javascript" >
-cj(function($) {
+CRM.$(function($) {
   var messages = {{/literal}
         required: "{ts escape='js'}This field is required.{/ts}",
         remote: "{ts escape='js'}Please fix this field.{/ts}",
diff --git a/templates/CRM/Grant/Form/Grant.tpl b/templates/CRM/Grant/Form/Grant.tpl
index d0162068d4..8dab641e1c 100644
--- a/templates/CRM/Grant/Form/Grant.tpl
+++ b/templates/CRM/Grant/Form/Grant.tpl
@@ -124,7 +124,7 @@
 
 {literal}
 <script type="text/javascript">
-    cj( function( ) {
+    CRM.$(function($) {
         {/literal}
         CRM.buildCustomData( '{$customDataType}' );
         {if $customDataSubType}
@@ -133,7 +133,7 @@
         {literal}
     });
 
-    cj(function() {
+    CRM.$(function($) {
        cj().crmAccordions();
     });
 </script>
diff --git a/templates/CRM/Grant/Form/Search.tpl b/templates/CRM/Grant/Form/Search.tpl
index 511f316b10..b2436d142b 100644
--- a/templates/CRM/Grant/Form/Search.tpl
+++ b/templates/CRM/Grant/Form/Search.tpl
@@ -72,7 +72,7 @@
 </div><!-- /.crm-content-block -->
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Group/Form/Search.tpl b/templates/CRM/Group/Form/Search.tpl
index 312cc231da..1fe66e4672 100644
--- a/templates/CRM/Group/Form/Search.tpl
+++ b/templates/CRM/Group/Form/Search.tpl
@@ -91,7 +91,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function($) {
+CRM.$(function($) {
   // for CRM-11310 and CRM-10635 : processing just parent groups on initial display
   // passing '1' for parentsOnlyArg to show parent child heirarchy structure display
   // on initial load of manage group page and
diff --git a/templates/CRM/Mailing/Form/Approve.tpl b/templates/CRM/Mailing/Form/Approve.tpl
index c6459e7b40..0a554f0cf8 100644
--- a/templates/CRM/Mailing/Form/Approve.tpl
+++ b/templates/CRM/Mailing/Form/Approve.tpl
@@ -61,7 +61,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Mailing/Form/Count.tpl b/templates/CRM/Mailing/Form/Count.tpl
index d19a35fa56..4be3523f5f 100644
--- a/templates/CRM/Mailing/Form/Count.tpl
+++ b/templates/CRM/Mailing/Form/Count.tpl
@@ -63,7 +63,7 @@ cj("#button").click(function(){
      });
   });
 
-    cj( function( ) {
+    CRM.$(function($) {
         var count = 0; var columns=''; var sortColumn = '';
 
         cj('#selectedRecords th').each( function( ) {
diff --git a/templates/CRM/Mailing/Form/Group.tpl b/templates/CRM/Mailing/Form/Group.tpl
index b1b9e751fc..6b19195da3 100644
--- a/templates/CRM/Mailing/Form/Group.tpl
+++ b/templates/CRM/Mailing/Form/Group.tpl
@@ -79,7 +79,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Mailing/Form/InsertTokens.tpl b/templates/CRM/Mailing/Form/InsertTokens.tpl
index 7cdb1ef592..2e86012178 100644
--- a/templates/CRM/Mailing/Form/InsertTokens.tpl
+++ b/templates/CRM/Mailing/Form/InsertTokens.tpl
@@ -242,7 +242,7 @@ if ( isMailing ) {
   {/literal}
   {if $editor eq "ckeditor"}
   {literal}
-    cj( function() {
+    CRM.$(function($) {
       oEditor = CKEDITOR.instances['html_message'];
       oEditor.BaseHref = '' ;
       oEditor.UserFilesPath = '' ;
@@ -251,7 +251,7 @@ if ( isMailing ) {
   {/literal}
   {elseif $editor eq "tinymce"}
   {literal}
-    cj( function( ) {
+    CRM.$(function($) {
       if ( isMailing ) {
         cj('div.html').hover(
           function( ) {
@@ -274,7 +274,7 @@ if ( isMailing ) {
   {/literal}
   {elseif $editor eq "drupalwysiwyg"}
   {literal}
-    cj( function( ) {
+    CRM.$(function($) {
       if ( isMailing ) {
         cj('div.html').hover(
           verify,
@@ -287,7 +287,7 @@ if ( isMailing ) {
   {literal}
 }
 
-cj(function($) {
+CRM.$(function($) {
   function insertToken() {
     var
       token = $(this).val(),
diff --git a/templates/CRM/Mailing/Form/Schedule.tpl b/templates/CRM/Mailing/Form/Schedule.tpl
index 3688ed67f7..194856ae23 100644
--- a/templates/CRM/Mailing/Form/Schedule.tpl
+++ b/templates/CRM/Mailing/Form/Schedule.tpl
@@ -77,14 +77,14 @@
 <script type="text/javascript">
 {if $preview}
 {literal}
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 {/literal}
 {/if}
 
 {literal}
-cj(function() {
+CRM.$(function($) {
    cj('#start_date_display').change( function( ) {
        if ( cj(this).val( ) ) {
           cj('#now').prop('checked', false );
diff --git a/templates/CRM/Mailing/Form/Settings.tpl b/templates/CRM/Mailing/Form/Settings.tpl
index edcb72e73d..21f8abc583 100644
--- a/templates/CRM/Mailing/Form/Settings.tpl
+++ b/templates/CRM/Mailing/Form/Settings.tpl
@@ -27,7 +27,7 @@
 <script  type="text/javascript">
 {literal}
 
-cj( function($) {
+CRM.$(function($) {
   // hide all the selects that contains only one option
   cj('.crm-message-select select').each(function (){
     if (cj(this).find('option').size() == 1) {
diff --git a/templates/CRM/Mailing/Form/Test.tpl b/templates/CRM/Mailing/Form/Test.tpl
index d80b573eb2..1c534a497f 100644
--- a/templates/CRM/Mailing/Form/Test.tpl
+++ b/templates/CRM/Mailing/Form/Test.tpl
@@ -69,7 +69,7 @@
 {include file="CRM/common/formNavigate.tpl"}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions(); 
 });
 </script>
diff --git a/templates/CRM/Mailing/Page/Event.tpl b/templates/CRM/Mailing/Page/Event.tpl
index 9b2e9a331a..d22463560d 100644
--- a/templates/CRM/Mailing/Page/Event.tpl
+++ b/templates/CRM/Mailing/Page/Event.tpl
@@ -71,7 +71,7 @@
 {literal}
   <script type="text/javascript">
     var totalPages = {/literal}{$pager->_totalPages}{literal};
-    cj(function () {
+    CRM.$(function($) {
       cj("#crm-container .crm-pager input.form-submit").click(function () {
         submitPagerData(this);
       });
diff --git a/templates/CRM/Mailing/Page/Tab.tpl b/templates/CRM/Mailing/Page/Tab.tpl
index bc383efd97..667e889d7b 100644
--- a/templates/CRM/Mailing/Page/Tab.tpl
+++ b/templates/CRM/Mailing/Page/Tab.tpl
@@ -40,7 +40,7 @@
 </div>
 {literal}
 <script type="text/javascript">
-  cj(function($) {
+  CRM.$(function($) {
     var oTable;
 
     buildMailingContact();
diff --git a/templates/CRM/Member/Form/Membership.js b/templates/CRM/Member/Form/Membership.js
index ca5920542a..042393167e 100644
--- a/templates/CRM/Member/Form/Membership.js
+++ b/templates/CRM/Member/Form/Membership.js
@@ -1,4 +1,4 @@
-cj(function($) {
+CRM.$(function($) {
   checkExistingMemOrg();
 
   $("select[name='membership_type_id[0]']").change( checkExistingMemOrg );
diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index d06801e0ad..1a44e9da8f 100644
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -37,7 +37,7 @@
   {include file="CRM/Price/Form/PriceSet.tpl" context="standalone" extends="Membership"}
   {literal}
   <script type="text/javascript">
-  cj( function() {
+  CRM.$(function($) {
     var membershipValues = new Array;
     {/literal}{foreach from=$optionsMembershipTypes item=memType key=opId}{literal}
       membershipValues[{/literal}{$opId}{literal}] = {/literal}{$memType}{literal};
@@ -295,7 +295,7 @@
       {include file="CRM/common/customData.tpl"}
       {literal}
       <script type="text/javascript">
-      cj(function() {
+      CRM.$(function($) {
       {/literal}
         CRM.buildCustomData( '{$customDataType}' );
         {if $customDataSubType}
@@ -382,7 +382,7 @@
       }
 
 
-      cj( function( ) {
+      CRM.$(function($) {
       var mode   = {/literal}'{$membershipMode}'{literal};
       if ( !mode ) {
         // Offline form (mode = false) has the record_contribution checkbox
@@ -462,7 +462,7 @@
 
     {if $context eq 'standalone' and $outBound_option != 2 }
     {literal}
-    cj( function( ) {
+    CRM.$(function($) {
       cj("#contact_1").blur( function( ) {
         checkEmail( );
       } );
@@ -503,7 +503,7 @@
 
     {literal}
     //keep read only always checked.
-    cj( function( ) {
+    CRM.$(function($) {
       var allowAutoRenew   = {/literal}'{$allowAutoRenew}'{literal};
       var alreadyAutoRenew = {/literal}'{$alreadyAutoRenew}'{literal};
       if ( allowAutoRenew || alreadyAutoRenew ) {
diff --git a/templates/CRM/Member/Form/MembershipBlock.tpl b/templates/CRM/Member/Form/MembershipBlock.tpl
index 11db8dec94..444a971f8a 100644
--- a/templates/CRM/Member/Form/MembershipBlock.tpl
+++ b/templates/CRM/Member/Form/MembershipBlock.tpl
@@ -142,7 +142,7 @@
 
 {literal}
 <script type="text/javascript">
-    cj( function() {
+    CRM.$(function($) {
         //show/hide membership block
         showHideMembershipBlock();
         cj('#member_is_active').click( function() {
diff --git a/templates/CRM/Member/Form/MembershipRenewal.tpl b/templates/CRM/Member/Form/MembershipRenewal.tpl
index b212f62903..17b220ae30 100644
--- a/templates/CRM/Member/Form/MembershipRenewal.tpl
+++ b/templates/CRM/Member/Form/MembershipRenewal.tpl
@@ -303,7 +303,7 @@
   {/if}
 {literal}
   <script type="text/javascript">
-    cj(function () {
+    CRM.$(function($) {
       cj('#membershipOrgType').hide();
       cj('#changeNumTerms').hide();
       {/literal}
@@ -339,7 +339,7 @@
       cj('#defaultNumTerms').hide();
     }
 
-    cj(function () {
+    CRM.$(function($) {
       cj('#record_contribution').click(function () {
         if (cj(this).prop('checked')) {
           cj('#recordContribution').show();
diff --git a/templates/CRM/Member/Form/MembershipStandalone.js b/templates/CRM/Member/Form/MembershipStandalone.js
index b2a03d765e..63c9a16ee9 100644
--- a/templates/CRM/Member/Form/MembershipStandalone.js
+++ b/templates/CRM/Member/Form/MembershipStandalone.js
@@ -1,4 +1,4 @@
-cj(function($) {
+CRM.$(function($) {
   memberResults = new Array;
   $("input[name='contact[1]']").result( function() {
     var contact_id = cj("input[name='contact_select_id[1]']").val();
diff --git a/templates/CRM/Member/Form/MembershipType.tpl b/templates/CRM/Member/Form/MembershipType.tpl
index 9558a9ffab..f8d80fe46e 100644
--- a/templates/CRM/Member/Form/MembershipType.tpl
+++ b/templates/CRM/Member/Form/MembershipType.tpl
@@ -159,7 +159,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function(){
+CRM.$(function($) {
   showHidePeriodSettings();
   cj('#duration_unit').change(function(){
     showHidePeriodSettings();
@@ -217,7 +217,7 @@ function showHidePeriodSettings() {
 
 //load the auto renew msg if recur allow.
 {/literal}{if $authorize and $allowAutoRenewMsg}{literal}
-cj( function(){
+CRM.$(function($) {
   setReminder( null );
 });
 {/literal}{/if}{literal}
diff --git a/templates/CRM/Member/Form/Search.tpl b/templates/CRM/Member/Form/Search.tpl
index 6d90a38775..76338d461f 100644
--- a/templates/CRM/Member/Form/Search.tpl
+++ b/templates/CRM/Member/Form/Search.tpl
@@ -73,7 +73,7 @@
 </div>
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Member/Form/Task/Label.js b/templates/CRM/Member/Form/Task/Label.js
index e5f6a3a0a8..a5a3f4c398 100644
--- a/templates/CRM/Member/Form/Task/Label.js
+++ b/templates/CRM/Member/Form/Task/Label.js
@@ -1,4 +1,4 @@
-cj(function ($) {
+CRM.$(function($) {
   'use strict';
   $('#per_membership').click(function() {
     if($(this).is(":checked")) {
diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl
index 832901ef1b..1837f7d304 100644
--- a/templates/CRM/Pledge/Form/Pledge.tpl
+++ b/templates/CRM/Pledge/Form/Pledge.tpl
@@ -202,7 +202,7 @@ function loadPanes( id ) {
 </div>
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
@@ -251,7 +251,7 @@ cj(function() {
     {/literal}
     {if $context eq 'standalone' and $outBound_option != 2 }
     {literal}
-    cj( function( ) {
+    CRM.$(function($) {
         cj("#contact_1").blur( function( ) {
             checkEmail( );
         });
diff --git a/templates/CRM/Pledge/Form/Search.tpl b/templates/CRM/Pledge/Form/Search.tpl
index 1ac3edba2c..8f208fa020 100644
--- a/templates/CRM/Pledge/Form/Search.tpl
+++ b/templates/CRM/Pledge/Form/Search.tpl
@@ -81,7 +81,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Profile/Form/Search.tpl b/templates/CRM/Profile/Form/Search.tpl
index cbf923e3b7..8735b8994d 100644
--- a/templates/CRM/Profile/Form/Search.tpl
+++ b/templates/CRM/Profile/Form/Search.tpl
@@ -143,7 +143,7 @@
 
     {literal}
       <script type="text/javascript">
-        cj(function() {
+        CRM.$(function($) {
           cj().crmAccordions();
         });
       </script>
@@ -164,7 +164,7 @@
 {/if}
 {literal}
   <script type="text/javascript">
-    cj(function(){
+    CRM.$(function($) {
       cj('#selector tr:even').addClass('odd-row ');
       cj('#selector tr:odd ').addClass('even-row');
     });
diff --git a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
index f3bd6b9cd7..d3805b5cd8 100644
--- a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
+++ b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
@@ -87,4 +87,4 @@
        class="button action-item"><span><div class="icon add-icon"></div>{ts}Add New Record{/ts}</span></a>
     {/if}
   {/if}
-{/if}
\ No newline at end of file
+{/if}
diff --git a/templates/CRM/Queue/Page/Runner.tpl b/templates/CRM/Queue/Page/Runner.tpl
index edaa4758ca..dc9705e966 100644
--- a/templates/CRM/Queue/Page/Runner.tpl
+++ b/templates/CRM/Queue/Page/Runner.tpl
@@ -14,7 +14,7 @@
 {literal}
 <script type="text/javascript">
 
-cj(function() {
+CRM.$(function($) {
   // Note: Queue API provides "#remaining tasks" but not "#completed tasks" or "#total tasks".
   // To compute a %complete, we manually track #completed. This only works nicely if we
   // assume that the queue began with a fixed #tasks.
diff --git a/templates/CRM/Report/Form/Case/Detail.tpl b/templates/CRM/Report/Form/Case/Detail.tpl
index 2ba0c003f6..3018ead021 100644
--- a/templates/CRM/Report/Form/Case/Detail.tpl
+++ b/templates/CRM/Report/Form/Case/Detail.tpl
@@ -255,7 +255,7 @@
 
     {literal}
     <script type="text/javascript">
-    cj(function() {
+    CRM.$(function($) {
       cj().crmAccordions();
     });
     </script>
diff --git a/templates/CRM/Report/Form/Fields.tpl b/templates/CRM/Report/Form/Fields.tpl
index 7e5e0b7917..b21a32e83a 100644
--- a/templates/CRM/Report/Form/Fields.tpl
+++ b/templates/CRM/Report/Form/Fields.tpl
@@ -72,7 +72,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Report/Form/Instance.tpl b/templates/CRM/Report/Form/Instance.tpl
index 6b9d82e3c0..e4b638cf6d 100644
--- a/templates/CRM/Report/Form/Instance.tpl
+++ b/templates/CRM/Report/Form/Instance.tpl
@@ -122,7 +122,7 @@
   cj(document).ready(function() {
     cj('#title').data('initial_value', cj('#title').val());
   });
-  cj( function(){
+  CRM.$(function($) {
       var formName = {/literal}"{$form.formName}"{literal};
       cj('#_qf_' + formName + '_submit_save').click (
           function(){
diff --git a/templates/CRM/Report/Form/Layout/Graph.tpl b/templates/CRM/Report/Form/Layout/Graph.tpl
index 45c0e948ef..c23920f0f2 100644
--- a/templates/CRM/Report/Form/Layout/Graph.tpl
+++ b/templates/CRM/Report/Form/Layout/Graph.tpl
@@ -47,7 +47,7 @@
 
 {literal}
 <script type="text/javascript">
-   cj( function( ) {
+   CRM.$(function($) {
      buildChart( );
 
      cj("input[id$='submit_print'],input[id$='submit_pdf']").bind('click', function(e){
diff --git a/templates/CRM/Report/Page/InstanceList.tpl b/templates/CRM/Report/Page/InstanceList.tpl
index f76274664f..63c68126e3 100644
--- a/templates/CRM/Report/Page/InstanceList.tpl
+++ b/templates/CRM/Report/Page/InstanceList.tpl
@@ -84,7 +84,7 @@
 {/strip}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/Report/Page/TemplateList.tpl b/templates/CRM/Report/Page/TemplateList.tpl
index 176bd05af9..0b38e6de62 100644
--- a/templates/CRM/Report/Page/TemplateList.tpl
+++ b/templates/CRM/Report/Page/TemplateList.tpl
@@ -67,7 +67,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/SMS/Form/Group.tpl b/templates/CRM/SMS/Form/Group.tpl
index 2c9dc96f33..8d7b69c10d 100644
--- a/templates/CRM/SMS/Form/Group.tpl
+++ b/templates/CRM/SMS/Form/Group.tpl
@@ -69,7 +69,7 @@
 
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 </script>
diff --git a/templates/CRM/SMS/Form/Schedule.tpl b/templates/CRM/SMS/Form/Schedule.tpl
index 265bd58f12..f494d34cc5 100644
--- a/templates/CRM/SMS/Form/Schedule.tpl
+++ b/templates/CRM/SMS/Form/Schedule.tpl
@@ -74,14 +74,14 @@
 <script type="text/javascript">
 {if $preview}
 {literal}
-cj(function() {
+CRM.$(function($) {
    cj().crmAccordions();
 });
 {/literal}
 {/if}
 
 {literal}
-cj(function() {
+CRM.$(function($) {
    cj('#start_date_display').change( function( ) { 
        if ( cj(this).val( ) ) {
           cj('#now').prop('checked', false );
diff --git a/templates/CRM/Tag/Form/Tag.tpl b/templates/CRM/Tag/Form/Tag.tpl
index ed34dfd2ce..dd6fe06e9b 100644
--- a/templates/CRM/Tag/Form/Tag.tpl
+++ b/templates/CRM/Tag/Form/Tag.tpl
@@ -73,7 +73,7 @@
       // update summary tab
       $("#contact-summary #tags").html(tags.join(', '));
     };
-  })(cj);
+  })(CRM.$);
   {/literal}
 </script>
 <div id="Tag" class="view-content">
diff --git a/templates/CRM/UF/Form/AdvanceSetting.tpl b/templates/CRM/UF/Form/AdvanceSetting.tpl
index fb6b1312d9..f8a72de026 100644
--- a/templates/CRM/UF/Form/AdvanceSetting.tpl
+++ b/templates/CRM/UF/Form/AdvanceSetting.tpl
@@ -25,7 +25,7 @@
 *}
 {literal}
 <script type="text/javascript">
-    cj(function() {
+    CRM.$(function($) {
         cj().crmAccordions();
     });
 </script>
diff --git a/templates/CRM/UF/Form/Block.tpl b/templates/CRM/UF/Form/Block.tpl
index 3c7a8b11b7..a7763289b6 100644
--- a/templates/CRM/UF/Form/Block.tpl
+++ b/templates/CRM/UF/Form/Block.tpl
@@ -173,7 +173,7 @@
 
 {literal}
 <script type="text/javascript">
-  cj(function(){
+  CRM.$(function($) {
     cj('#selector tr:even').addClass('odd-row ');
     cj('#selector tr:odd ').addClass('even-row');
   });
diff --git a/templates/CRM/UF/Form/Field.tpl b/templates/CRM/UF/Form/Field.tpl
index 23f7391907..5863edb675 100644
--- a/templates/CRM/UF/Form/Field.tpl
+++ b/templates/CRM/UF/Form/Field.tpl
@@ -96,7 +96,7 @@ var otherModule = new Array( );
 otherModule[{/literal}{$mkey}{literal}] = '{/literal}{$mval}{literal}';
 {/literal}{/foreach}{literal}
 
-cj(function($) {
+CRM.$(function($) {
   if ( $.inArray( "Profile", otherModule ) > -1 && $.inArray( "Search Profile", otherModule ) == -1 ){
     $('#profile_visibility').show();
   }
@@ -202,7 +202,7 @@ cj("#field_name_1").bind( 'change blur', function( ) {
   showHideSeletorSearch( );
 });
 
-cj( function( ) {
+CRM.$(function($) {
   cj("#field_name_1").addClass( 'huge' );
   viewOnlyShowHide( );
   cj("#is_view").click( function(){
@@ -216,7 +216,7 @@ cj("#field_name_1").change(
     multiSummaryToggle(cj(this).val());
   });
 
-cj( function( ) {
+CRM.$(function($) {
   var fieldId = cj("#field_name_1").val();
   multiSummaryToggle(fieldId);
 });
diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl
index aaac4704c0..21289ec482 100644
--- a/templates/CRM/UF/Page/Group.tpl
+++ b/templates/CRM/UF/Page/Group.tpl
@@ -155,7 +155,7 @@
 
   </div> {* maincontainer*}
   <script type='text/javascript'>
-      cj( function() {ldelim}
+      CRM.$(function($) {ldelim}
         var selectedTab = '{if $selectedChild}{$selectedChild}{else}user-profiles{/if}';
         var tabIndex = cj('#tab_' + selectedTab).prevAll().length;
         {literal}
diff --git a/templates/CRM/Widget/Page/Inline/Example.tpl b/templates/CRM/Widget/Page/Inline/Example.tpl
index 3de42fc4cc..6d35fa3fb1 100644
--- a/templates/CRM/Widget/Page/Inline/Example.tpl
+++ b/templates/CRM/Widget/Page/Inline/Example.tpl
@@ -20,7 +20,7 @@ If load the page directly from your browser, it automatically adds all the page
 
 <script>
 {literal}
-cj (function($) {
+CRM.$(function($) {
   $("#dialog").click (function () {
     var $n=$('<div>Loading '+window.location+'</div>').appendTo('body');
     $n.load(''+window.location, function(){
diff --git a/templates/CRM/common/Navigation.tpl b/templates/CRM/common/Navigation.tpl
index f6217f0c4a..9891230277 100644
--- a/templates/CRM/common/Navigation.tpl
+++ b/templates/CRM/common/Navigation.tpl
@@ -153,4 +153,4 @@ $('#civicrm-menu').ready(function() {
   });
 });
 $('#civicrm-menu').menuBar({arrowSrc: CRM.config.resourceBase + 'packages/jquery/css/images/arrow.png'});
-})(cj);{/literal}
+})(CRM.$);{/literal}
diff --git a/templates/CRM/common/TabHeader.js b/templates/CRM/common/TabHeader.js
index cb19b23a92..4eb99a5a15 100644
--- a/templates/CRM/common/TabHeader.js
+++ b/templates/CRM/common/TabHeader.js
@@ -4,7 +4,7 @@
  * Tabs with class 'ajaxForm' will use CRM.loadForm instead, suitable for most forms
  * Tabs with class 'livePage' will get popup action links, suitable for crud tables
  */
-cj(function($) {
+CRM.$(function($) {
   var tabSettings = CRM.tabSettings || {};
   tabSettings.active = tabSettings.active ? $('#tab_' + tabSettings.active).prevAll().length : 0;
   $("#mainTabContainer")
@@ -111,4 +111,4 @@ cj(function($) {
       $panel.data("civiCrmSnippet") && $panel.crmSnippet('destroy');
     }
   };
-})(cj);
+})(CRM.$);
diff --git a/templates/CRM/common/TrackingFields.tpl b/templates/CRM/common/TrackingFields.tpl
index 34470ba710..6dbff68fc2 100644
--- a/templates/CRM/common/TrackingFields.tpl
+++ b/templates/CRM/common/TrackingFields.tpl
@@ -26,8 +26,7 @@
 {if $trackingFields and ! empty($trackingFields)}
 {literal}
 <script type="text/javascript">
-cj(
-   function( ) {
+CRM.$(function($) {
 {/literal}
     {foreach from=$trackingFields key=trackingFieldName item=dontCare}
        cj("#{$trackingFieldName}").parent().parent().hide( );
diff --git a/templates/CRM/common/additionalBlocks.tpl b/templates/CRM/common/additionalBlocks.tpl
index 2543c629aa..45adc63e4d 100644
--- a/templates/CRM/common/additionalBlocks.tpl
+++ b/templates/CRM/common/additionalBlocks.tpl
@@ -25,7 +25,7 @@
 *}
 {literal}
 <script type="text/javascript" >
-cj( function( ) {
+CRM.$(function($) {
     {/literal}
     {if $generateAjaxRequest}
         {foreach from=$ajaxRequestBlocks key="blockName" item="instances"}
diff --git a/templates/CRM/common/batchCopy.tpl b/templates/CRM/common/batchCopy.tpl
index a1c5957eaf..5582e9e0e8 100644
--- a/templates/CRM/common/batchCopy.tpl
+++ b/templates/CRM/common/batchCopy.tpl
@@ -25,7 +25,7 @@
 *}
 {literal}
 <script type="text/javascript">
-  cj( function() {
+  CRM.$(function($) {
     //bind the click event for action icon
     cj('.action-icon').click( function( ) {
       copyFieldValues( cj(this).attr('fname') );
diff --git a/templates/CRM/common/crmeditable.tpl b/templates/CRM/common/crmeditable.tpl
index 95a8d720fc..8aae1e3830 100644
--- a/templates/CRM/common/crmeditable.tpl
+++ b/templates/CRM/common/crmeditable.tpl
@@ -1,6 +1,6 @@
 <script>
 {literal}
-cj(function ($){
+CRM.$(function($) {
   $('.crm-editable').crmEditable ();
 });
 </script>
diff --git a/templates/CRM/common/dashboard.tpl b/templates/CRM/common/dashboard.tpl
index fdc8115098..b679183776 100644
--- a/templates/CRM/common/dashboard.tpl
+++ b/templates/CRM/common/dashboard.tpl
@@ -26,7 +26,7 @@
 {literal}
 <script type="text/javascript">
 
-cj(function($) {
+CRM.$(function($) {
   // The set of options we can use to initialize jQuery.dashboard().
   var options = {
     // Optional. Defaults to 3.  You'll need to change the width of columns in CSS too.
diff --git a/templates/CRM/common/enableDisableApi.tpl b/templates/CRM/common/enableDisableApi.tpl
index 29462f0578..838e39c4e9 100644
--- a/templates/CRM/common/enableDisableApi.tpl
+++ b/templates/CRM/common/enableDisableApi.tpl
@@ -26,7 +26,7 @@
 {* handle common enable/disable actions *}
 {literal}
 <script type="text/javascript">
-  cj(function($) {
+  CRM.$(function($) {
     var $row, $table, info, enabled, fieldLabel;
 
     function successMsg() {
diff --git a/templates/CRM/common/formNavigate.tpl b/templates/CRM/common/formNavigate.tpl
index 4e4662b824..7c28ceaca8 100644
--- a/templates/CRM/common/formNavigate.tpl
+++ b/templates/CRM/common/formNavigate.tpl
@@ -26,7 +26,7 @@
 {* Include this file in any form where we want to alert user if they've added or change form data, and then navigate away. *}
 {literal}
 <script type="text/javascript">
-     cj( function( ) {
+     CRM.$(function($) {
          cj("#{/literal}{$form.formName}{literal}").FormNavigate("{/literal}{ts escape='js'}You have unsaved changes.{/ts}{literal}"); 
      });
 </script>
diff --git a/templates/CRM/common/highLightImport.tpl b/templates/CRM/common/highLightImport.tpl
index 3aefdcd56d..5aebfb5e1c 100644
--- a/templates/CRM/common/highLightImport.tpl
+++ b/templates/CRM/common/highLightImport.tpl
@@ -25,7 +25,7 @@
 *}
 {* Highlight the required field during import (included within a <script>)*}
 {literal}
-cj(function($) {
+CRM.$(function($) {
   var highlightedFields = ["{/literal}{'","'|implode:$highlightedFields}{literal}"];
   $.each(highlightedFields, function() {
     $('select[id^="mapper"][id$="_0"] option[value='+ this + ']').append(' *').css({"color":"#FF0000"});
diff --git a/templates/CRM/common/jcalendar.tpl b/templates/CRM/common/jcalendar.tpl
index 42d95f09ca..75a3445ef5 100644
--- a/templates/CRM/common/jcalendar.tpl
+++ b/templates/CRM/common/jcalendar.tpl
@@ -69,7 +69,7 @@
 
 <script type="text/javascript">
     {literal}
-    cj( function() {
+    CRM.$(function($) {
       {/literal}
       var element_date   = "#{$displayDate}";
       var element_time  = "#{$elementId}_time";
diff --git a/templates/CRM/common/jsortable.tpl b/templates/CRM/common/jsortable.tpl
index b8337cbf89..e85f18d851 100644
--- a/templates/CRM/common/jsortable.tpl
+++ b/templates/CRM/common/jsortable.tpl
@@ -25,7 +25,7 @@
 *}
 {literal}
 <script type="text/javascript">
-cj( function( ) {
+CRM.$(function($) {
 // for date sorting see http://wiki.civicrm.org/confluence/display/CRMDOC/Sorting+Date+Fields+in+dataTables+Widget
 var useAjax = {/literal}{if $useAjax}1{else}0{/if}{literal};
 var sortEnabled = true;
diff --git a/templates/CRM/common/pager.tpl b/templates/CRM/common/pager.tpl
index 4a36399bc1..83edc911f5 100644
--- a/templates/CRM/common/pager.tpl
+++ b/templates/CRM/common/pager.tpl
@@ -57,7 +57,7 @@
     {if $location neq 'top'}
       <script type="text/javascript">
         {literal}
-        cj(function($) {
+        CRM.$(function($) {
           {/literal}
           var
             $form = $('#{$form.formName}'),
diff --git a/templates/CRM/common/paymentBlock.tpl b/templates/CRM/common/paymentBlock.tpl
index b8cc72de89..8cb3c8a32b 100644
--- a/templates/CRM/common/paymentBlock.tpl
+++ b/templates/CRM/common/paymentBlock.tpl
@@ -58,7 +58,7 @@ function buildPaymentBlock( type ) {
   cj('#billing-payment-block').html(response).trigger('crmLoad').trigger('crmFormLoad');
 }
 
-cj( function() {
+CRM.$(function($) {
     cj('.crm-group.payment_options-group').show();
 
     cj('input[name="payment_processor"]').change( function() {
diff --git a/templates/CRM/common/searchResultTasks.tpl b/templates/CRM/common/searchResultTasks.tpl
index c667beee47..c72a13646d 100644
--- a/templates/CRM/common/searchResultTasks.tpl
+++ b/templates/CRM/common/searchResultTasks.tpl
@@ -78,7 +78,7 @@
 </div>
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
   toggleTaskAction( );
   if (cj('#task option').length == 1 && !cj('#task option').val()) {
     cj('#task-section').remove();
diff --git a/templates/CRM/common/stateCountry.tpl b/templates/CRM/common/stateCountry.tpl
index c86511e465..fbea80400e 100644
--- a/templates/CRM/common/stateCountry.tpl
+++ b/templates/CRM/common/stateCountry.tpl
@@ -26,7 +26,7 @@
 {if $config->stateCountryMap}
 <script type="text/javascript">
   {literal}
-  cj(function($) {
+  CRM.$(function($) {
     function chainSelect(e) {
       var info = $(this).data('chainSelect');
       var val = info.target.val();
diff --git a/tests/phpunit/CRM/Core/RegionTest.php b/tests/phpunit/CRM/Core/RegionTest.php
index e39e7a22e9..2b50586f83 100644
--- a/tests/phpunit/CRM/Core/RegionTest.php
+++ b/tests/phpunit/CRM/Core/RegionTest.php
@@ -111,7 +111,7 @@ class CRM_Core_RegionTest extends CiviUnitTestCase {
       . "callback-return<br/>"
       . "<script type=\"text/javascript\" src=\"/foo%20bar.js\">\n</script>\n"
       . "<script type=\"text/javascript\">\nalert(\"hi\");\n</script>\n"
-      . "<script type=\"text/javascript\">\ncj(function(\$){\n\$(\"div\");\n});\n</script>\n"
+      . "<script type=\"text/javascript\">\nCRM.\$(function(\$) {\n\$(\"div\");\n});\n</script>\n"
       . "<link href=\"/foo%20bar.css\" rel=\"stylesheet\" type=\"text/css\"/>\n"
       . "<style type=\"text/css\">\nbody { background: black; }\n</style>\n"
       ;
diff --git a/tools/extensions/org.civicrm.search.activity/templates/ActivitySearch.tpl b/tools/extensions/org.civicrm.search.activity/templates/ActivitySearch.tpl
index 4c3391c55a..473ca8b47a 100644
--- a/tools/extensions/org.civicrm.search.activity/templates/ActivitySearch.tpl
+++ b/tools/extensions/org.civicrm.search.activity/templates/ActivitySearch.tpl
@@ -142,7 +142,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-cj(function() {
+CRM.$(function($) {
    cj().crmaccordions(); 
 });
 </script>
-- 
2.25.1