diff --git a/synth.py b/synth.py
index 9cf2acfbe..f049d1d0b 100644
--- a/synth.py
+++ b/synth.py
@@ -31,6 +31,10 @@
       config_path=config_pattern.format(version=version),
       artman_output_name='')
 
+  package_name = f'com.google.cloud.{service}.{version}'
+  java.fix_proto_headers(library / f'proto-google-cloud-{service}-{version}')
+  java.fix_grpc_headers(library / f'grpc-google-cloud-{service}-{version}', package_name)
+
   s.copy(library / f'gapic-google-cloud-{service}-{version}/src', f'google-cloud-{service}/src')
   s.copy(library / f'grpc-google-cloud-{service}-{version}/src', f'grpc-google-cloud-{service}-{version}/src')
   s.copy(library / f'proto-google-cloud-{service}-{version}/src', f'proto-google-cloud-{service}-{version}/src')