diff --git a/gdb/disasm.c b/gdb/disasm.c
index b2e795d5c69..512edcf4cc3 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -1150,7 +1150,7 @@ gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout,
   int nlines = -1;
 
   /* Assume symtab is valid for whole PC range.  */
-  symtab = find_pc_line_symtab (low);
+  symtab = find_symtab_for_pc (low);
 
   if (symtab != NULL && symtab->linetable () != NULL)
     nlines = symtab->linetable ()->nitems;
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index cc9365d2fa1..be3a3955974 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -709,7 +709,7 @@ btrace_find_line_range (CORE_ADDR pc)
   struct symtab *symtab;
   int nlines, i;
 
-  symtab = find_pc_line_symtab (pc);
+  symtab = find_symtab_for_pc (pc);
   if (symtab == NULL)
     return btrace_mk_line_range (NULL, 0, 0);
 
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 2ad3620c9f2..78c44e89948 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -447,7 +447,7 @@ maintenance_print_symbols (const char *args, int from_tty)
   if (address_arg != NULL)
     {
       CORE_ADDR pc = parse_and_eval_address (address_arg);
-      struct symtab *s = find_pc_line_symtab (pc);
+      struct symtab *s = find_symtab_for_pc (pc);
 
       if (s == NULL)
 	error (_("No symtab for address: %s"), address_arg);
diff --git a/gdb/symtab.c b/gdb/symtab.c
index fab16f7ad48..bb17276102f 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -3246,7 +3246,7 @@ find_line_range_start (CORE_ADDR pc)
 /* See symtab.h.  */
 
 struct symtab *
-find_pc_line_symtab (CORE_ADDR pc)
+find_symtab_for_pc (CORE_ADDR pc)
 {
   struct symtab_and_line sal;
 
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 6e828328062..3a2088cb6af 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -2430,7 +2430,7 @@ extern std::optional<CORE_ADDR> find_line_range_start (CORE_ADDR pc);
 
 /* Wrapper around find_sal_for_pc to just return the symtab.  */
 
-extern struct symtab *find_pc_line_symtab (CORE_ADDR);
+extern struct symtab *find_symtab_for_pc (CORE_ADDR);
 
 /* Given a symtab and line number, return the pc there.  */
 
diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index e2dff84a5d5..9485ad96002 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -157,7 +157,7 @@ tui_source_window::do_scroll_vertical (int num_to_scroll)
       if (cursal.symtab == NULL)
 	{
 	  frame_info_ptr fi = get_selected_frame (NULL);
-	  s = find_pc_line_symtab (get_frame_pc (fi));
+	  s = find_symtab_for_pc (get_frame_pc (fi));
 	  arch = get_frame_arch (fi);
 	}
       else
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index e66c4596586..27f682b7ea8 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -55,7 +55,7 @@ tui_display_main ()
 	  tui_batch_rendering defer;
 
 	  tui_update_source_windows_with_addr (gdbarch, addr);
-	  struct symtab *s = find_pc_line_symtab (addr);
+	  struct symtab *s = find_symtab_for_pc (addr);
 	  tui_location.set_location (s);
 	}
     }