diff --git a/libguile/stacks.c b/libguile/stacks.c
index 1eb4e565f..40494ff67 100644
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@@ -188,7 +188,7 @@ stack_depth (scm_debug_frame *dframe,long offset,SCM *id,int *maxp)
 static void
 read_frame (scm_debug_frame *dframe,long offset,scm_info_frame *iframe)
 {
-  SCMWORD flags = SCM_BITS (SCM_INUM0); /* UGh. */
+  scm_bits_t flags = SCM_BITS (SCM_INUM0); /* UGh. */
   int size;
   scm_debug_info *info;
   if (SCM_EVALFRAMEP (*dframe))
diff --git a/libguile/stacks.h b/libguile/stacks.h
index 813b793c3..1bf39b9e4 100644
--- a/libguile/stacks.h
+++ b/libguile/stacks.h
@@ -57,7 +57,7 @@
 
 typedef struct scm_info_frame {
   //SCM flags;
-  SCMWORD flags;
+  scm_bits_t flags;
   SCM source;
   SCM proc;
   SCM args;
diff --git a/libguile/struct.c b/libguile/struct.c
index 7c59a409d..d6d2ea02d 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -326,7 +326,7 @@ scm_alloc_struct (int n_words, int n_extra, char *who)
   SCM *p = block + n_extra;
 
   /* Adjust it even further so it's aligned on an eight-byte boundary.  */
-  p = (SCM *) (((SCMWORD) SCM_BITS (p) + 7) & ~7);
+  p = (SCM *) (((scm_bits_t) SCM_BITS (p) + 7) & ~7);
 
   /* Initialize a few fields as described above.  */
   p[scm_struct_i_free] = (SCM) scm_struct_free_standard;
@@ -522,7 +522,7 @@ SCM_DEFINE (scm_struct_ref, "struct-ref", 2, 0, 0,
   SCM * data;
   SCM layout;
   int p;
-  SCMWORD n_fields;
+  scm_bits_t n_fields;
   unsigned char * fields_desc;
   unsigned char field_type = 0;
   
diff --git a/libguile/tags.h b/libguile/tags.h
index a423e8510..dc416a98b 100644
--- a/libguile/tags.h
+++ b/libguile/tags.h
@@ -57,19 +57,19 @@
 
 /* In the beginning was the Word:
  */
-typedef long SCMWORD;
+typedef long scm_bits_t;
 /*
   But as external interface, we use void*, which will be checked more strictly for
   dubious conversions.
  */
 #define SCM_VOIDP_TEST
 #ifndef SCM_VOIDP_TEST
-typedef SCMWORD  SCM;
+typedef scm_bits_t  SCM;
 #define SCM_BITS(x) (x)
 #define SCM_SCM(x) (x)
 #else
 typedef void * SCM;
-#define SCM_BITS(x) ((SCMWORD) (x))
+#define SCM_BITS(x) ((scm_bits_t) (x))
 #define SCM_SCM(x) ((SCM) (x))
 #endif
 
@@ -303,7 +303,7 @@ typedef void * SCM;
 
 
 #define SCM_CELLP(x) 	(!SCM_NCELLP (x))
-#define SCM_NCELLP(x) 	((sizeof (scm_cell) - 1) & (SCMWORD) SCM_BITS (x))
+#define SCM_NCELLP(x) 	((sizeof (scm_cell) - 1) & SCM_BITS (x))
 
 /* See numbers.h for macros relating to immediate integers.
  */
diff --git a/libguile/unif.c b/libguile/unif.c
index 5fcefe6e3..cf2172a79 100644
--- a/libguile/unif.c
+++ b/libguile/unif.c
@@ -2466,7 +2466,7 @@ tail:
 	  scm_putc ('*', port);
 	  for (i = 0; i < (SCM_LENGTH (exp)) / SCM_LONG_BIT; i++)
 	    {
-	      SCMWORD w = SCM_BITS (SCM_VELTS (exp)[i]);
+	      scm_bits_t w = SCM_BITS (SCM_VELTS (exp)[i]);
 	      for (j = SCM_LONG_BIT; j; j--)
 		{
 		  scm_putc (w & 1 ? '1' : '0', port);