 	(*pjs-kernel-functions-present*
 	 (progn (setq *pjs-kernel-functions-present* (when (fi::lep-open-connection-p) (fi:eval-in-lisp "(if (fboundp 'jvs::list-all-js-functions) t nil)")))
 		(when *pjs-kernel-functions-present*
-		  (setq *pjs-kernel-functions-cache* (format "\\(%s\\)" (js--regexp-opt-symbol (when (fi::lep-open-connection-p) (fi:eval-in-lisp "(jvs::list-all-js-functions)"))))))
+		  (setq *pjs-kernel-functions-cache* (format "\\(\\(?:plw\\)?\\.%s\\)" (js--regexp-opt-symbol (when (fi::lep-open-connection-p) (fi:eval-in-lisp "(jvs::list-all-js-functions)"))))))
 		*pjs-kernel-functions-cache*))
 	(t
 	 nil)))
 
-(defun search-kernel-functions (end)
+(defun search-pjs-kernel-functions (end)
   (when (list-pjs-kernel-functions)
     (let ((search-pattern (list-pjs-kernel-functions)))
       (re-search-forward search-pattern end t))))

  (push (list 'search-buffer-functions 1 font-lock-function-name-face) font-locks)

  ;; Kernel functions
  (push (cons 'search-kernel-functions pjs-kernel-functions-face) font-locks)
  (push (list 'search-kernel-functions 1 pjs-kernel-functions-face) font-locks)

  ;; Variables in the function 
  (push (cons 'search-function-local-vars font-lock-variable-name-face) font-locks)

  ;; Global vars
  (push (cons 'search-global-vars font-lock-variable-name-face) font-locks)
  
  ;; Variable definitions with type
  (push (list *pjs-vars-with-type-regexp* 1 font-lock-type-face) font-locks)
  (push (list *pjs-vars-with-type-regexp* 2 pjs-var-definition-face) font-locks)

  ;; variable definition without type
  (push (list *pjs-vars-no-type-regexp* 1 pjs-var-definition-face) font-locks)

  ;; var in with type
  (push (list *pjs-var-in-with-type-regexp* 1 font-lock-type-face) font-locks)
  (push (list *pjs-var-in-with-type-regexp* 2 pjs-var-definition-face) font-locks)
  (push (list *pjs-var-in-with-type-regexp* 3 font-lock-keyword-face) font-locks)

  ;; var in without type
  (push (list *pjs-var-in-no-type-regexp* 1 pjs-var-definition-face) font-locks)
  (push (list *pjs-var-in-no-type-regexp* 2 font-lock-keyword-face) font-locks)  

  ;; class definitions
  (push (list *pjs-class-definition* 1 font-lock-type-face) font-locks)
