diff --git a/download_from_google_storage.py b/download_from_google_storage.py
index e114df9a5..f3fc51cb8 100755
--- a/download_from_google_storage.py
+++ b/download_from_google_storage.py
@@ -45,8 +45,8 @@ MIGRATION_TOGGLE_FILE_SUFFIX = '_is_first_class_gcs'
 def construct_migration_file_name(gcs_object_name):
     # Remove any forward slashes
     gcs_file_name = gcs_object_name.replace('/', '_')
-    # Remove any extensions
-    gcs_file_name = gcs_file_name.split('.')[0]
+    # Remove any dots
+    gcs_file_name = gcs_file_name.replace('.', '_')
 
     return f'.{gcs_file_name}{MIGRATION_TOGGLE_FILE_SUFFIX}'
 
diff --git a/gclient.py b/gclient.py
index 9f039c7c1..e4f2ba31a 100755
--- a/gclient.py
+++ b/gclient.py
@@ -2653,7 +2653,7 @@ class GcsDependency(Dependency):
                                    or f'.{gcs_file_name}')
 
         # Remove any forward slashes and drop any extensions
-        file_prefix = self.object_name.replace('/', '_').split('.')[0]
+        file_prefix = self.object_name.replace('/', '_').replace('.', '_')
         hash_file = os.path.join(output_dir, f'.{file_prefix}_hash')
         migration_toggle_file = os.path.join(
             output_dir,