diff --git a/racket/src/racket/src/optimize.c b/racket/src/racket/src/optimize.c
index 8f4fb46135..cec1f0818d 100644
--- a/racket/src/racket/src/optimize.c
+++ b/racket/src/racket/src/optimize.c
@@ -3040,11 +3040,11 @@ static int is_nonsaving_primitive(Scheme_Object *rator, int n)
   return 0;
 }
 
-static int is_allways_escaping_primitive(Scheme_Object *rator)
+static int is_always_escaping_primitive(Scheme_Object *rator)
 {
   if (SCHEME_PRIMP(rator)
       && (SCHEME_PRIM_PROC_OPT_FLAGS(rator) & SCHEME_PRIM_ALWAYS_ESCAPES)) {
-        return 1;
+    return 1;
   }
   return 0;
 }
@@ -3935,7 +3935,7 @@ static Scheme_Object *finish_optimize_any_application(Scheme_Object *app, Scheme
   if (SAME_OBJ(rator, scheme_void_proc))
     return make_discarding_sequence(app, scheme_void, info);
   
-  if (is_allways_escaping_primitive(rator)) {
+  if (is_always_escaping_primitive(rator)) {
     info->escapes = 1;
   }
 
diff --git a/racket/src/racket/src/sfs.c b/racket/src/racket/src/sfs.c
index 7dd2a42678..2a99b7c03f 100644
--- a/racket/src/racket/src/sfs.c
+++ b/racket/src/racket/src/sfs.c
@@ -1185,7 +1185,7 @@ static Scheme_Object *begin_for_syntax_sfs(Scheme_Object *data, SFS_Info *info)
 /*                             closures                                   */
 /*========================================================================*/
 
-static Scheme_Object *sfs_closure(Scheme_Object *expr, SFS_Info *info, int self_pos)
+static Scheme_Object *sfs_lambda(Scheme_Object *expr, SFS_Info *info, int self_pos)
 {
   Scheme_Lambda *data = (Scheme_Lambda *)expr;
   Scheme_Object *code;
@@ -1422,7 +1422,7 @@ Scheme_Object *scheme_sfs_expr(Scheme_Object *expr, SFS_Info *info, int closure_
     expr = sfs_wcm(expr, info);
     break;
   case scheme_lambda_type:
-    expr = sfs_closure(expr, info, closure_self_pos);
+    expr = sfs_lambda(expr, info, closure_self_pos);
     break;
   case scheme_let_value_type:
     expr = sfs_let_value(expr, info);
@@ -1441,7 +1441,7 @@ Scheme_Object *scheme_sfs_expr(Scheme_Object *expr, SFS_Info *info, int closure_
       Scheme_Closure *c = (Scheme_Closure *)expr;
       if (ZERO_SIZED_CLOSUREP(c)) {
         Scheme_Object *code;
-	code = sfs_closure((Scheme_Object *)c->code, info, closure_self_pos);
+	code = sfs_lambda((Scheme_Object *)c->code, info, closure_self_pos);
         if (SAME_TYPE(SCHEME_TYPE(code), scheme_begin0_sequence_type))  {
           Scheme_Sequence *seq = (Scheme_Sequence *)code;
           c->code = (Scheme_Lambda *)seq->array[0];