diff --git a/validator/client/polling/BUILD.bazel b/validator/client/polling/BUILD.bazel
index 2060a3cfc3..e77113f7c9 100644
--- a/validator/client/polling/BUILD.bazel
+++ b/validator/client/polling/BUILD.bazel
@@ -4,14 +4,14 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "aggregate.go",
+        "attest.go",
+        "log.go",
+        "metrics.go",
+        "propose.go",
         "runner.go",
         "service.go",
         "validator.go",
-        "validator_aggregate.go",
-        "validator_attest.go",
-        "validator_log.go",
-        "validator_metrics.go",
-        "validator_propose.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/validator/client/polling",
     visibility = ["//validator:__subpackages__"],
@@ -59,12 +59,12 @@ go_test(
     name = "go_default_test",
     size = "small",
     srcs = [
+        "aggregate_test.go",
+        "attest_test.go",
         "fake_validator_test.go",
+        "propose_test.go",
         "runner_test.go",
         "service_test.go",
-        "validator_aggregate_test.go",
-        "validator_attest_test.go",
-        "validator_propose_test.go",
         "validator_test.go",
     ],
     embed = [":go_default_library"],
diff --git a/validator/client/polling/validator_aggregate.go b/validator/client/polling/aggregate.go
similarity index 100%
rename from validator/client/polling/validator_aggregate.go
rename to validator/client/polling/aggregate.go
diff --git a/validator/client/polling/validator_aggregate_test.go b/validator/client/polling/aggregate_test.go
similarity index 100%
rename from validator/client/polling/validator_aggregate_test.go
rename to validator/client/polling/aggregate_test.go
diff --git a/validator/client/polling/validator_attest.go b/validator/client/polling/attest.go
similarity index 100%
rename from validator/client/polling/validator_attest.go
rename to validator/client/polling/attest.go
diff --git a/validator/client/polling/validator_attest_test.go b/validator/client/polling/attest_test.go
similarity index 100%
rename from validator/client/polling/validator_attest_test.go
rename to validator/client/polling/attest_test.go
diff --git a/validator/client/polling/validator_log.go b/validator/client/polling/log.go
similarity index 100%
rename from validator/client/polling/validator_log.go
rename to validator/client/polling/log.go
diff --git a/validator/client/polling/validator_metrics.go b/validator/client/polling/metrics.go
similarity index 100%
rename from validator/client/polling/validator_metrics.go
rename to validator/client/polling/metrics.go
diff --git a/validator/client/polling/validator_propose.go b/validator/client/polling/propose.go
similarity index 100%
rename from validator/client/polling/validator_propose.go
rename to validator/client/polling/propose.go
diff --git a/validator/client/polling/validator_propose_test.go b/validator/client/polling/propose_test.go
similarity index 100%
rename from validator/client/polling/validator_propose_test.go
rename to validator/client/polling/propose_test.go
diff --git a/validator/client/streaming/BUILD.bazel b/validator/client/streaming/BUILD.bazel
index e95eafdd1d..ef1a10e185 100644
--- a/validator/client/streaming/BUILD.bazel
+++ b/validator/client/streaming/BUILD.bazel
@@ -4,15 +4,15 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "aggregate.go",
+        "attest.go",
+        "duties.go",
+        "log.go",
+        "metrics.go",
+        "propose.go",
         "runner.go",
         "service.go",
         "validator.go",
-        "validator_aggregate.go",
-        "validator_attest.go",
-        "validator_duties.go",
-        "validator_log.go",
-        "validator_metrics.go",
-        "validator_propose.go",
     ],
     importpath = "github.com/prysmaticlabs/prysm/validator/client/streaming",
     visibility = ["//validator:__subpackages__"],
@@ -60,13 +60,13 @@ go_test(
     name = "go_default_test",
     size = "small",
     srcs = [
+        "aggregate_test.go",
+        "attest_test.go",
+        "duties_test.go",
         "fake_validator_test.go",
+        "propose_test.go",
         "runner_test.go",
         "service_test.go",
-        "validator_aggregate_test.go",
-        "validator_attest_test.go",
-        "validator_duties_test.go",
-        "validator_propose_test.go",
         "validator_test.go",
     ],
     embed = [":go_default_library"],
diff --git a/validator/client/streaming/validator_aggregate.go b/validator/client/streaming/aggregate.go
similarity index 100%
rename from validator/client/streaming/validator_aggregate.go
rename to validator/client/streaming/aggregate.go
diff --git a/validator/client/streaming/validator_aggregate_test.go b/validator/client/streaming/aggregate_test.go
similarity index 100%
rename from validator/client/streaming/validator_aggregate_test.go
rename to validator/client/streaming/aggregate_test.go
diff --git a/validator/client/streaming/validator_attest.go b/validator/client/streaming/attest.go
similarity index 100%
rename from validator/client/streaming/validator_attest.go
rename to validator/client/streaming/attest.go
diff --git a/validator/client/streaming/validator_attest_test.go b/validator/client/streaming/attest_test.go
similarity index 100%
rename from validator/client/streaming/validator_attest_test.go
rename to validator/client/streaming/attest_test.go
diff --git a/validator/client/streaming/validator_duties.go b/validator/client/streaming/duties.go
similarity index 100%
rename from validator/client/streaming/validator_duties.go
rename to validator/client/streaming/duties.go
diff --git a/validator/client/streaming/validator_duties_test.go b/validator/client/streaming/duties_test.go
similarity index 100%
rename from validator/client/streaming/validator_duties_test.go
rename to validator/client/streaming/duties_test.go
diff --git a/validator/client/streaming/validator_log.go b/validator/client/streaming/log.go
similarity index 100%
rename from validator/client/streaming/validator_log.go
rename to validator/client/streaming/log.go
diff --git a/validator/client/streaming/validator_metrics.go b/validator/client/streaming/metrics.go
similarity index 100%
rename from validator/client/streaming/validator_metrics.go
rename to validator/client/streaming/metrics.go
diff --git a/validator/client/streaming/validator_propose.go b/validator/client/streaming/propose.go
similarity index 100%
rename from validator/client/streaming/validator_propose.go
rename to validator/client/streaming/propose.go
diff --git a/validator/client/streaming/validator_propose_test.go b/validator/client/streaming/propose_test.go
similarity index 100%
rename from validator/client/streaming/validator_propose_test.go
rename to validator/client/streaming/propose_test.go