diff --git a/libguile/fports.c b/libguile/fports.c
index c52d89ffd..504f9120a 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -568,13 +568,13 @@ void
 scm_make_fptob ()
 {
   long tc = scm_make_port_type ("file", fport_fill_buffer, local_fflush);
-  scm_set_ptob_free            (tc, local_free);
-  scm_set_ptob_print           (tc, prinfport);
-  scm_set_ptob_flush_input     (tc, local_read_flush);
-  scm_set_ptob_close           (tc, local_fclose);
-  scm_set_ptob_seek            (tc, local_seek);
-  scm_set_ptob_truncate        (tc, local_ftruncate);
-  scm_set_ptob_input_waiting_p (tc, fport_input_waiting_p);
+  scm_set_port_free            (tc, local_free);
+  scm_set_port_print           (tc, prinfport);
+  scm_set_port_flush_input     (tc, local_read_flush);
+  scm_set_port_close           (tc, local_fclose);
+  scm_set_port_seek            (tc, local_seek);
+  scm_set_port_truncate        (tc, local_ftruncate);
+  scm_set_port_input_waiting_p (tc, fport_input_waiting_p);
 }
 
 void
diff --git a/libguile/ports.c b/libguile/ports.c
index 6f62a2047..a7671b7c7 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -152,44 +152,44 @@ scm_make_port_type (char *name,
 }
 
 void
-scm_set_ptob_mark (long tc, SCM (*mark) (SCM))
+scm_set_port_mark (long tc, SCM (*mark) (SCM))
 {
   scm_ptobs[SCM_TC2PTOBNUM (tc)].mark = mark;
 }
 
 void
-scm_set_ptob_free (long tc, scm_sizet (*free) (SCM))
+scm_set_port_free (long tc, scm_sizet (*free) (SCM))
 {
   scm_ptobs[SCM_TC2PTOBNUM (tc)].free = free;
 }
 
 void
-scm_set_ptob_print (long tc, int (*print) (SCM exp, SCM port,
+scm_set_port_print (long tc, int (*print) (SCM exp, SCM port,
 					   scm_print_state *pstate))
 {
   scm_ptobs[SCM_TC2PTOBNUM (tc)].print = print;
 }
 
 void
-scm_set_ptob_equalp (long tc, SCM (*equalp) (SCM, SCM))
+scm_set_port_equalp (long tc, SCM (*equalp) (SCM, SCM))
 {
   scm_ptobs[SCM_TC2PTOBNUM (tc)].equalp = equalp;
 }
 
 void
-scm_set_ptob_flush_input (long tc, void (*flush_input) (SCM port, int offset))
+scm_set_port_flush_input (long tc, void (*flush_input) (SCM port, int offset))
 {
   scm_ptobs[SCM_TC2PTOBNUM (tc)].read_flush = flush_input;
 }
 
 void
-scm_set_ptob_close (long tc, int (*close) (SCM))
+scm_set_port_close (long tc, int (*close) (SCM))
 {
   scm_ptobs[SCM_TC2PTOBNUM (tc)].fclose = close;
 }
 
 void
-scm_set_ptob_seek (long tc, off_t (*seek) (SCM port,
+scm_set_port_seek (long tc, off_t (*seek) (SCM port,
 					   off_t OFFSET,
 					   int WHENCE))
 {
@@ -197,13 +197,13 @@ scm_set_ptob_seek (long tc, off_t (*seek) (SCM port,
 }
 
 void
-scm_set_ptob_truncate (long tc, void (*truncate) (SCM port, off_t length))
+scm_set_port_truncate (long tc, void (*truncate) (SCM port, off_t length))
 {
   scm_ptobs[SCM_TC2PTOBNUM (tc)].ftruncate = truncate;
 }
 
 void
-scm_set_ptob_input_waiting_p (long tc, int (*waitingp) (SCM))
+scm_set_port_input_waiting_p (long tc, int (*waitingp) (SCM))
 {
   scm_ptobs[SCM_TC2PTOBNUM (tc)].input_waiting_p = waitingp;
 }
diff --git a/libguile/ports.h b/libguile/ports.h
index fabb44a1b..d405004a7 100644
--- a/libguile/ports.h
+++ b/libguile/ports.h
@@ -202,25 +202,25 @@ extern SCM scm_markstream SCM_P ((SCM ptr));
 extern long scm_make_port_type (char *name,
 				int (*fill_buffer) (SCM port),
 				void (*write_flush) (SCM port));
-extern void scm_set_ptob_mark (long tc, SCM (*mark) (SCM));
-extern void scm_set_ptob_free (long tc, scm_sizet (*free) (SCM));
-extern void scm_set_ptob_print (long tc,
+extern void scm_set_port_mark (long tc, SCM (*mark) (SCM));
+extern void scm_set_port_free (long tc, scm_sizet (*free) (SCM));
+extern void scm_set_port_print (long tc,
 				int (*print) (SCM exp,
 					      SCM port,
 					      scm_print_state *pstate));
-extern void scm_set_ptob_equalp (long tc, SCM (*equalp) (SCM, SCM));
-extern void scm_set_ptob_flush_input (long tc,
+extern void scm_set_port_equalp (long tc, SCM (*equalp) (SCM, SCM));
+extern void scm_set_port_flush_input (long tc,
 				      void (*flush_input) (SCM port,
 							   int offset));
-extern void scm_set_ptob_close (long tc, int (*close) (SCM));
-extern void scm_set_ptob_seek (long tc,
+extern void scm_set_port_close (long tc, int (*close) (SCM));
+extern void scm_set_port_seek (long tc,
 			       off_t (*seek) (SCM port,
 					      off_t OFFSET,
 					      int WHENCE));
-extern void scm_set_ptob_truncate (long tc,
+extern void scm_set_port_truncate (long tc,
 				   void (*truncate) (SCM port,
 						     off_t length));
-extern void scm_set_ptob_input_waiting_p (long tc, int (*waitingp) (SCM));
+extern void scm_set_port_input_waiting_p (long tc, int (*waitingp) (SCM));
 extern SCM scm_char_ready_p SCM_P ((SCM port));
 extern SCM scm_drain_input (SCM port);
 extern SCM scm_current_input_port SCM_P ((void));
diff --git a/libguile/strports.c b/libguile/strports.c
index 56b02cfe1..a410b8a87 100644
--- a/libguile/strports.c
+++ b/libguile/strports.c
@@ -357,10 +357,10 @@ void
 scm_make_stptob ()
 {
   long tc = scm_make_port_type ("string", stfill_buffer, st_flush);
-  scm_set_ptob_mark        (tc, scm_markstream);
-  scm_set_ptob_flush_input (tc, st_read_flush);
-  scm_set_ptob_seek        (tc, st_seek);
-  scm_set_ptob_truncate    (tc, st_ftruncate);
+  scm_set_port_mark        (tc, scm_markstream);
+  scm_set_port_flush_input (tc, st_read_flush);
+  scm_set_port_seek        (tc, st_seek);
+  scm_set_port_truncate    (tc, st_ftruncate);
 }
 
 void
diff --git a/libguile/vports.c b/libguile/vports.c
index 0c8fb2a1e..c63582a57 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -158,8 +158,8 @@ void
 scm_make_sfptob ()
 {
   long tc = scm_make_port_type ("soft", sf_fill_buffer, sfflush);
-  scm_set_ptob_mark (tc, scm_markstream);
-  scm_set_ptob_close (tc, sfclose);
+  scm_set_port_mark (tc, scm_markstream);
+  scm_set_port_close (tc, sfclose);
 }
 
 void