57 files changed, 209 insertions, 209 deletions

diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix
index b9ac8b139cb..ac1659cccf8 100644
--- a/pkgs/applications/version-management/dvc/default.nix
+++ b/pkgs/applications/version-management/dvc/default.nix
@@ -41,7 +41,7 @@ buildPythonApplication rec {
     distro
     appdirs
   ]
-  ++ lib.optional enableGoogle google_cloud_storage
+  ++ lib.optional enableGoogle google-cloud-storage
   ++ lib.optional enableAWS boto3
   ++ lib.optional enableAzure azure-storage-blob
   ++ lib.optional enableSSH paramiko;
diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix
index 537ffdbaf95..ebc0eb51df4 100644
--- a/pkgs/development/python-modules/cirq/default.nix
+++ b/pkgs/development/python-modules/cirq/default.nix
@@ -5,7 +5,7 @@
 , fetchFromGitHub
 , fetchpatch
 , freezegun
-, google_api_core
+, google-api-core
 , matplotlib
 , networkx
 , numpy
@@ -54,7 +54,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     freezegun
-    google_api_core
+    google-api-core
     numpy
     matplotlib
     networkx
diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index e2b5ae9d898..6715590dc32 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, google_auth
+, google-auth
 , googleapis_common_protos
 , grpcio
 , protobuf
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     googleapis_common_protos
-    google_auth
+    google-auth
     grpcio
     protobuf
     pytz
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index b14276b0a1a..2f6508c062f 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi
-, google_auth, google-auth-httplib2, google_api_core
+, google-auth, google-auth-httplib2, google-api-core
 , httplib2, six, uritemplate, oauth2client }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [
-    google_auth google-auth-httplib2 google_api_core
+    google-auth google-auth-httplib2 google-api-core
     httplib2 six uritemplate oauth2client
   ];
 
diff --git a/pkgs/development/python-modules/google_apputils/default.nix b/pkgs/development/python-modules/google-apputils/default.nix
index b679be9dbf7..b679be9dbf7 100644
--- a/pkgs/development/python-modules/google_apputils/default.nix
+++ b/pkgs/development/python-modules/google-apputils/default.nix
diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix
index 71abc249e7b..bb7836ef85d 100644
--- a/pkgs/development/python-modules/google-auth-httplib2/default.nix
+++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix
@@ -3,7 +3,7 @@
 , buildPythonPackage
 , fetchPypi
 , flask
-, google_auth
+, google-auth
 , httplib2
 , mock
 , pytestCheckHook
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    google_auth
+    google-auth
     httplib2
   ];
 
diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index 17a98d7814e..7fa7200fbbe 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -4,7 +4,7 @@
 , click
 , mock
 , pytestCheckHook
-, google_auth
+, google-auth
 , requests_oauthlib
 }:
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    google_auth
+    google-auth
     requests_oauthlib
   ];
 
diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index abfe3754cce..abfe3754cce 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
diff --git a/pkgs/development/python-modules/google_cloud_access_context_manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
index 82ba8a7fdcb..3f614258a8f 100644
--- a/pkgs/development/python-modules/google_cloud_access_context_manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }:
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }:
 
 buildPythonPackage rec {
   pname = "google-cloud-access-context-manager";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "1qy7wv1xn7g3x5z0vvv0pwmxhin4hw2m9fs9iklnghy00vg37v0b";
   };
 
-  propagatedBuildInputs = [ google_api_core ];
+  propagatedBuildInputs = [ google-api-core ];
 
   # No tests in repo
   doCheck = false;
diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix
index 79a47bb5096..d9baa821fa1 100644
--- a/pkgs/development/python-modules/google_cloud_asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -2,11 +2,11 @@
 , buildPythonPackage
 , fetchPypi
 , grpc_google_iam_v1
-, google_api_core
-, google_cloud_access_context_manager
-, google_cloud_org_policy
-, google_cloud_os_config
-, google_cloud_testutils
+, google-api-core
+, google-cloud-access-context-manager
+, google-cloud-org-policy
+, google-cloud-os-config
+, google-cloud-testutils
 , libcst
 , proto-plus
 , pytest
@@ -26,15 +26,15 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     grpc_google_iam_v1
-    google_api_core
-    google_cloud_access_context_manager
-    google_cloud_org_policy
-    google_cloud_os_config
+    google-api-core
+    google-cloud-access-context-manager
+    google-cloud-org-policy
+    google-cloud-os-config
     libcst
     proto-plus
   ];
 
