diff --git a/mps/code/ss.h b/mps/code/ss.h
index 0036f50886f..87cbf85e539 100644
--- a/mps/code/ss.h
+++ b/mps/code/ss.h
@@ -44,7 +44,7 @@ typedef struct StackContextStruct {
 
 
 /* StackContextStackTop -- return the "top" of the mutator's stack at
- * the point when the context was saved by STACK_CONTEXT_BEGIN. */
+ * the point when the context was saved by STACK_CONTEXT_SAVE. */
 
 extern Addr *StackContextStackTop(StackContext sc);
 
@@ -63,15 +63,15 @@ extern Res StackContextScan(ScanState ss, StackContext sc);
  * See _setjmp(2). */
 
 #define STACK_CONTEXT_SAVE(sc) BEGIN \
-  int _set = _setjmp((sc)->jumpBuffer); \
-  AVER(_set == 0); \
+  int _rc = _setjmp((sc)->jumpBuffer); \
+  AVER(_rc == 0); \
   END
 
 #else  /* other platforms */
 
 #define STACK_CONTEXT_SAVE(sc) BEGIN \
-  int _set = setjmp((sc)->jumpBuffer); \
-  AVER(_set == 0); \
+  int _rc = setjmp((sc)->jumpBuffer); \
+  AVER(_rc == 0); \
   END
 
 #endif /* platform defines */
diff --git a/mps/code/ssan.c b/mps/code/ssan.c
index 8f5fa47934b..00299a9d632 100644
--- a/mps/code/ssan.c
+++ b/mps/code/ssan.c
@@ -14,12 +14,12 @@ SRCID(ssan, "$Id$");
 
 
 /* StackContextStackTop -- return the "top" of the mutator's stack at
- * the point when the context was saved by STACK_CONTEXT_BEGIN.
+ * the point when the context was saved by STACK_CONTEXT_SAVE.
  *
  * .assume: This assumes that the structure pointed to by sc is
  * stack-allocated "above" the mutator's stack, and so its address is
  * a conservative approximation to the top of the mutator's stack. The
- * use of STACK_CONTEXT_BEGIN in mpsi.c assures this.
+ * use of STACK_CONTEXT_SAVE in mpsi.c assures this.
  */
 
 Addr *StackContextStackTop(StackContext sc)
diff --git a/mps/code/ssw3i3mv.c b/mps/code/ssw3i3mv.c
index 6cf6525da9d..218af5da8f5 100644
--- a/mps/code/ssw3i3mv.c
+++ b/mps/code/ssw3i3mv.c
@@ -26,7 +26,7 @@ SRCID(ssw3i3mv, "$Id$");
 
 
 /* StackContextStackTop -- return the "top" of the mutator's stack at
- * the point when the context was saved by STACK_CONTEXT_BEGIN. */
+ * the point when the context was saved by STACK_CONTEXT_SAVE. */
 
 Addr *StackContextStackTop(StackContext sc)
 {
diff --git a/mps/code/ssw3i3pc.c b/mps/code/ssw3i3pc.c
index 9b5b6a46464..6f04b286b4c 100644
--- a/mps/code/ssw3i3pc.c
+++ b/mps/code/ssw3i3pc.c
@@ -51,7 +51,7 @@ typedef struct __JUMP_BUFFER {
 
 
 /* StackContextStackTop -- return the "top" of the mutator's stack at
- * the point when the context was saved by STACK_CONTEXT_BEGIN. */
+ * the point when the context was saved by STACK_CONTEXT_SAVE. */
 
 Addr *StackContextStackTop(StackContext sc)
 {
diff --git a/mps/code/ssw3i6mv.c b/mps/code/ssw3i6mv.c
index bfc5793d5ab..0d45f86eded 100644
--- a/mps/code/ssw3i6mv.c
+++ b/mps/code/ssw3i6mv.c
@@ -33,7 +33,7 @@ SRCID(ssw3i6mv, "$Id$");
 
 
 /* StackContextStackTop -- return the "top" of the mutator's stack at
- * the point when the context was saved by STACK_CONTEXT_BEGIN. */
+ * the point when the context was saved by STACK_CONTEXT_SAVE. */
 
 Addr *StackContextStackTop(StackContext sc)
 {
diff --git a/mps/code/ssw3i6pc.c b/mps/code/ssw3i6pc.c
index adbc1a68aa0..a5342431b12 100644
--- a/mps/code/ssw3i6pc.c
+++ b/mps/code/ssw3i6pc.c
@@ -73,7 +73,7 @@ typedef struct _JUMP_BUFFER {
 
 
 /* StackContextStackTop -- return the "top" of the mutator's stack at
- * the point when the context was saved by STACK_CONTEXT_BEGIN. */
+ * the point when the context was saved by STACK_CONTEXT_SAVE. */
 
 Addr *StackContextStackTop(StackContext sc)
 {
diff --git a/mps/code/ssxci3.c b/mps/code/ssxci3.c
index a5893f31f8c..21e6db80156 100644
--- a/mps/code/ssxci3.c
+++ b/mps/code/ssxci3.c
@@ -24,7 +24,7 @@ SRCID(ssxci3, "$Id$");
 
 
 /* StackContextStackTop -- return the "top" of the mutator's stack at
- * the point when the context was saved by STACK_CONTEXT_BEGIN. */
+ * the point when the context was saved by STACK_CONTEXT_SAVE. */
 
 Addr *StackContextStackTop(StackContext sc)
 {
diff --git a/mps/code/ssxci6.c b/mps/code/ssxci6.c
index 1deb5c8153f..c8caf51baa7 100644
--- a/mps/code/ssxci6.c
+++ b/mps/code/ssxci6.c
@@ -24,7 +24,7 @@ SRCID(ssxci6, "$Id$");
 
 
 /* StackContextStackTop -- return the "top" of the mutator's stack at
- * the point when the context was saved by STACK_CONTEXT_BEGIN. */
+ * the point when the context was saved by STACK_CONTEXT_SAVE. */
 
 Addr *StackContextStackTop(StackContext sc)
 {