diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5cd551a4ef..0bf350c255 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2018-05-25  Tom Tromey	<tom@tromey.com>
+
+	* interps.c (interp_name): Remove.
+	* mi/mi-interp.c (mi_interp::init): Update.
+	* interps.h (interp_name): Remove.
+	(~scoped_restore_interp): Update.
+	* tui/tui.c (tui_enable): Update.
+
 2018-05-25  Tom Tromey	<tom@tromey.com>
 
 	* utils.c (fputs_maybe_filtered): Update.
diff --git a/gdb/interps.c b/gdb/interps.c
index 5884625856..8ec9744fdf 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -274,14 +274,6 @@ scoped_restore_interp::set_interp (const char *name)
   return old_interp;
 }
 
-/* Returns the interpreter's name.  */
-
-const char *
-interp_name (struct interp *interp)
-{
-  return interp->name;
-}
-
 /* Returns true if the current interp is the passed in name.  */
 int
 current_interp_named_p (const char *interp_name)
diff --git a/gdb/interps.h b/gdb/interps.h
index 694149a6ca..a689be5625 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -98,8 +98,6 @@ extern struct interp *interp_lookup (struct ui *ui, const char *name);
    interpreter fails to initialize.  */
 extern void set_top_level_interpreter (const char *name);
 
-extern const char *interp_name (struct interp *interp);
-
 /* Temporarily set the current interpreter, and reset it on
    destruction.  */
 class scoped_restore_interp
@@ -113,7 +111,7 @@ public:
 
   ~scoped_restore_interp ()
   {
-    set_interp (interp_name (m_interp));
+    set_interp (m_interp->name);
   }
 
   scoped_restore_interp (const scoped_restore_interp &) = delete;
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 99ce1eb5d6..e52d797973 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -113,7 +113,6 @@ void
 mi_interp::init (bool top_level)
 {
   mi_interp *mi = this;
-  const char *name;
   int mi_version;
 
   /* Store the current output channel, so that we can create a console
@@ -129,7 +128,6 @@ mi_interp::init (bool top_level)
   mi->targ = new mi_console_file (mi->raw_stdout, "@", '"');
   mi->event_channel = new mi_console_file (mi->raw_stdout, "=", 0);
 
-  name = interp_name (this);
   /* INTERP_MI selects the most recent released version.  "mi2" was
      released as part of GDB 6.0.  */
   if (strcmp (name, INTERP_MI) == 0)
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 7943a61676..9e2520b4fc 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -415,7 +415,7 @@ tui_enable (void)
 
       /* If the top level interpreter is not the console/tui (e.g.,
 	 MI), enabling curses will certainly lose.  */
-      interp = interp_name (top_level_interpreter ());
+      interp = top_level_interpreter ()->name;
       if (strcmp (interp, INTERP_TUI) != 0)
 	error (_("Cannot enable the TUI when the interpreter is '%s'"), interp);