diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f31e43a3d4..3300cda3f8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-06  Doug Evans  <xdje42@gmail.com>
+
+	* symtab.c (lookup_symbol_in_block): Renamed from
+	lookup_symbol_aux_block.  All callers updated.
+
 2014-11-06  Doug Evans  <xdje42@gmail.com>
 
 	* symtab.c (lookup_static_symbol): Renamed from
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index 76ffee231d..898fb5a7d9 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -628,7 +628,7 @@ lookup_symbol_file (const char *name,
       const struct block *global_block = block_global_block (block);
       
       if (global_block != NULL)
-	sym = lookup_symbol_aux_block (name, global_block, domain);
+	sym = lookup_symbol_in_block (name, global_block, domain);
     }
   else
     {
diff --git a/gdb/symtab.c b/gdb/symtab.c
index f6c307995e..3c2e2779b5 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -1515,7 +1515,7 @@ lookup_symbol_aux_local (const char *name, const struct block *block,
 
   while (block != static_block)
     {
-      sym = lookup_symbol_aux_block (name, block, domain);
+      sym = lookup_symbol_in_block (name, block, domain);
       if (sym != NULL)
 	return sym;
 
@@ -1567,8 +1567,8 @@ lookup_objfile_from_block (const struct block *block)
 /* See symtab.h.  */
 
 struct symbol *
-lookup_symbol_aux_block (const char *name, const struct block *block,
-			 const domain_enum domain)
+lookup_symbol_in_block (const char *name, const struct block *block,
+			const domain_enum domain)
 {
   struct symbol *sym;
 
@@ -1808,7 +1808,7 @@ lookup_symbol_in_static_block (const char *name,
   const struct block *static_block = block_static_block (block);
 
   if (static_block != NULL)
-    return lookup_symbol_aux_block (name, static_block, domain);
+    return lookup_symbol_in_block (name, static_block, domain);
   else
     return NULL;
 }
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 1d95258630..5564dbe6cc 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -1104,13 +1104,13 @@ extern struct symbol *lookup_symbol_global (const char *name,
 					    const struct block *block,
 					    const domain_enum domain);
 
-/* Lookup a symbol within the block BLOCK.
+/* Lookup a symbol in block BLOCK.
    Upon success sets BLOCK_FOUND and fixes up the symbol's section
    if necessary.  */
 
-extern struct symbol *lookup_symbol_aux_block (const char *name,
-					       const struct block *block,
-					       const domain_enum domain);
+extern struct symbol *lookup_symbol_in_block (const char *name,
+					      const struct block *block,
+					      const domain_enum domain);
 
 /* Look up the `this' symbol for LANG in BLOCK.  Return the symbol if
    found, or NULL if not found.  */