diff --git a/extension/AMBuilder b/extension/AMBuilder
index c539682..7f4569e 100644
--- a/extension/AMBuilder
+++ b/extension/AMBuilder
@@ -69,7 +69,7 @@ def BuildExtension():
 			binary.AddObjectFiles(['libbreakpad_client.a'])
 
 	elif AMBuild.target['platform'] in ['windows']:
-		libs = ['exception_handler', 'common', 'crash_generation_server']
+		libs = ['exception_handler', 'common', 'crash_generation_client']
 		for lib in libs:
 			path = os.path.join(AMBuild.sourceFolder, 'google-breakpad', 'src', 'client', 'windows', 'handler', 'Release', 'lib', lib + '.lib')
 			if os.path.isfile(path):
diff --git a/google-breakpad/src/client/windows/handler/exception_handler.gyp b/google-breakpad/src/client/windows/handler/exception_handler.gyp
index c573327..6965093 100644
--- a/google-breakpad/src/client/windows/handler/exception_handler.gyp
+++ b/google-breakpad/src/client/windows/handler/exception_handler.gyp
@@ -40,7 +40,7 @@
       ],
       'dependencies': [
         '../breakpad_client.gyp:common',
-        '../crash_generation/crash_generation.gyp:crash_generation_server',
+        '../crash_generation/crash_generation.gyp:crash_generation_client',
       ]
     },
   ],