diff --git a/api/src/Html.php b/api/src/Html.php
index 3558e4fb4c..cc5fecea07 100644
--- a/api/src/Html.php
+++ b/api/src/Html.php
@@ -214,7 +214,7 @@ class Html
 		if($enhanced) {
 			Framework::includeJS('/api/js/jquery/chosen/chosen.jquery.js');
 			Framework::includeCSS('/api/js/jquery/chosen/chosen.css',null,false);
-			$out .= "<script>var lab = egw_LAB || \$LAB; lab.wait(function() {\$j(function() {if(\$j().chosen) \$j('select[name=\"$name\"]').chosen({width: '100%'});});})</script>\n";
+			$out .= "<script>var lab = egw_LAB || \$LAB; lab.wait(function() {\jQuery(function() {if(\jQuery().chosen) \jQuery('select[name=\"$name\"]').chosen({width: '100%'});});})</script>\n";
 		}
 		return $out;
 	}
diff --git a/api/src/Json/Msg.php b/api/src/Json/Msg.php
index bd7810501e..4d0b9d2d75 100644
--- a/api/src/Json/Msg.php
+++ b/api/src/Json/Msg.php
@@ -104,7 +104,7 @@ abstract class Msg
 	}
 
 	/**
-	 * Allows to call a jquery function on a selector with given parameters: $j($selector).$func($parmeters)
+	 * Allows to call a jquery function on a selector with given parameters: jQuery($selector).$func($parmeters)
 	 *
 	 * @param string $selector jquery selector
 	 * @param string $method name of the jquery to call
diff --git a/calendar/sitemgr/class.module_calendar_planner.inc.php b/calendar/sitemgr/class.module_calendar_planner.inc.php
index f5db38798b..a5461403c1 100644
--- a/calendar/sitemgr/class.module_calendar_planner.inc.php
+++ b/calendar/sitemgr/class.module_calendar_planner.inc.php
@@ -336,7 +336,7 @@ class module_calendar_planner extends Module
 			$tmpl->exec(__METHOD__, $content,$sel_options, array('__ALL__' => true),array(),2);
 			$html .= ob_get_contents();
 			$html .= '<script>'
-			. '	window.egw_LAB.wait(function() {$j(function() {'
+			. '	window.egw_LAB.wait(function() {jQuery(function() {'
 			. 'app.calendar.set_state(' . json_encode(array(
 					'owner' => $search_params['owner'],
 					'sortby' => $ui->sortby,