-  checkInputs = [ google_cloud_testutils mock pytest-asyncio pytestCheckHook ];
+  checkInputs = [ google-cloud-testutils mock pytest-asyncio pytestCheckHook ];
 
   pythonImportsCheck = [
     "google.cloud.asset"
diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix
index 3352cbc8b1e..ce2a9e116cd 100644
--- a/pkgs/development/python-modules/google_cloud_automl/default.nix
+++ b/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -3,9 +3,9 @@
 , fetchPypi
 , pytestCheckHook
 , libcst
-, google_api_core
-, google_cloud_storage
-, google_cloud_testutils
+, google-api-core
+, google-cloud-storage
+, google-cloud-testutils
 , pandas
 , proto-plus
 , pytest-asyncio
@@ -21,11 +21,11 @@ buildPythonPackage rec {
     sha256 = "520dfe2ee04d28f3088c9c582fa2a534fc272647d5e2e59acc903c0152e61696";
   };
 
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
 
   checkInputs = [
-    google_cloud_storage
-    google_cloud_testutils
+    google-cloud-storage
+    google-cloud-testutils
     mock
     pandas
     pytest-asyncio
diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 704ef499d74..fde46ab7f12 100644
--- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
+, google-api-core
 , libcst
 , proto-plus
 , pytestCheckHook
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "0hmsqvs2srmqcwmli48vd5vw829zax3pwj63fsxig6sdhjlf6j7j";
   };
 
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 1ffc9e90189..7206ee43af3 100644
--- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix
@@ -3,9 +3,9 @@
 , fetchPypi
 , pytestCheckHook
 , freezegun
-, google_cloud_core
-, google_cloud_testutils
-, google_resumable_media
+, google-cloud-core
+, google-cloud-testutils
+, google-resumable-media
 , grpcio
 , ipython
 , mock
@@ -24,15 +24,15 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    google_resumable_media
-    google_cloud_core
+    google-resumable-media
+    google-cloud-core
     proto-plus
     pyarrow
   ];
 
   checkInputs = [
     freezegun
-    google_cloud_testutils
+    google-cloud-testutils
     ipython
     mock
     pandas
diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
index bd12aa592d5..032a30bb242 100644
--- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
@@ -2,8 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , grpc_google_iam_v1
-, google_api_core
-, google_cloud_core
+, google-api-core
+, google-cloud-core
 , pytest
 , mock
 }:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core google_cloud_core ];
+  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core google-cloud-core ];
 
   checkPhase = ''
     rm -r google
diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index 69c142171ad..011bb7b1967 100644
--- a/pkgs/development/python-modules/google_cloud_container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
+, google-api-core
 , grpc_google_iam_v1
 , libcst
 , mock
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     sha256 = "04f9mx1wxy3l9dvzvvr579fnjp1fdqhgplv5y2gl7h2mvn281k8d";
   };
 
-  propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix
index bcb9504cb91..c22c56a1ba4 100644
--- a/pkgs/development/python-modules/google_cloud_core/default.nix
+++ b/pkgs/development/python-modules/google-cloud-core/default.nix
@@ -4,7 +4,7 @@
 , pythonOlder
 , pytestCheckHook
 , python
-, google_api_core
+, google-api-core
 , grpcio
 , mock
 }:
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "01liq4nrd2g3ingg8v0ly4c86db8agnr9h1fiz219c7fz0as0xqj";
   };
 
-  propagatedBuildInputs = [ google_api_core ];
+  propagatedBuildInputs = [ google-api-core ];
 
   checkInputs = [ mock pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 5b4d4f25529..f99b2c382fc 100644
--- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
+, google-api-core
 , mock
 , libcst
 , proto-plus
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "07rv2kgbaqkbd71k5i2zn9kcxasfzkkyai8jnbszhkf92k0lmi41";
   };
 
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix
index 9ce64fcfd58..5daa2cdd81e 100644
--- a/pkgs/development/python-modules/google_cloud_datastore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -1,14 +1,14 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
-, google_cloud_core
+, google-api-core
+, google-cloud-core
 , libcst
 , proto-plus
 , mock
 , pytestCheckHook
 , pytest-asyncio
-, google_cloud_testutils
+, google-cloud-testutils
 }:
 
 buildPythonPackage rec {
@@ -20,9 +20,9 @@ buildPythonPackage rec {
     sha256 = "1yyk9ix1jms5q4kk76cfxzy42wzzyl5qladdswjy5l0pg6iypr8i";
   };
 
-  propagatedBuildInputs = [ google_api_core google_cloud_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ];
 
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
 
   preCheck = ''
     # directory shadows imports
diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 1e89a60a650..e02805c4076 100644
--- a/pkgs/development/python-modules/google_cloud_dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -1,8 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
-, google_cloud_testutils
+, google-api-core
+, google-cloud-testutils
 , libcst
 , proto-plus
 , pytestCheckHook
@@ -19,9 +19,9 @@ buildPythonPackage rec {
     sha256 = "09rnzpdlycr1wv8agcfx05v1prn35ylphsbr07486zqdkh5wjk8p";
   };
 
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
 
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
 
   disabledTests = [
     # requires credentials
diff --git a/pkgs/development/python-modules/google_cloud_dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix
index 7cccad0e6c5..b6777fccec0 100644
--- a/pkgs/development/python-modules/google_cloud_dns/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dns/default.nix
@@ -1,8 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
-, google_cloud_core
+, google-api-core
+, google-cloud-core
 , pytestCheckHook
 , mock
 }:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "01l6pvfic0vxcvd97ckbxyc7ccr9vb9ln4lyhpp3amdmcy0far3j";
   };
 
