diff --git a/libguile/goops.h b/libguile/goops.h
index d34fa5041..84f67b4e9 100644
--- a/libguile/goops.h
+++ b/libguile/goops.h
@@ -188,7 +188,7 @@ SCM scm_oldfmt (SCM);
 char *scm_c_oldfmt0 (char *);
 char *scm_c_oldfmt (char *, int n);
 void scm_load_goops (void);
-SCM scm_make_foreign_object (SCM class, SCM initargs);
+SCM scm_make_foreign_object (SCM cls, SCM initargs);
 SCM scm_make_class (SCM meta, char *s_name, SCM supers, size_t size,
 		    void * (*constructor) (SCM initargs),
 		    size_t (*destructor) (void *));
@@ -245,15 +245,15 @@ SCM scm_method_procedure (SCM obj);
 SCM scm_accessor_method_slot_definition (SCM obj); 
 SCM scm_sys_fast_slot_ref (SCM obj, SCM index); 
 SCM scm_sys_fast_slot_set_x (SCM obj, SCM index, SCM value); 
-SCM scm_slot_ref_using_class (SCM class, SCM obj, SCM slot_name); 
-SCM scm_slot_set_using_class_x (SCM class, SCM obj, SCM slot_name, SCM value); 
-SCM scm_slot_bound_using_class_p (SCM class, SCM obj, SCM slot_name); 
-SCM scm_slot_exists_using_class_p (SCM class, SCM obj, SCM slot_name); 
+SCM scm_slot_ref_using_class (SCM cls, SCM obj, SCM slot_name); 
+SCM scm_slot_set_using_class_x (SCM cls, SCM obj, SCM slot_name, SCM value); 
+SCM scm_slot_bound_using_class_p (SCM cls, SCM obj, SCM slot_name); 
+SCM scm_slot_exists_using_class_p (SCM cls, SCM obj, SCM slot_name); 
 SCM scm_slot_bound_p (SCM obj, SCM slot_name); 
 SCM scm_slots_exists_p (SCM obj, SCM slot_name); 
-SCM scm_sys_modify_instance (SCM old, SCM new); 
-SCM scm_sys_modify_class (SCM old, SCM new); 
-SCM scm_sys_invalidate_class (SCM class);
+SCM scm_sys_modify_instance (SCM old, SCM newinst); 
+SCM scm_sys_modify_class (SCM old, SCM newcls);
+SCM scm_sys_invalidate_class (SCM cls);
 SCM scm_make_method_cache (SCM gf);
 SCM scm_sys_invalidate_method_cache_x (SCM gf);
 SCM scm_generic_capability_p (SCM proc);