diff --git a/assets/queries/googleDeploymentManager/s3_bucket_without_versioning/metadata.json b/assets/queries/googleDeploymentManager/bucket_without_versioning/metadata.json
similarity index 71%
rename from assets/queries/googleDeploymentManager/s3_bucket_without_versioning/metadata.json
rename to assets/queries/googleDeploymentManager/bucket_without_versioning/metadata.json
index 709de143e94..bb48a9c4fa8 100644
--- a/assets/queries/googleDeploymentManager/s3_bucket_without_versioning/metadata.json
+++ b/assets/queries/googleDeploymentManager/bucket_without_versioning/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "227c2f58-70c6-4432-8e9a-a89c1a548cf5",
-  "queryName": "S3 Bucket Without Versioning",
+  "queryName": "Bucket Without Versioning",
   "severity": "MEDIUM",
   "category": "Observability",
-  "descriptionText": "S3 bucket should have versioning enabled",
+  "descriptionText": "Bucket should have versioning enabled",
   "descriptionUrl": "https://cloud.google.com/storage/docs/json_api/v1/buckets",
   "platform": "GoogleDeploymentManager",
   "descriptionID": "97c49cde",
diff --git a/assets/queries/googleDeploymentManager/s3_bucket_without_versioning/query.rego b/assets/queries/googleDeploymentManager/bucket_without_versioning/query.rego
similarity index 100%
rename from assets/queries/googleDeploymentManager/s3_bucket_without_versioning/query.rego
rename to assets/queries/googleDeploymentManager/bucket_without_versioning/query.rego
diff --git a/assets/queries/googleDeploymentManager/s3_bucket_without_versioning/test/negative1.yaml b/assets/queries/googleDeploymentManager/bucket_without_versioning/test/negative1.yaml
similarity index 100%
rename from assets/queries/googleDeploymentManager/s3_bucket_without_versioning/test/negative1.yaml
rename to assets/queries/googleDeploymentManager/bucket_without_versioning/test/negative1.yaml
diff --git a/assets/queries/googleDeploymentManager/s3_bucket_without_versioning/test/positive1.yaml b/assets/queries/googleDeploymentManager/bucket_without_versioning/test/positive1.yaml
similarity index 100%
rename from assets/queries/googleDeploymentManager/s3_bucket_without_versioning/test/positive1.yaml
rename to assets/queries/googleDeploymentManager/bucket_without_versioning/test/positive1.yaml
diff --git a/assets/queries/googleDeploymentManager/s3_bucket_without_versioning/test/positive2.yaml b/assets/queries/googleDeploymentManager/bucket_without_versioning/test/positive2.yaml
similarity index 100%
rename from assets/queries/googleDeploymentManager/s3_bucket_without_versioning/test/positive2.yaml
rename to assets/queries/googleDeploymentManager/bucket_without_versioning/test/positive2.yaml
diff --git a/assets/queries/googleDeploymentManager/s3_bucket_without_versioning/test/positive_expected_result.json b/assets/queries/googleDeploymentManager/bucket_without_versioning/test/positive_expected_result.json
similarity index 63%
rename from assets/queries/googleDeploymentManager/s3_bucket_without_versioning/test/positive_expected_result.json
rename to assets/queries/googleDeploymentManager/bucket_without_versioning/test/positive_expected_result.json
index 1eb3cd01821..6bf204bca1f 100644
--- a/assets/queries/googleDeploymentManager/s3_bucket_without_versioning/test/positive_expected_result.json
+++ b/assets/queries/googleDeploymentManager/bucket_without_versioning/test/positive_expected_result.json
@@ -1,12 +1,12 @@
 [
   {
-    "queryName": "S3 Bucket Without Versioning",
+    "queryName": "Bucket Without Versioning",
     "severity": "MEDIUM",
     "line": 4,
     "filename": "positive1.yaml"
   },
   {
-    "queryName": "S3 Bucket Without Versioning",
+    "queryName": "Bucket Without Versioning",
     "severity": "MEDIUM",
     "line": 7,
     "filename": "positive2.yaml"