diff --git a/cmd/azure-anonymous.go b/cmd/gateway-azure-anonymous.go
similarity index 100%
rename from cmd/azure-anonymous.go
rename to cmd/gateway-azure-anonymous.go
diff --git a/cmd/azure-unsupported.go b/cmd/gateway-azure-unsupported.go
similarity index 100%
rename from cmd/azure-unsupported.go
rename to cmd/gateway-azure-unsupported.go
diff --git a/cmd/azure.go b/cmd/gateway-azure.go
similarity index 100%
rename from cmd/azure.go
rename to cmd/gateway-azure.go
diff --git a/cmd/azure_test.go b/cmd/gateway-azure_test.go
similarity index 100%
rename from cmd/azure_test.go
rename to cmd/gateway-azure_test.go
diff --git a/cmd/s3-layer-anonymous.go b/cmd/gateway-s3-anonymous.go
similarity index 100%
rename from cmd/s3-layer-anonymous.go
rename to cmd/gateway-s3-anonymous.go
diff --git a/cmd/s3-layer-unsupported.go b/cmd/gateway-s3-unsupported.go
similarity index 100%
rename from cmd/s3-layer-unsupported.go
rename to cmd/gateway-s3-unsupported.go
diff --git a/cmd/s3-layer.go b/cmd/gateway-s3.go
similarity index 100%
rename from cmd/s3-layer.go
rename to cmd/gateway-s3.go
diff --git a/cmd/s3-layer_test.go b/cmd/gateway-s3_test.go
similarity index 100%
rename from cmd/s3-layer_test.go
rename to cmd/gateway-s3_test.go