diff --git a/cmd/rpc-client.go b/cmd/storage-rpc-client.go
similarity index 99%
rename from cmd/rpc-client.go
rename to cmd/storage-rpc-client.go
index a3eb3af8d..5e3469228 100644
--- a/cmd/rpc-client.go
+++ b/cmd/storage-rpc-client.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package main
 
 import (
 	"net/http"
diff --git a/cmd/rpc-server-datatypes.go b/cmd/storage-rpc-server-datatypes.go
similarity index 99%
rename from cmd/rpc-server-datatypes.go
rename to cmd/storage-rpc-server-datatypes.go
index f036c1fb7..85b501901 100644
--- a/cmd/rpc-server-datatypes.go
+++ b/cmd/storage-rpc-server-datatypes.go
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package cmd
+package main
 
 // GenericReply represents any generic RPC reply.
 type GenericReply struct{}
diff --git a/cmd/rpc-server.go b/cmd/storage-rpc-server.go
similarity index 100%
rename from cmd/rpc-server.go
rename to cmd/storage-rpc-server.go