-  propagatedBuildInputs = [ google_api_core google_cloud_core ];
+  propagatedBuildInputs = [ google-api-core google-cloud-core ];
 
   checkInputs = [ mock pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
index 196ec4a912b..cdd54a29124 100644
--- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
+++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
@@ -2,8 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
-, google_cloud_logging
-, google_cloud_testutils
+, google-cloud-logging
+, google-cloud-testutils
 , libcst
 , mock
 , proto-plus
@@ -19,9 +19,9 @@ buildPythonPackage rec {
     sha256 = "2fd6fe25343f7017c22e2733a0358c64b3171edc1669d0c8a1e1f07f86a048c4";
   };
 
-  propagatedBuildInputs = [ google_cloud_logging libcst proto-plus ];
+  propagatedBuildInputs = [ google-cloud-logging libcst proto-plus ];
 
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
 
   disabledTests = [
     # require credentials
diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix
index b69f9e75d9a..1de3ea11b37 100644
--- a/pkgs/development/python-modules/google_cloud_firestore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix
@@ -2,9 +2,9 @@
 , buildPythonPackage
 , fetchPypi
 , aiounittest
-, google_api_core
-, google_cloud_testutils
-, google_cloud_core
+, google-api-core
+, google-cloud-testutils
+, google-cloud-core
 , mock
 , proto-plus
 , pytestCheckHook
@@ -21,14 +21,14 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    google_api_core
-    google_cloud_core
+    google-api-core
+    google-cloud-core
     proto-plus
   ];
 
   checkInputs = [
     aiounittest
-    google_cloud_testutils
+    google-cloud-testutils
     mock
     pytestCheckHook
     pytest-asyncio
diff --git a/pkgs/development/python-modules/google_cloud_iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix
index 3f7224f6c80..f96940f4e67 100644
--- a/pkgs/development/python-modules/google_cloud_iam/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , pytestCheckHook
 , pythonOlder
-, google_api_core
+, google-api-core
 , libcst
 , mock
 , proto-plus
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     sha256 = "1zxsx5avs8njiyw32zvsx2yblmmiwxy771x334hbgmy0aqms4lak";
   };
 
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix
index d5b9cbf127e..7e8a224256d 100644
--- a/pkgs/development/python-modules/google_cloud_iot/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iot/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , grpc_google_iam_v1
-, google_api_core
+, google-api-core
 , libcst
 , proto-plus
 , pytestCheckHook
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     sha256 = "08spn5g0s386x21dgwb46na8aknbwq5d1sn8bh6kayk9fjfbxwla";
   };
 
-  propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix
index 0000e39685c..49f088478ee 100644
--- a/pkgs/development/python-modules/google_cloud_kms/default.nix
+++ b/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , pytestCheckHook
 , grpc_google_iam_v1
-, google_api_core
+, google-api-core
 , libcst
 , mock
 , proto-plus
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     sha256 = "0f3k2ixp1zsgydpvkj75bs2mb805389snyw30hn41c38qq5ksdga";
   };
 
-  propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix
index 585ea5ef973..2074b1edb1d 100644
--- a/pkgs/development/python-modules/google_cloud_language/default.nix
+++ b/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
+, google-api-core
 , libcst
 , mock
 , proto-plus
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "123vqfrn7pyn3ia7cmhx8bgafd4gxxlmhf33s3vgspyjck6sprxb";
   };
 
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix
index ec187f82f7b..dba00274021 100644
--- a/pkgs/development/python-modules/google_cloud_logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -3,9 +3,9 @@
 , fetchPypi
 , django
 , flask
-, google_api_core
-, google_cloud_core
-, google_cloud_testutils
+, google-api-core
+, google-cloud-core
+, google-cloud-testutils
 , mock
 , proto-plus
 , pytestCheckHook
@@ -22,12 +22,12 @@ buildPythonPackage rec {
     sha256 = "0s09vs4rnq4637j8zw7grv3f4j7njqprm744b1knzldj91rg0vmi";
   };
 
