diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog
index cb8df1cba..742db1ba4 100644
--- a/include/gdb/ChangeLog
+++ b/include/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-24  Pedro Alves  <palves@redhat.com>
+
+	PR gdb/7205
+
+	Replace target_signal with gdb_signal throughout.
+
 2012-04-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* callback.h (CB_SYS_argc, CB_SYS_argnlen, CB_SYS_argn): Define.
diff --git a/include/gdb/callback.h b/include/gdb/callback.h
index 5c0d2db74..d8d14727d 100644
--- a/include/gdb/callback.h
+++ b/include/gdb/callback.h
@@ -314,7 +314,7 @@ int cb_target_to_host_open (host_callback *, int);
 int cb_target_to_host_signal (host_callback *, int);
 
 /* Translate host signal number to target.  */
-int cb_host_to_target_signal (host_callback *, int);
+int cb_host_to_gdb_signal (host_callback *, int);
 
 /* Translate host stat struct to target.
    If stat struct ptr is NULL, just compute target stat struct size.
diff --git a/include/gdb/signals.h b/include/gdb/signals.h
index 67902c617..a59d3b5c6 100644
--- a/include/gdb/signals.h
+++ b/include/gdb/signals.h
@@ -45,9 +45,9 @@
    etc. are doing to address these issues.  */
 
 /* For an explanation of what each signal means, see
-   target_signal_to_string.  */
+   gdb_signal_to_string.  */
 
-enum target_signal
+enum gdb_signal
   {
 #define SET(symbol, constant, name, string) \
     symbol = constant,