diff --git a/api/auth/regexp-utils.go b/api/auth/regexp_utils.go
similarity index 100%
rename from api/auth/regexp-utils.go
rename to api/auth/regexp_utils.go
diff --git a/api/handler/not-support.go b/api/handler/not_support.go
similarity index 100%
rename from api/handler/not-support.go
rename to api/handler/not_support.go
diff --git a/api/max-clients.go b/api/max_clients.go
similarity index 100%
rename from api/max-clients.go
rename to api/max_clients.go
diff --git a/api/user-auth.go b/api/user_auth.go
similarity index 100%
rename from api/user-auth.go
rename to api/user_auth.go
diff --git a/cmd/s3-gw/app-healthy.go b/cmd/s3-gw/app_healthy.go
similarity index 100%
rename from cmd/s3-gw/app-healthy.go
rename to cmd/s3-gw/app_healthy.go
diff --git a/cmd/s3-gw/app-metrics.go b/cmd/s3-gw/app_metrics.go
similarity index 100%
rename from cmd/s3-gw/app-metrics.go
rename to cmd/s3-gw/app_metrics.go
diff --git a/cmd/s3-gw/app-profiler.go b/cmd/s3-gw/app_profiler.go
similarity index 100%
rename from cmd/s3-gw/app-profiler.go
rename to cmd/s3-gw/app_profiler.go
diff --git a/cmd/s3-gw/app-settings.go b/cmd/s3-gw/app_settings.go
similarity index 100%
rename from cmd/s3-gw/app-settings.go
rename to cmd/s3-gw/app_settings.go