-  propagatedBuildInputs = [ google_api_core google_cloud_core proto-plus ];
+  propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
 
   checkInputs = [
     django
     flask
-    google_cloud_testutils
+    google-cloud-testutils
     mock
     pytestCheckHook
     pytest-asyncio
diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
index c1890d99a04..10d7264c560 100644
--- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix
+++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix
@@ -1,8 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
-, google_cloud_testutils
+, google-api-core
+, google-cloud-testutils
 , libcst
 , proto-plus
 , pytestCheckHook
@@ -19,9 +19,9 @@ buildPythonPackage rec {
     sha256 = "07r0y995fin6cbnqlhmd38fv3pfhhqyw04l7nr38sldrd82gmsqx";
   };
 
-  propagatedBuildInputs = [ libcst google_api_core proto-plus ];
+  propagatedBuildInputs = [ libcst google-api-core proto-plus ];
 
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
 
   disabledTests = [
     # requires credentials
diff --git a/pkgs/development/python-modules/google_cloud_org_policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix
index 033706fa4ff..10ee559b8f0 100644
--- a/pkgs/development/python-modules/google_cloud_org_policy/default.nix
+++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_api_core }:
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }:
 
 buildPythonPackage rec {
   pname = "google-cloud-org-policy";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "0ncgcnbvmgqph54yh2pjx2hh82gnkhsrw5yirp4wlf7jclh6j9xh";
   };
 
-  propagatedBuildInputs = [ google_api_core ];
+  propagatedBuildInputs = [ google-api-core ];
 
   # No tests in repo
   doCheck = false;
diff --git a/pkgs/development/python-modules/google_cloud_os_config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index 20e651a54ca..94d8d4738f5 100644
--- a/pkgs/development/python-modules/google_cloud_os_config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, google_api_core, libcst, mock, proto-plus, pytestCheckHook, pytest-asyncio }:
+{ lib, buildPythonPackage, fetchPypi, google-api-core, libcst, mock, proto-plus, pytestCheckHook, pytest-asyncio }:
 
 buildPythonPackage rec {
   pname = "google-cloud-os-config";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "07zvagy9hwaccwvg1xad5nkalgkria0maa5yxiwqf1yk9f7gbyq1";
   };
 
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 4c6e08c91f5..e946f74ed3b 100644
--- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -2,8 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
-, google_api_core
-, google_cloud_testutils
+, google-api-core
+, google-cloud-testutils
 , grpc_google_iam_v1
 , libcst
 , mock
@@ -20,9 +20,9 @@ buildPythonPackage rec {
     sha256 = "1rfdbkxbndi00wx9dx733ihp3hmcsk6k23pcjni0ki7m0c4acl5w";
   };
 
-  propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
 
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
 
   preCheck = ''
     # prevent google directory from shadowing google imports
diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix
index 734f7650b31..9408c6642d9 100644
--- a/pkgs/development/python-modules/google_cloud_redis/default.nix
+++ b/pkgs/development/python-modules/google-cloud-redis/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
+, google-api-core
 , libcst
 , mock
 , proto-plus
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "1f67mr473vzv0qgjm4hycfnrjgiqrsv47vqrynwjy9yrca2130y7";
   };
 
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
index e8c47cc7759..36e8d0bcc52 100644
--- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
@@ -2,8 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
-, google_cloud_core
-, google_api_core
+, google-cloud-core
+, google-api-core
 , mock
 }:
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "1la643vkf6fm2gapz57cm92xzvmhzgpzv3bb6112yz1cizrvnxrm";
   };
 
-  propagatedBuildInputs = [ google_api_core google_cloud_core ];
+  propagatedBuildInputs = [ google-api-core google-cloud-core ];
 
   checkInputs = [ mock pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
index 4269943d08e..c4e569b88ad 100644
--- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
+++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
@@ -1,8 +1,8 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
-, google_cloud_core
+, google-api-core
+, google-cloud-core
 , mock
 , pytestCheckHook
 }:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "1bd8hlp0ssi20ds4gknbxai8mih6xiz8b60ab7p0ngpdqp1kw52p";
   };
 
-  propagatedBuildInputs = [ google_api_core google_cloud_core ];
+  propagatedBuildInputs = [ google-api-core google-cloud-core ];
 
   checkInputs = [ mock pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
index 8b84b55c93e..bb18b72caad 100644
--- a/pkgs/development/python-modules/google_cloud_secret_manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, google_api_core
+, google-api-core
 , grpc_google_iam_v1
 , libcst
 , mock
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    google_api_core
+    google-api-core
     grpc_google_iam_v1
     libcst
     proto-plus
diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
index 73f481abd27..4784dbe4473 100644
--- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix
+++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , grpc_google_iam_v1
-, google_api_core
+, google-api-core
 , libcst
 , mock
 , proto-plus
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     sha256 = "1lgz6qpsfv4b7p5ff4sdpjpaddxpbazdvlcrqr1i0c0qil2lkm2i";
   };
 
-  propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ grpc_google_iam_v1 google-api-core libcst proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index 3d34f22f3c1..2591fd9dc68 100644
--- a/pkgs/development/python-modules/google_cloud_spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -2,8 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , grpc_google_iam_v1
-, google_cloud_core
-, google_cloud_testutils
+, google-cloud-core
+, google-cloud-testutils
 , libcst
 , mock
 , proto-plus
