diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index 4434ddff79c..544ebcfddb7 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -577,7 +577,7 @@ cp_lookup_symbol_imports_or_template (const char *scope,
   if (function != NULL && function->language () == language_cplus)
     {
       /* Search the function's template parameters.  */
-      if (function->is_cplus_template_function ())
+      if (function->is_template_function ())
 	{
 	  struct template_symbol *templ
 	    = (struct template_symbol *) function;
diff --git a/gdb/symtab.h b/gdb/symtab.h
index d96b3cc1273..d5fe90a19d9 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1346,7 +1346,11 @@ struct symbol : public general_symbol_info, public allocate_on_obstack<symbol>
     m_is_inlined = is_inlined;
   }
 
-  bool is_cplus_template_function () const
+  /* Return true if this symbol is a template function.  Template
+     functions actually are of type 'template_symbol' and have extra
+     symbols (the template parameters) attached.  */
+
+  bool is_template_function () const
   {
     return this->subclass == SYMBOL_TEMPLATE;
   }
@@ -1593,7 +1597,7 @@ extern int register_symbol_register_impl (enum address_class,
 
 /* An instance of this type is used to represent a C++ template
    function.  A symbol is really of this type iff
-   symbol::is_cplus_template_function is true.  */
+   symbol::is_template_function is true.  */
 
 struct template_symbol : public symbol
 {