diff --git a/src/base/SConscript b/src/base/SConscript
index 6735903..d1ebbc9 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -40,26 +40,26 @@
 Source('bmpwriter.cc')
 Source('callback.cc')
 Source('cprintf.cc', add_tags='gtest lib')
-GTest('cprintftest', 'cprintf.test.cc')
+GTest('cprintf.test', 'cprintf.test.cc')
 Source('debug.cc')
 if env['USE_FENV']:
     Source('fenv.c')
 if env['USE_PNG']:
     Source('pngwriter.cc')
 Source('fiber.cc')
-GTest('fibertest', 'fiber.test.cc', 'fiber.cc')
-GTest('coroutinetest', 'coroutine.test.cc', 'fiber.cc')
+GTest('fiber.test', 'fiber.test.cc', 'fiber.cc')
+GTest('coroutine.test', 'coroutine.test.cc', 'fiber.cc')
 Source('framebuffer.cc')
 Source('hostinfo.cc')
 Source('inet.cc')
 Source('inifile.cc')
-GTest('inifiletest', 'inifile.test.cc', 'inifile.cc', 'str.cc')
+GTest('inifile.test', 'inifile.test.cc', 'inifile.cc', 'str.cc')
 Source('intmath.cc')
 Source('logging.cc')
 Source('match.cc')
 Source('output.cc')
 Source('pixel.cc')
-GTest('pixeltest', 'pixel.test.cc', 'pixel.cc')
+GTest('pixel.test', 'pixel.test.cc', 'pixel.cc')
 Source('pollevent.cc')
 Source('random.cc')
 if env['TARGET_ISA'] != 'null':
@@ -69,7 +69,7 @@
 Source('str.cc')
 Source('time.cc')
 Source('trace.cc')
-GTest('trietest', 'trie.test.cc')
+GTest('trie.test', 'trie.test.cc')
 Source('types.cc')
 
 Source('loader/aout_object.cc')
@@ -83,10 +83,10 @@
 
 Source('stats/text.cc')
 
-GTest('addr_range_test', 'addr_range.test.cc')
-GTest('AddrRangeMapTest', 'addr_range_map.test.cc')
-GTest('bituniontest', 'bitunion.test.cc')
-GTest('CircleBufTest', 'circlebuf.test.cc')
+GTest('addr_range.test', 'addr_range.test.cc')
+GTest('addr_range_map.test', 'addr_range_map.test.cc')
+GTest('bitunion.test', 'bitunion.test.cc')
+GTest('circlebuf.test', 'circlebuf.test.cc')
 
 DebugFlag('Annotate', "State machine annotation debugging")
 DebugFlag('AnnotateQ', "State machine annotation queue debugging")