@@ -26,9 +26,9 @@ buildPythonPackage rec {
       --replace '"proto-plus == 1.11.0"' '"proto-plus"'
   '';
 
-  propagatedBuildInputs = [ google_cloud_core grpc_google_iam_v1 libcst proto-plus sqlparse ];
+  propagatedBuildInputs = [ google-cloud-core grpc_google_iam_v1 libcst proto-plus sqlparse ];
 
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
 
   preCheck = ''
     # prevent google directory from shadowing google imports
diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index a47298acc33..a1d6762eafb 100644
--- a/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
+, google-api-core
 , libcst
 , mock
 , proto-plus
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "0ch85h5xrb15fcml5v0f30s0niw02k4v8gi7i8a40161yj882hm7";
   };
 
-  propagatedBuildInputs = [ libcst google_api_core proto-plus ];
+  propagatedBuildInputs = [ libcst google-api-core proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index 6bb734c9876..cf869d5c8ef 100644
--- a/pkgs/development/python-modules/google_cloud_storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -2,12 +2,12 @@
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
-, google_auth
-, google_cloud_iam
-, google_cloud_core
-, google_cloud_kms
-, google_cloud_testutils
-, google_resumable_media
+, google-auth
+, google-cloud-iam
+, google-cloud-core
+, google-cloud-kms
+, google-cloud-testutils
+, google-resumable-media
 , mock
 }:
 
@@ -21,15 +21,15 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    google_auth
-    google_cloud_core
-    google_resumable_media
+    google-auth
+    google-cloud-core
+    google-resumable-media
   ];
 
   checkInputs = [
-    google_cloud_iam
-    google_cloud_kms
-    google_cloud_testutils
+    google-cloud-iam
+    google-cloud-kms
+    google-cloud-testutils
     mock
     pytestCheckHook
   ];
diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix
index 28aa98c9491..8f86e71daed 100644
--- a/pkgs/development/python-modules/google_cloud_tasks/default.nix
+++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
+, google-api-core
 , grpc_google_iam_v1
 , libcst
 , mock
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     sha256 = "1jsf7y88lvln9r08pmx673ibmgw397qmir5drrcfvlmgqvszp7qx";
   };
 
-  propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix
index cf1535e7130..7358c61f59a 100644
--- a/pkgs/development/python-modules/google_cloud_testutils/default.nix
+++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, google_auth, six }:
+{ stdenv, buildPythonPackage, fetchPypi, google-auth, six }:
 
 buildPythonPackage rec {
   pname = "google-cloud-testutils";
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "1bn1pz00lxym3vkl6l45b3nydpmfdvmylwggh2lspldrxwx39a0k";
   };
 
-  propagatedBuildInputs = [ google_auth six ];
+  propagatedBuildInputs = [ google-auth six ];
 
   # does not contain tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index 6b145bfd3f8..7c8f738f57b 100644
--- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
-, google_api_core
+, google-api-core
 , libcst
 , mock
 , proto-plus
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "17igfwh34369gkvsbrm46j1ii61i6268wg2g2dl9c65nf9z3kgfb";
   };
 
-  propagatedBuildInputs = [ libcst google_api_core proto-plus ];
+  propagatedBuildInputs = [ libcst google-api-core proto-plus ];
 
   checkInputs = [ mock pytest-asyncio pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/google_cloud_trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix
index 50a2693f8b5..200f3dc1816 100644
--- a/pkgs/development/python-modules/google_cloud_trace/default.nix
+++ b/pkgs/development/python-modules/google-cloud-trace/default.nix
@@ -1,9 +1,9 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
-, google_cloud_core
-, google_cloud_testutils
+, google-api-core
+, google-cloud-core
+, google-cloud-testutils
 , mock
 , proto-plus
 , pytestCheckHook
@@ -19,9 +19,9 @@ buildPythonPackage rec {
     sha256 = "1lvcm4w1l7hiqg64kdscch3f3bq19q9ii49xj4lljn2a4xffxl8v";
   };
 
-  propagatedBuildInputs = [ google_api_core google_cloud_core proto-plus ];
+  propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ];
 
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
 
   disabledTests = [
     # require credentials
diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix
index f95ac1742d4..41ec5e76fec 100644
--- a/pkgs/development/python-modules/google_cloud_translate/default.nix
+++ b/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -2,9 +2,9 @@
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
-, google_api_core
-, google_cloud_core
-, google_cloud_testutils
+, google-api-core
+, google-cloud-core
+, google-cloud-testutils
 , grpcio
 , libcst
 , mock
@@ -21,9 +21,9 @@ buildPythonPackage rec {
     sha256 = "1s2gvlzfqd2gsrzaz7yl9q8s1k03dlsjahgg95s017vlcn21d0v1";
   };
 
-  propagatedBuildInputs = [ google_api_core google_cloud_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core google-cloud-core libcst proto-plus ];
 
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
 
   preCheck = ''
     # prevent shadowing imports
diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
index d052b1dcf08..72a7f42e4f5 100644
--- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix
+++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
@@ -2,8 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , mock
-, google_api_core
-, google_cloud_testutils
+, google-api-core
+, google-cloud-testutils
 , proto-plus
 , pytestCheckHook
 , pytest-asyncio
@@ -18,9 +18,9 @@ buildPythonPackage rec {
     sha256 = "1yhmizig41ymr2dz0i6ccrwszp0ivyykmq11vqxp82l9ncjima82";
   };
 
-  propagatedBuildInputs = [ google_api_core proto-plus ];
+  propagatedBuildInputs = [ google-api-core proto-plus ];
 
-  checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
 
   disabledTests = [
     # require credentials
diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix
index 801af638d27..42e0aa61f74 100644
--- a/pkgs/development/python-modules/google_cloud_vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, google_api_core
+, google-api-core
 , libcst
 , mock
 , proto-plus
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "0qbwhapmn5ia853c4nfnz1qiksngvr8j0xxjasrykwhxcsd7s1ka";
   };
 
-  propagatedBuildInputs = [ libcst google_api_core proto-plus];
+  propagatedBuildInputs = [ libcst google-api-core proto-plus];
 
   checkInputs = [ mock pytestCheckHook pytest-asyncio ];
 
diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index a8f2741d07d..c145bf9837d 100644
--- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pytestCheckHook
-, google_api_core
+, google-api-core
 , libcst
 , mock
 , proto-plus
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     sha256 = "14sky9bkl00n65ksig3f6psm31pkmkvlcprlk6s9if470j40zrhx";
   };
 
