diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c8dc55d1ad2..7516acca09c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-01  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* dwarf2out.c (dwarf2out_init, dwarf2out_finish): Change parameter
+	name from input_filename.
+
 2003-04-30  Eric Christopher  <echristo@redhat.com>
 	    Richard Sandiford <rsandifo@redhat.com>
 
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 4a7b825d621..6338f99a7d1 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -12761,8 +12761,8 @@ dwarf2out_undef (lineno, buffer)
 /* Set up for Dwarf output at the start of compilation.  */
 
 static void
-dwarf2out_init (input_filename)
-     const char *input_filename ATTRIBUTE_UNUSED;
+dwarf2out_init (filename)
+     const char *filename ATTRIBUTE_UNUSED;
 {
   init_file_table ();
 
@@ -13068,16 +13068,16 @@ prune_unused_types ()
    and generate the DWARF-2 debugging info.  */
 
 static void
-dwarf2out_finish (input_filename)
-     const char *input_filename;
+dwarf2out_finish (filename)
+     const char *filename;
 {
   limbo_die_node *node, *next_node;
   dw_die_ref die = 0;
 
   /* Add the name for the main input file now.  We delayed this from
      dwarf2out_init to avoid complications with PCH.  */
-  add_name_attribute (comp_unit_die, input_filename);
-  if (input_filename[0] != DIR_SEPARATOR)
+  add_name_attribute (comp_unit_die, filename);
+  if (filename[0] != DIR_SEPARATOR)
     add_comp_dir_attribute (comp_unit_die);
   else if (get_AT (comp_unit_die, DW_AT_comp_dir) == NULL)
     {
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 2df580cd906..a44948f724f 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-01  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* ste.c (struct gbe_block): Rename field from input_filename.
+	(ffeste_start_block_, ffeste_start_stmt_): Likewise.
+
 2003-04-17  Roger Sayle  <roger@eyesopen.com>
 
 	PR c/10375
diff --git a/gcc/f/ste.c b/gcc/f/ste.c
index a1f355b7b17..ed94ae35174 100644
--- a/gcc/f/ste.c
+++ b/gcc/f/ste.c
@@ -388,7 +388,7 @@ typedef struct gbe_block
   struct gbe_block *outer;
   ffestw block;
   int lineno;
-  const char *input_filename;
+  const char *filename;
   bool is_stmt;
 } *gbe_block;
 
@@ -402,7 +402,7 @@ ffeste_start_block_ (ffestw block)
   b->outer = ffeste_top_block_;
   b->block = block;
   b->lineno = lineno;
-  b->input_filename = input_filename;
+  b->filename = input_filename;
   b->is_stmt = FALSE;
 
   ffeste_top_block_ = b;
@@ -444,7 +444,7 @@ ffeste_start_stmt_(void)
   b->outer = ffeste_top_block_;
   b->block = NULL;
   b->lineno = lineno;
-  b->input_filename = input_filename;
+  b->filename = input_filename;
   b->is_stmt = TRUE;
 
   ffeste_top_block_ = b;