diff --git a/client/clients/router/router_client.go b/client/clients/router/client.go
similarity index 100%
rename from client/clients/router/router_client.go
rename to client/clients/router/client.go
diff --git a/client/clients/tso/tso_client.go b/client/clients/tso/client.go
similarity index 100%
rename from client/clients/tso/tso_client.go
rename to client/clients/tso/client.go
diff --git a/client/clients/tso/tso_dispatcher.go b/client/clients/tso/dispatcher.go
similarity index 100%
rename from client/clients/tso/tso_dispatcher.go
rename to client/clients/tso/dispatcher.go
diff --git a/client/clients/tso/tso_dispatcher_test.go b/client/clients/tso/dispatcher_test.go
similarity index 100%
rename from client/clients/tso/tso_dispatcher_test.go
rename to client/clients/tso/dispatcher_test.go
diff --git a/client/clients/tso/tso_request.go b/client/clients/tso/request.go
similarity index 100%
rename from client/clients/tso/tso_request.go
rename to client/clients/tso/request.go
diff --git a/client/clients/tso/tso_request_test.go b/client/clients/tso/request_test.go
similarity index 100%
rename from client/clients/tso/tso_request_test.go
rename to client/clients/tso/request_test.go
diff --git a/client/clients/tso/tso_stream.go b/client/clients/tso/stream.go
similarity index 100%
rename from client/clients/tso/tso_stream.go
rename to client/clients/tso/stream.go
diff --git a/client/clients/tso/tso_stream_test.go b/client/clients/tso/stream_test.go
similarity index 100%
rename from client/clients/tso/tso_stream_test.go
rename to client/clients/tso/stream_test.go