-  propagatedBuildInputs = [ google_api_core libcst proto-plus ];
+  propagatedBuildInputs = [ google-api-core libcst proto-plus ];
 
   checkInputs = [ mock pytest-asyncio pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/google_crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix
index aaf16d9e7c8..aaf16d9e7c8 100644
--- a/pkgs/development/python-modules/google_crc32c/default.nix
+++ b/pkgs/development/python-modules/google-crc32c/default.nix
diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix
index 4036613e3e2..531dc1a2860 100644
--- a/pkgs/development/python-modules/google_resumable_media/default.nix
+++ b/pkgs/development/python-modules/google-resumable-media/default.nix
@@ -1,9 +1,9 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, google_auth
-, google_cloud_testutils
-, google_crc32c
+, google-auth
+, google-cloud-testutils
+, google-crc32c
 , mock
 , pytestCheckHook
 , pytest-asyncio
@@ -19,9 +19,9 @@ buildPythonPackage rec {
     sha256 = "0hwxdgsqh6933kp4jkv6hwwdcqs7bgjn9j08ga399njv3s9b367f";
   };
 
-  propagatedBuildInputs = [ google_auth google_crc32c requests ];
+  propagatedBuildInputs = [ google-auth google-crc32c requests ];
 
-  checkInputs = [ google_auth google_cloud_testutils mock pytestCheckHook pytest-asyncio ];
+  checkInputs = [ google-auth google-cloud-testutils mock pytestCheckHook pytest-asyncio ];
 
   preCheck = ''
     # prevent shadowing imports
diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index 5fd73541dd4..9ad1d0c685d 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , requests
-, google_auth
+, google-auth
 , google-auth-oauthlib
 }:
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c";
   };
 
-  propagatedBuildInputs = [ requests google_auth google-auth-oauthlib ];
+  propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];
 
   meta = with stdenv.lib; {
     description = "Google Spreadsheets client library";
diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index 2679c81de0f..0be1ae0353f 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi, pythonAtLeast,
-  ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google_auth, adal,
+  ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal,
   isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }:
 
 buildPythonPackage rec {
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
-  propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google_auth adal ];
+  propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ];
 
   meta = with stdenv.lib; {
     description = "Kubernetes python client";
diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index 0556411ee47..08c5c334308 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -8,7 +8,7 @@
 , shapely
 , ndjson
 , backoff
-, google_api_core
+, google-api-core
 }:
 
 buildPythonPackage rec {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     jinja2 requests pillow rasterio shapely ndjson backoff
-    google_api_core
+    google-api-core
   ];
 
   # Test cases are not running on pypi or GitHub
diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix
index 595bab6cfa3..4925c3dfd02 100644
--- a/pkgs/development/python-modules/protobuf/default.nix
+++ b/pkgs/development/python-modules/protobuf/default.nix
@@ -5,7 +5,7 @@
 , buildPythonPackage
 , isPy37
 , protobuf
-, google_apputils
+, google-apputils
 , six
 , pyext
 , libcxx
