+2014-12-18  Doug Evans  <xdje42@gmail.com>
+
+       * language.c (language_lookup_primitive_type): Renamed from
+       language_lookup_primitive_type_by_name.  All callers updated.
+
 2014-12-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        Fix MinGW compilation.
 
 find_primitive_type (struct parser_state *par_state, char *name)
 {
   struct type *type;
-  type = language_lookup_primitive_type_by_name (parse_language (par_state),
-                                                parse_gdbarch (par_state),
-                                                name);
+  type = language_lookup_primitive_type (parse_language (par_state),
+                                        parse_gdbarch (par_state),
+                                        name);
   if (type == NULL && strcmp ("system__address", name) == 0)
     type = type_system_address (par_state);
 
 type_system_address (struct parser_state *par_state)
 {
   struct type *type 
-    = language_lookup_primitive_type_by_name (parse_language (par_state),
-                                             parse_gdbarch (par_state),
-                                             "system__address");
+    = language_lookup_primitive_type (parse_language (par_state),
+                                     parse_gdbarch (par_state),
+                                     "system__address");
   return  type != NULL ? type : parse_type (par_state)->builtin_data_ptr;
 }
 
 
     }
 
   yylval.tsym.type
-    = language_lookup_primitive_type_by_name (parse_language (par_state),
-                                             parse_gdbarch (par_state),
-                                             copy);
+    = language_lookup_primitive_type (parse_language (par_state),
+                                     parse_gdbarch (par_state),
+                                     copy);
   if (yylval.tsym.type != NULL)
     return TYPENAME;
 
 
     return DOLLAR_VARIABLE;
 
   yylval.tsym.type
-    = language_lookup_primitive_type_by_name (parse_language (pstate),
-                                             parse_gdbarch (pstate), copy);
+    = language_lookup_primitive_type (parse_language (pstate),
+                                     parse_gdbarch (pstate), copy);
   if (yylval.tsym.type != NULL)
     return TYPENAME;
 
 
       }
 
     yylval.tsym.type
-      = language_lookup_primitive_type_by_name (parse_language (pstate),
-                                               parse_gdbarch (pstate), tmp);
+      = language_lookup_primitive_type (parse_language (pstate),
+                                       parse_gdbarch (pstate), tmp);
     if (yylval.tsym.type != NULL)
       return TYPENAME;
     
 
   if (sym != NULL && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
     return SYMBOL_TYPE (sym);
 
-  type = language_lookup_primitive_type_by_name (language, gdbarch, name);
+  type = language_lookup_primitive_type (language, gdbarch, name);
   if (type)
     return type;
 
 
   copy = copy_name (yylval.sval);
 
   /* Try primitive types first so they win over bad/weird debug info.  */
-  type = language_lookup_primitive_type_by_name (parse_language (par_state),
-                                                parse_gdbarch (par_state),
-                                                copy);
+  type = language_lookup_primitive_type (parse_language (par_state),
+                                        parse_gdbarch (par_state),
+                                        copy);
   if (type != NULL)
     {
       /* NOTE: We take advantage of the fact that yylval coming in was a
 
 }
 
 struct type *
-language_lookup_primitive_type_by_name (const struct language_defn *la,
-                                       struct gdbarch *gdbarch,
-                                       const char *name)
+language_lookup_primitive_type (const struct language_defn *la,
+                               struct gdbarch *gdbarch,
+                               const char *name)
 {
   struct language_gdbarch *ld = gdbarch_data (gdbarch,
                                              language_gdbarch_data);
   if (symbol_lookup_debug)
     {
       fprintf_unfiltered (gdb_stdlog,
-                         "language_lookup_primitive_type_by_name"
-                         " (%s, %s, %s)",
+                         "language_lookup_primitive_type (%s, %s, %s)",
                          la->la_name, host_address_to_string (gdbarch), name);
     }
 
 
 struct type *language_string_char_type (const struct language_defn *l,
                                        struct gdbarch *gdbarch);
 
-struct type *language_lookup_primitive_type_by_name (const struct language_defn *l,
-                                                    struct gdbarch *gdbarch,
-                                                    const char *name);
+struct type *language_lookup_primitive_type (const struct language_defn *l,
+                                            struct gdbarch *gdbarch,
+                                            const char *name);
 
 \f
 /* These macros define the behaviour of the expression 
 
          return TYPENAME;
         }
     yylval.tsym.type
-      = language_lookup_primitive_type_by_name (parse_language (pstate),
-                                               parse_gdbarch (pstate), tmp);
+      = language_lookup_primitive_type (parse_language (pstate),
+                                       parse_gdbarch (pstate), tmp);
     if (yylval.tsym.type != NULL)
       {
        free (uptokstart);