      '(1 font-lock-keyword-face)
      '(3 font-lock-type-face nil t))
     )
-  "LFE old style type expressions")
-
-(defconst lfe-font-lock-old-function-keywords
+  "LFE basic type definition expressions")
+
+(defconst lfe-font-lock-basic-function-keywords
   (eval-when-compile
     (list
      (concat

      "funcall" "if" "lambda"
      "let" "let-function" "letrec-function" "let-macro"
      "match-lambda" "progn" "receive" "try" "when"
      "eval-when-compile"
      ;; Base macro forms.
      "andalso" "bc" "binary-comp" "cond" "do" "flet" "flet*" "fletrec"
      "fun" "lc" "list-comp"


;;; Font locking

(defconst lfe-font-lock-basic-type-keywords
  (eval-when-compile
    (list
     (concat