@@ -29,9 +29,9 @@ buildPythonPackage {
 
   outputs = [ "out" "dev" ];
 
-  propagatedBuildInputs = [ six ] ++ optionals isPy27 [ google_apputils ];
+  propagatedBuildInputs = [ six ] ++ optionals isPy27 [ google-apputils ];
   propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc.
-  nativeBuildInputs = [ pyext ] ++ optionals isPy27 [ google_apputils ];
+  nativeBuildInputs = [ pyext ] ++ optionals isPy27 [ google-apputils ];
   buildInputs = [ protobuf ];
 
   patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2"))
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 6df1239537e..ea7b1298390 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -310,10 +310,10 @@
     "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api
     "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
     "google_assistant" = ps: with ps; [ aiohttp-cors ];
-    "google_cloud" = ps: with ps; [ google_cloud_texttospeech ];
+    "google_cloud" = ps: with ps; [ google-cloud-texttospeech ];
     "google_domains" = ps: with ps; [ ];
     "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib
-    "google_pubsub" = ps: with ps; [ google_cloud_pubsub ];
+    "google_pubsub" = ps: with ps; [ google-cloud-pubsub ];
     "google_translate" = ps: with ps; [ gtts ];
     "google_travel_time" = ps: with ps; [ googlemaps ];
     "google_wifi" = ps: with ps; [ ];
diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
index 346f8d27964..7e4cc66278c 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
   checkInputs = [ which ] ++ (with python3Packages; [ cython pytest ]);
   propagatedBuildInputs = with python3Packages; [
     sqlite apsw pycrypto requests defusedxml dugong llfuse
-    cython pytest pytest-catchlog google_auth google-auth-oauthlib
+    cython pytest pytest-catchlog google-auth google-auth-oauthlib
   ];
 
   preBuild = ''
diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix
index a6d5b6b4801..b3e9bfd56c0 100644
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/pkgs/tools/backup/wal-e/default.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   propagatedBuildInputs = (with python3Packages; [
     boto
     gevent
-    google_cloud_storage
+    google-cloud-storage
   ]) ++ [
     postgresql
     lzop
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb03ae13bf6..7af345b902b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2500,7 +2500,7 @@ in {
 
   goocalendar = callPackage ../development/python-modules/goocalendar { };
 
-  google_api_core = callPackage ../development/python-modules/google_api_core { };
+  google-api-core = callPackage ../development/python-modules/google-api-core { };
 
   google_api_python_client =
     let google_api_python_client = callPackage ../development/python-modules/google-api-python-client { };
@@ -2517,95 +2517,95 @@ in {
 
   googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { };
 
-  google_apputils = callPackage ../development/python-modules/google_apputils { };
+  google-apputils = callPackage ../development/python-modules/google-apputils { };
 
-  google_auth = callPackage ../development/python-modules/google_auth { };
+  google-auth = callPackage ../development/python-modules/google-auth { };
 
   google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { };
 
   google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { };
 
-  google_cloud_access_context_manager = callPackage ../development/python-modules/google_cloud_access_context_manager { };
+  google-cloud-access-context-manager = callPackage ../development/python-modules/google-cloud-access-context-manager { };
 
-  google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { };
+  google-cloud-asset = callPackage ../development/python-modules/google-cloud-asset { };
 
-  google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { };
+  google-cloud-automl = callPackage ../development/python-modules/google-cloud-automl { };
 
-  google_cloud_bigquery = callPackage ../development/python-modules/google_cloud_bigquery { };
+  google-cloud-bigquery = callPackage ../development/python-modules/google-cloud-bigquery { };
 
-  google_cloud_bigquery_datatransfer = callPackage ../development/python-modules/google_cloud_bigquery_datatransfer { };
+  google-cloud-bigquery-datatransfer = callPackage ../development/python-modules/google-cloud-bigquery-datatransfer { };
 
-  google_cloud_bigtable = callPackage ../development/python-modules/google_cloud_bigtable { };
+  google-cloud-bigtable = callPackage ../development/python-modules/google-cloud-bigtable { };
 
-  google_cloud_container = callPackage ../development/python-modules/google_cloud_container { };
+  google-cloud-container = callPackage ../development/python-modules/google-cloud-container { };
 
-  google_cloud_core = callPackage ../development/python-modules/google_cloud_core { };
+  google-cloud-core = callPackage ../development/python-modules/google-cloud-core { };
 
-  google_cloud_dataproc = callPackage ../development/python-modules/google_cloud_dataproc { };
+  google-cloud-dataproc = callPackage ../development/python-modules/google-cloud-dataproc { };
 
-  google_cloud_datastore = callPackage ../development/python-modules/google_cloud_datastore { };
+  google-cloud-datastore = callPackage ../development/python-modules/google-cloud-datastore { };
 
-  google_cloud_dlp = callPackage ../development/python-modules/google_cloud_dlp { };
+  google-cloud-dlp = callPackage ../development/python-modules/google-cloud-dlp { };
 
-  google_cloud_dns = callPackage ../development/python-modules/google_cloud_dns { };
+  google-cloud-dns = callPackage ../development/python-modules/google-cloud-dns { };
 
-  google_cloud_error_reporting = callPackage ../development/python-modules/google_cloud_error_reporting { };
+  google-cloud-error-reporting = callPackage ../development/python-modules/google-cloud-error-reporting { };
 
-  google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { };
+  google-cloud-firestore = callPackage ../development/python-modules/google-cloud-firestore { };
 
-  google_cloud_iam = callPackage ../development/python-modules/google_cloud_iam { };
+  google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { };
 
-  google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { };
+  google-cloud-iot = callPackage ../development/python-modules/google-cloud-iot { };
 
-  google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { };
+  google-cloud-kms = callPackage ../development/python-modules/google-cloud-kms { };
 
-  google_cloud_language = callPackage ../development/python-modules/google_cloud_language { };
+  google-cloud-language = callPackage ../development/python-modules/google-cloud-language { };
 
-  google_cloud_logging = callPackage ../development/python-modules/google_cloud_logging { };
+  google-cloud-logging = callPackage ../development/python-modules/google-cloud-logging { };
 
-  google_cloud_monitoring = callPackage ../development/python-modules/google_cloud_monitoring { };
+  google-cloud-monitoring = callPackage ../development/python-modules/google-cloud-monitoring { };
 
-  google_cloud_org_policy = callPackage ../development/python-modules/google_cloud_org_policy { };
+  google-cloud-org-policy = callPackage ../development/python-modules/google-cloud-org-policy { };
 
-  google_cloud_os_config = callPackage ../development/python-modules/google_cloud_os_config { };
+  google-cloud-os-config = callPackage ../development/python-modules/google-cloud-os-config { };
 
-  google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { };
+  google-cloud-pubsub = callPackage ../development/python-modules/google-cloud-pubsub { };
 
-  google_cloud_redis = callPackage ../development/python-modules/google_cloud_redis { };
+  google-cloud-redis = callPackage ../development/python-modules/google-cloud-redis { };
 
-  google_cloud_resource_manager = callPackage ../development/python-modules/google_cloud_resource_manager { };
+  google-cloud-resource-manager = callPackage ../development/python-modules/google-cloud-resource-manager { };
 
-  google_cloud_runtimeconfig = callPackage ../development/python-modules/google_cloud_runtimeconfig { };
+  google-cloud-runtimeconfig = callPackage ../development/python-modules/google-cloud-runtimeconfig { };
 
-  google_cloud_secret_manager = callPackage ../development/python-modules/google_cloud_secret_manager { };
+  google-cloud-secret-manager = callPackage ../development/python-modules/google-cloud-secret-manager { };
 
-  google_cloud_securitycenter = callPackage ../development/python-modules/google_cloud_securitycenter { };
+  google-cloud-securitycenter = callPackage ../development/python-modules/google-cloud-securitycenter { };
 
-  google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { };
+  google-cloud-spanner = callPackage ../development/python-modules/google-cloud-spanner { };
 
-  google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { };
+  google-cloud-speech = callPackage ../development/python-modules/google-cloud-speech { };
 
-  google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { };
+  google-cloud-storage = callPackage ../development/python-modules/google-cloud-storage { };
 
-  google_cloud_tasks = callPackage ../development/python-modules/google_cloud_tasks { };
+  google-cloud-tasks = callPackage ../development/python-modules/google-cloud-tasks { };
 
-  google_cloud_testutils = callPackage ../development/python-modules/google_cloud_testutils { };
+  google-cloud-testutils = callPackage ../development/python-modules/google-cloud-testutils { };
 
-  google_cloud_texttospeech = callPackage ../development/python-modules/google_cloud_texttospeech { };
+  google-cloud-texttospeech = callPackage ../development/python-modules/google-cloud-texttospeech { };
 
-  google_cloud_trace = callPackage ../development/python-modules/google_cloud_trace { };
+  google-cloud-trace = callPackage ../development/python-modules/google-cloud-trace { };
 
-  google_cloud_translate = callPackage ../development/python-modules/google_cloud_translate { };
+  google-cloud-translate = callPackage ../development/python-modules/google-cloud-translate { };
 
-  google_cloud_videointelligence = callPackage ../development/python-modules/google_cloud_videointelligence { };
+  google-cloud-videointelligence = callPackage ../development/python-modules/google-cloud-videointelligence { };
 
-  google_cloud_vision = callPackage ../development/python-modules/google_cloud_vision { };
+  google-cloud-vision = callPackage ../development/python-modules/google-cloud-vision { };
 
-  google_cloud_websecurityscanner = callPackage ../development/python-modules/google_cloud_websecurityscanner { };
+  google-cloud-websecurityscanner = callPackage ../development/python-modules/google-cloud-websecurityscanner { };
 
   google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { };
 
-  google_crc32c = callPackage ../development/python-modules/google_crc32c {
+  google-crc32c = callPackage ../development/python-modules/google-crc32c {
     inherit (pkgs) crc32c;
   };
 
@@ -2621,7 +2621,7 @@ in {
 
   google-pasta = callPackage ../development/python-modules/google-pasta { };
 
-  google_resumable_media = callPackage ../development/python-modules/google_resumable_media { };
+  google-resumable-media = callPackage ../development/python-modules/google-resumable-media { };
 
   googletrans = callPackage ../development/python-modules/googletrans { };