diff --git a/xds/internal/client/client_callback.go b/xds/internal/client/callback.go
similarity index 100%
rename from xds/internal/client/client_callback.go
rename to xds/internal/client/callback.go
diff --git a/xds/internal/client/client_cds_test.go b/xds/internal/client/cds_test.go
similarity index 100%
rename from xds/internal/client/client_cds_test.go
rename to xds/internal/client/cds_test.go
diff --git a/xds/internal/client/client_eds_test.go b/xds/internal/client/eds_test.go
similarity index 100%
rename from xds/internal/client/client_eds_test.go
rename to xds/internal/client/eds_test.go
diff --git a/xds/internal/client/client_lds_test.go b/xds/internal/client/lds_test.go
similarity index 100%
rename from xds/internal/client/client_lds_test.go
rename to xds/internal/client/lds_test.go
diff --git a/xds/internal/client/client_loadreport.go b/xds/internal/client/loadreport.go
similarity index 100%
rename from xds/internal/client/client_loadreport.go
rename to xds/internal/client/loadreport.go
diff --git a/xds/internal/client/client_loadreport_test.go b/xds/internal/client/loadreport_test.go
similarity index 100%
rename from xds/internal/client/client_loadreport_test.go
rename to xds/internal/client/loadreport_test.go
diff --git a/xds/internal/client/client_logging.go b/xds/internal/client/logging.go
similarity index 100%
rename from xds/internal/client/client_logging.go
rename to xds/internal/client/logging.go
diff --git a/xds/internal/client/client_rds_test.go b/xds/internal/client/rds_test.go
similarity index 100%
rename from xds/internal/client/client_rds_test.go
rename to xds/internal/client/rds_test.go
diff --git a/xds/internal/client/client_requests_counter.go b/xds/internal/client/requests_counter.go
similarity index 100%
rename from xds/internal/client/client_requests_counter.go
rename to xds/internal/client/requests_counter.go
diff --git a/xds/internal/client/client_requests_counter_test.go b/xds/internal/client/requests_counter_test.go
similarity index 100%
rename from xds/internal/client/client_requests_counter_test.go
rename to xds/internal/client/requests_counter_test.go
diff --git a/xds/internal/client/client_singleton.go b/xds/internal/client/singleton.go
similarity index 100%
rename from xds/internal/client/client_singleton.go
rename to xds/internal/client/singleton.go
diff --git a/xds/internal/client/v2/client_ack_test.go b/xds/internal/client/v2/ack_test.go
similarity index 100%
rename from xds/internal/client/v2/client_ack_test.go
rename to xds/internal/client/v2/ack_test.go
diff --git a/xds/internal/client/v2/client_cds_test.go b/xds/internal/client/v2/cds_test.go
similarity index 100%
rename from xds/internal/client/v2/client_cds_test.go
rename to xds/internal/client/v2/cds_test.go
diff --git a/xds/internal/client/v2/client_eds_test.go b/xds/internal/client/v2/eds_test.go
similarity index 100%
rename from xds/internal/client/v2/client_eds_test.go
rename to xds/internal/client/v2/eds_test.go
diff --git a/xds/internal/client/v2/client_lds_test.go b/xds/internal/client/v2/lds_test.go
similarity index 100%
rename from xds/internal/client/v2/client_lds_test.go
rename to xds/internal/client/v2/lds_test.go
diff --git a/xds/internal/client/v2/client_rds_test.go b/xds/internal/client/v2/rds_test.go
similarity index 100%
rename from xds/internal/client/v2/client_rds_test.go
rename to xds/internal/client/v2/rds_test.go
diff --git a/xds/internal/client/client_watchers.go b/xds/internal/client/watchers.go
similarity index 100%
rename from xds/internal/client/client_watchers.go
rename to xds/internal/client/watchers.go
diff --git a/xds/internal/client/client_watchers_cluster_test.go b/xds/internal/client/watchers_cluster_test.go
similarity index 100%
rename from xds/internal/client/client_watchers_cluster_test.go
rename to xds/internal/client/watchers_cluster_test.go
diff --git a/xds/internal/client/client_watchers_endpoints_test.go b/xds/internal/client/watchers_endpoints_test.go
similarity index 100%
rename from xds/internal/client/client_watchers_endpoints_test.go
rename to xds/internal/client/watchers_endpoints_test.go
diff --git a/xds/internal/client/client_watchers_listener_test.go b/xds/internal/client/watchers_listener_test.go
similarity index 100%
rename from xds/internal/client/client_watchers_listener_test.go
rename to xds/internal/client/watchers_listener_test.go
diff --git a/xds/internal/client/client_watchers_route_test.go b/xds/internal/client/watchers_route_test.go
similarity index 100%
rename from xds/internal/client/client_watchers_route_test.go
rename to xds/internal/client/watchers_route_test.go
diff --git a/xds/internal/client/client_xds.go b/xds/internal/client/xds.go
similarity index 100%
rename from xds/internal/client/client_xds.go
rename to xds/internal/client/xds.go