diff --git a/cmd/nerdctl/apparmor/apparmor_linux.go b/cmd/nerdctl/apparmor/command_linux.go
similarity index 100%
rename from cmd/nerdctl/apparmor/apparmor_linux.go
rename to cmd/nerdctl/apparmor/command_linux.go
diff --git a/cmd/nerdctl/apparmor/apparmor_linux_test.go b/cmd/nerdctl/apparmor/command_linux_test.go
similarity index 100%
rename from cmd/nerdctl/apparmor/apparmor_linux_test.go
rename to cmd/nerdctl/apparmor/command_linux_test.go
diff --git a/cmd/nerdctl/apparmor/apparmor_inspect_linux.go b/cmd/nerdctl/apparmor/inspect_linux.go
similarity index 100%
rename from cmd/nerdctl/apparmor/apparmor_inspect_linux.go
rename to cmd/nerdctl/apparmor/inspect_linux.go
diff --git a/cmd/nerdctl/apparmor/apparmor_list_linux.go b/cmd/nerdctl/apparmor/list_linux.go
similarity index 100%
rename from cmd/nerdctl/apparmor/apparmor_list_linux.go
rename to cmd/nerdctl/apparmor/list_linux.go
diff --git a/cmd/nerdctl/apparmor/apparmor_load_linux.go b/cmd/nerdctl/apparmor/load_linux.go
similarity index 100%
rename from cmd/nerdctl/apparmor/apparmor_load_linux.go
rename to cmd/nerdctl/apparmor/load_linux.go
diff --git a/cmd/nerdctl/apparmor/apparmor_unload_linux.go b/cmd/nerdctl/apparmor/unload_linux.go
similarity index 100%
rename from cmd/nerdctl/apparmor/apparmor_unload_linux.go
rename to cmd/nerdctl/apparmor/unload_linux.go
diff --git a/cmd/nerdctl/builder/builder_build.go b/cmd/nerdctl/builder/build.go
similarity index 100%
rename from cmd/nerdctl/builder/builder_build.go
rename to cmd/nerdctl/builder/build.go
diff --git a/cmd/nerdctl/builder/builder_build_oci_layout_test.go b/cmd/nerdctl/builder/build_oci_layout_test.go
similarity index 100%
rename from cmd/nerdctl/builder/builder_build_oci_layout_test.go
rename to cmd/nerdctl/builder/build_oci_layout_test.go
diff --git a/cmd/nerdctl/builder/builder_build_test.go b/cmd/nerdctl/builder/build_test.go
similarity index 100%
rename from cmd/nerdctl/builder/builder_build_test.go
rename to cmd/nerdctl/builder/build_test.go
diff --git a/cmd/nerdctl/builder/builder_test.go b/cmd/nerdctl/builder/builder_test.go
deleted file mode 100644
index fee2491cb9b..00000000000
--- a/cmd/nerdctl/builder/builder_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package builder
-
-import (
-	"testing"
-
-	"github.com/containerd/nerdctl/v2/pkg/testutil"
-)
-
-func TestMain(m *testing.M) {
-	testutil.M(m)
-}
diff --git a/cmd/nerdctl/builder/builder.go b/cmd/nerdctl/builder/command.go
similarity index 100%
rename from cmd/nerdctl/builder/builder.go
rename to cmd/nerdctl/builder/command.go
diff --git a/cmd/nerdctl/builder/builder_builder_test.go b/cmd/nerdctl/builder/command_test.go
similarity index 100%
rename from cmd/nerdctl/builder/builder_builder_test.go
rename to cmd/nerdctl/builder/command_test.go
diff --git a/cmd/nerdctl/completion/completion.go b/cmd/nerdctl/completion/command.go
similarity index 100%
rename from cmd/nerdctl/completion/completion.go
rename to cmd/nerdctl/completion/command.go
diff --git a/cmd/nerdctl/completion/completion_freebsd.go b/cmd/nerdctl/completion/command_freebsd.go
similarity index 100%
rename from cmd/nerdctl/completion/completion_freebsd.go
rename to cmd/nerdctl/completion/command_freebsd.go
diff --git a/cmd/nerdctl/completion/completion_linux.go b/cmd/nerdctl/completion/command_linux.go
similarity index 100%
rename from cmd/nerdctl/completion/completion_linux.go
rename to cmd/nerdctl/completion/command_linux.go
diff --git a/cmd/nerdctl/completion/completion_test.go b/cmd/nerdctl/completion/command_test.go
similarity index 100%
rename from cmd/nerdctl/completion/completion_test.go
rename to cmd/nerdctl/completion/command_test.go
diff --git a/cmd/nerdctl/completion/completion_unix.go b/cmd/nerdctl/completion/command_unix.go
similarity index 100%
rename from cmd/nerdctl/completion/completion_unix.go
rename to cmd/nerdctl/completion/command_unix.go
diff --git a/cmd/nerdctl/completion/completion_windows.go b/cmd/nerdctl/completion/command_windows.go
similarity index 100%
rename from cmd/nerdctl/completion/completion_windows.go
rename to cmd/nerdctl/completion/command_windows.go
diff --git a/cmd/nerdctl/compose/compose_build.go b/cmd/nerdctl/compose/build.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_build.go
rename to cmd/nerdctl/compose/build.go
diff --git a/cmd/nerdctl/compose/compose_build_linux_test.go b/cmd/nerdctl/compose/build_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_build_linux_test.go
rename to cmd/nerdctl/compose/build_linux_test.go
diff --git a/cmd/nerdctl/compose/compose.go b/cmd/nerdctl/compose/command.go
similarity index 100%
rename from cmd/nerdctl/compose/compose.go
rename to cmd/nerdctl/compose/command.go
diff --git a/cmd/nerdctl/compose/compose_test.go b/cmd/nerdctl/compose/command_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_test.go
rename to cmd/nerdctl/compose/command_test.go
diff --git a/cmd/nerdctl/compose/compose_config.go b/cmd/nerdctl/compose/config.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_config.go
rename to cmd/nerdctl/compose/config.go
diff --git a/cmd/nerdctl/compose/compose_config_test.go b/cmd/nerdctl/compose/config_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_config_test.go
rename to cmd/nerdctl/compose/config_test.go
diff --git a/cmd/nerdctl/compose/compose_cp.go b/cmd/nerdctl/compose/cp.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_cp.go
rename to cmd/nerdctl/compose/cp.go
diff --git a/cmd/nerdctl/compose/compose_cp_linux_test.go b/cmd/nerdctl/compose/cp_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_cp_linux_test.go
rename to cmd/nerdctl/compose/cp_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_create.go b/cmd/nerdctl/compose/create.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_create.go
rename to cmd/nerdctl/compose/create.go
diff --git a/cmd/nerdctl/compose/compose_create_linux_test.go b/cmd/nerdctl/compose/create_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_create_linux_test.go
rename to cmd/nerdctl/compose/create_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_down.go b/cmd/nerdctl/compose/down.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_down.go
rename to cmd/nerdctl/compose/down.go
diff --git a/cmd/nerdctl/compose/compose_down_linux_test.go b/cmd/nerdctl/compose/down_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_down_linux_test.go
rename to cmd/nerdctl/compose/down_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_exec.go b/cmd/nerdctl/compose/exec.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_exec.go
rename to cmd/nerdctl/compose/exec.go
diff --git a/cmd/nerdctl/compose/compose_exec_linux_test.go b/cmd/nerdctl/compose/exec_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_exec_linux_test.go
rename to cmd/nerdctl/compose/exec_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_images.go b/cmd/nerdctl/compose/images.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_images.go
rename to cmd/nerdctl/compose/images.go
diff --git a/cmd/nerdctl/compose/compose_images_linux_test.go b/cmd/nerdctl/compose/images_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_images_linux_test.go
rename to cmd/nerdctl/compose/images_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_kill.go b/cmd/nerdctl/compose/kill.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_kill.go
rename to cmd/nerdctl/compose/kill.go
diff --git a/cmd/nerdctl/compose/compose_kill_linux_test.go b/cmd/nerdctl/compose/kill_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_kill_linux_test.go
rename to cmd/nerdctl/compose/kill_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_logs.go b/cmd/nerdctl/compose/logs.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_logs.go
rename to cmd/nerdctl/compose/logs.go
diff --git a/cmd/nerdctl/compose/compose_pause.go b/cmd/nerdctl/compose/pause.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_pause.go
rename to cmd/nerdctl/compose/pause.go
diff --git a/cmd/nerdctl/compose/compose_pause_linux_test.go b/cmd/nerdctl/compose/pause_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_pause_linux_test.go
rename to cmd/nerdctl/compose/pause_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_port.go b/cmd/nerdctl/compose/port.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_port.go
rename to cmd/nerdctl/compose/port.go
diff --git a/cmd/nerdctl/compose/compose_port_linux_test.go b/cmd/nerdctl/compose/port_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_port_linux_test.go
rename to cmd/nerdctl/compose/port_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_ps.go b/cmd/nerdctl/compose/ps.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_ps.go
rename to cmd/nerdctl/compose/ps.go
diff --git a/cmd/nerdctl/compose/compose_ps_linux_test.go b/cmd/nerdctl/compose/ps_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_ps_linux_test.go
rename to cmd/nerdctl/compose/ps_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_pull.go b/cmd/nerdctl/compose/pull.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_pull.go
rename to cmd/nerdctl/compose/pull.go
diff --git a/cmd/nerdctl/compose/compose_pull_linux_test.go b/cmd/nerdctl/compose/pull_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_pull_linux_test.go
rename to cmd/nerdctl/compose/pull_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_push.go b/cmd/nerdctl/compose/push.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_push.go
rename to cmd/nerdctl/compose/push.go
diff --git a/cmd/nerdctl/compose/compose_restart.go b/cmd/nerdctl/compose/restart.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_restart.go
rename to cmd/nerdctl/compose/restart.go
diff --git a/cmd/nerdctl/compose/compose_restart_linux_test.go b/cmd/nerdctl/compose/restart_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_restart_linux_test.go
rename to cmd/nerdctl/compose/restart_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_rm.go b/cmd/nerdctl/compose/rm.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_rm.go
rename to cmd/nerdctl/compose/rm.go
diff --git a/cmd/nerdctl/compose/compose_rm_linux_test.go b/cmd/nerdctl/compose/rm_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_rm_linux_test.go
rename to cmd/nerdctl/compose/rm_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_run.go b/cmd/nerdctl/compose/run.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_run.go
rename to cmd/nerdctl/compose/run.go
diff --git a/cmd/nerdctl/compose/compose_run_linux_test.go b/cmd/nerdctl/compose/run_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_run_linux_test.go
rename to cmd/nerdctl/compose/run_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_start.go b/cmd/nerdctl/compose/start.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_start.go
rename to cmd/nerdctl/compose/start.go
diff --git a/cmd/nerdctl/compose/compose_start_linux_test.go b/cmd/nerdctl/compose/start_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_start_linux_test.go
rename to cmd/nerdctl/compose/start_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_stop.go b/cmd/nerdctl/compose/stop.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_stop.go
rename to cmd/nerdctl/compose/stop.go
diff --git a/cmd/nerdctl/compose/compose_stop_linux_test.go b/cmd/nerdctl/compose/stop_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_stop_linux_test.go
rename to cmd/nerdctl/compose/stop_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_top.go b/cmd/nerdctl/compose/top.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_top.go
rename to cmd/nerdctl/compose/top.go
diff --git a/cmd/nerdctl/compose/compose_top_linux_test.go b/cmd/nerdctl/compose/top_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_top_linux_test.go
rename to cmd/nerdctl/compose/top_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_up.go b/cmd/nerdctl/compose/up.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_up.go
rename to cmd/nerdctl/compose/up.go
diff --git a/cmd/nerdctl/compose/compose_up_linux_test.go b/cmd/nerdctl/compose/up_linux_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_up_linux_test.go
rename to cmd/nerdctl/compose/up_linux_test.go
diff --git a/cmd/nerdctl/compose/compose_up_test.go b/cmd/nerdctl/compose/up_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_up_test.go
rename to cmd/nerdctl/compose/up_test.go
diff --git a/cmd/nerdctl/compose/compose_version.go b/cmd/nerdctl/compose/version.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_version.go
rename to cmd/nerdctl/compose/version.go
diff --git a/cmd/nerdctl/compose/compose_version_test.go b/cmd/nerdctl/compose/version_test.go
similarity index 100%
rename from cmd/nerdctl/compose/compose_version_test.go
rename to cmd/nerdctl/compose/version_test.go
diff --git a/cmd/nerdctl/container/container_attach.go b/cmd/nerdctl/container/attach.go
similarity index 100%
rename from cmd/nerdctl/container/container_attach.go
rename to cmd/nerdctl/container/attach.go
diff --git a/cmd/nerdctl/container/container_attach_linux_test.go b/cmd/nerdctl/container/attach_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_attach_linux_test.go
rename to cmd/nerdctl/container/attach_linux_test.go
diff --git a/cmd/nerdctl/container/container.go b/cmd/nerdctl/container/command.go
similarity index 100%
rename from cmd/nerdctl/container/container.go
rename to cmd/nerdctl/container/command.go
diff --git a/cmd/nerdctl/container/container_test.go b/cmd/nerdctl/container/command_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_test.go
rename to cmd/nerdctl/container/command_test.go
diff --git a/cmd/nerdctl/container/container_commit.go b/cmd/nerdctl/container/commit.go
similarity index 100%
rename from cmd/nerdctl/container/container_commit.go
rename to cmd/nerdctl/container/commit.go
diff --git a/cmd/nerdctl/container/container_commit_linux_test.go b/cmd/nerdctl/container/commit_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_commit_linux_test.go
rename to cmd/nerdctl/container/commit_linux_test.go
diff --git a/cmd/nerdctl/container/container_commit_test.go b/cmd/nerdctl/container/commit_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_commit_test.go
rename to cmd/nerdctl/container/commit_test.go
diff --git a/cmd/nerdctl/container/container_cp_acid_linux_test.go b/cmd/nerdctl/container/cp_acid_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_cp_acid_linux_test.go
rename to cmd/nerdctl/container/cp_acid_linux_test.go
diff --git a/cmd/nerdctl/container/container_cp_freebsd.go b/cmd/nerdctl/container/cp_freebsd.go
similarity index 100%
rename from cmd/nerdctl/container/container_cp_freebsd.go
rename to cmd/nerdctl/container/cp_freebsd.go
diff --git a/cmd/nerdctl/container/container_cp_linux.go b/cmd/nerdctl/container/cp_linux.go
similarity index 100%
rename from cmd/nerdctl/container/container_cp_linux.go
rename to cmd/nerdctl/container/cp_linux.go
diff --git a/cmd/nerdctl/container/container_cp_linux_test.go b/cmd/nerdctl/container/cp_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_cp_linux_test.go
rename to cmd/nerdctl/container/cp_linux_test.go
diff --git a/cmd/nerdctl/container/container_cp_windows.go b/cmd/nerdctl/container/cp_windows.go
similarity index 100%
rename from cmd/nerdctl/container/container_cp_windows.go
rename to cmd/nerdctl/container/cp_windows.go
diff --git a/cmd/nerdctl/container/container_create.go b/cmd/nerdctl/container/create.go
similarity index 100%
rename from cmd/nerdctl/container/container_create.go
rename to cmd/nerdctl/container/create.go
diff --git a/cmd/nerdctl/container/container_create_linux_test.go b/cmd/nerdctl/container/create_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_create_linux_test.go
rename to cmd/nerdctl/container/create_linux_test.go
diff --git a/cmd/nerdctl/container/container_create_test.go b/cmd/nerdctl/container/create_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_create_test.go
rename to cmd/nerdctl/container/create_test.go
diff --git a/cmd/nerdctl/container/container_diff.go b/cmd/nerdctl/container/diff.go
similarity index 100%
rename from cmd/nerdctl/container/container_diff.go
rename to cmd/nerdctl/container/diff.go
diff --git a/cmd/nerdctl/container/container_diff_test.go b/cmd/nerdctl/container/diff_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_diff_test.go
rename to cmd/nerdctl/container/diff_test.go
diff --git a/cmd/nerdctl/container/container_exec.go b/cmd/nerdctl/container/exec.go
similarity index 100%
rename from cmd/nerdctl/container/container_exec.go
rename to cmd/nerdctl/container/exec.go
diff --git a/cmd/nerdctl/container/container_exec_linux_test.go b/cmd/nerdctl/container/exec_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_exec_linux_test.go
rename to cmd/nerdctl/container/exec_linux_test.go
diff --git a/cmd/nerdctl/container/container_exec_test.go b/cmd/nerdctl/container/exec_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_exec_test.go
rename to cmd/nerdctl/container/exec_test.go
diff --git a/cmd/nerdctl/container/container_inspect.go b/cmd/nerdctl/container/inspect.go
similarity index 100%
rename from cmd/nerdctl/container/container_inspect.go
rename to cmd/nerdctl/container/inspect.go
diff --git a/cmd/nerdctl/container/container_inspect_linux_test.go b/cmd/nerdctl/container/inspect_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_inspect_linux_test.go
rename to cmd/nerdctl/container/inspect_linux_test.go
diff --git a/cmd/nerdctl/container/container_inspect_windows_test.go b/cmd/nerdctl/container/inspect_windows_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_inspect_windows_test.go
rename to cmd/nerdctl/container/inspect_windows_test.go
diff --git a/cmd/nerdctl/container/container_kill.go b/cmd/nerdctl/container/kill.go
similarity index 100%
rename from cmd/nerdctl/container/container_kill.go
rename to cmd/nerdctl/container/kill.go
diff --git a/cmd/nerdctl/container/container_kill_linux_test.go b/cmd/nerdctl/container/kill_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_kill_linux_test.go
rename to cmd/nerdctl/container/kill_linux_test.go
diff --git a/cmd/nerdctl/container/container_list.go b/cmd/nerdctl/container/list.go
similarity index 100%
rename from cmd/nerdctl/container/container_list.go
rename to cmd/nerdctl/container/list.go
diff --git a/cmd/nerdctl/container/container_list_linux_test.go b/cmd/nerdctl/container/list_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_list_linux_test.go
rename to cmd/nerdctl/container/list_linux_test.go
diff --git a/cmd/nerdctl/container/container_list_test.go b/cmd/nerdctl/container/list_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_list_test.go
rename to cmd/nerdctl/container/list_test.go
diff --git a/cmd/nerdctl/container/container_list_windows_test.go b/cmd/nerdctl/container/list_windows_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_list_windows_test.go
rename to cmd/nerdctl/container/list_windows_test.go
diff --git a/cmd/nerdctl/container/container_logs.go b/cmd/nerdctl/container/logs.go
similarity index 100%
rename from cmd/nerdctl/container/container_logs.go
rename to cmd/nerdctl/container/logs.go
diff --git a/cmd/nerdctl/container/container_logs_test.go b/cmd/nerdctl/container/logs_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_logs_test.go
rename to cmd/nerdctl/container/logs_test.go
diff --git a/cmd/nerdctl/container/container_pause.go b/cmd/nerdctl/container/pause.go
similarity index 100%
rename from cmd/nerdctl/container/container_pause.go
rename to cmd/nerdctl/container/pause.go
diff --git a/cmd/nerdctl/container/container_port.go b/cmd/nerdctl/container/port.go
similarity index 100%
rename from cmd/nerdctl/container/container_port.go
rename to cmd/nerdctl/container/port.go
diff --git a/cmd/nerdctl/container/container_prune.go b/cmd/nerdctl/container/prune.go
similarity index 100%
rename from cmd/nerdctl/container/container_prune.go
rename to cmd/nerdctl/container/prune.go
diff --git a/cmd/nerdctl/container/container_prune_linux_test.go b/cmd/nerdctl/container/prune_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_prune_linux_test.go
rename to cmd/nerdctl/container/prune_linux_test.go
diff --git a/cmd/nerdctl/container/container_remove.go b/cmd/nerdctl/container/remove.go
similarity index 100%
rename from cmd/nerdctl/container/container_remove.go
rename to cmd/nerdctl/container/remove.go
diff --git a/cmd/nerdctl/container/container_remove_test.go b/cmd/nerdctl/container/remove_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_remove_test.go
rename to cmd/nerdctl/container/remove_test.go
diff --git a/cmd/nerdctl/container/container_remove_windows_test.go b/cmd/nerdctl/container/remove_windows_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_remove_windows_test.go
rename to cmd/nerdctl/container/remove_windows_test.go
diff --git a/cmd/nerdctl/container/container_rename.go b/cmd/nerdctl/container/rename.go
similarity index 100%
rename from cmd/nerdctl/container/container_rename.go
rename to cmd/nerdctl/container/rename.go
diff --git a/cmd/nerdctl/container/container_rename_linux_test.go b/cmd/nerdctl/container/rename_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_rename_linux_test.go
rename to cmd/nerdctl/container/rename_linux_test.go
diff --git a/cmd/nerdctl/container/container_rename_windows_test.go b/cmd/nerdctl/container/rename_windows_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_rename_windows_test.go
rename to cmd/nerdctl/container/rename_windows_test.go
diff --git a/cmd/nerdctl/container/container_restart.go b/cmd/nerdctl/container/restart.go
similarity index 100%
rename from cmd/nerdctl/container/container_restart.go
rename to cmd/nerdctl/container/restart.go
diff --git a/cmd/nerdctl/container/container_restart_linux_test.go b/cmd/nerdctl/container/restart_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_restart_linux_test.go
rename to cmd/nerdctl/container/restart_linux_test.go
diff --git a/cmd/nerdctl/container/container_run.go b/cmd/nerdctl/container/run.go
similarity index 100%
rename from cmd/nerdctl/container/container_run.go
rename to cmd/nerdctl/container/run.go
diff --git a/cmd/nerdctl/container/container_run_cgroup_linux_test.go b/cmd/nerdctl/container/run_cgroup_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_cgroup_linux_test.go
rename to cmd/nerdctl/container/run_cgroup_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_freebsd.go b/cmd/nerdctl/container/run_freebsd.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_freebsd.go
rename to cmd/nerdctl/container/run_freebsd.go
diff --git a/cmd/nerdctl/container/container_run_gpus_test.go b/cmd/nerdctl/container/run_gpus_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_gpus_test.go
rename to cmd/nerdctl/container/run_gpus_test.go
diff --git a/cmd/nerdctl/container/container_run_linux.go b/cmd/nerdctl/container/run_linux.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_linux.go
rename to cmd/nerdctl/container/run_linux.go
diff --git a/cmd/nerdctl/container/container_run_linux_test.go b/cmd/nerdctl/container/run_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_linux_test.go
rename to cmd/nerdctl/container/run_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_log_driver_syslog_test.go b/cmd/nerdctl/container/run_log_driver_syslog_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_log_driver_syslog_test.go
rename to cmd/nerdctl/container/run_log_driver_syslog_test.go
diff --git a/cmd/nerdctl/container/container_run_mount_linux_test.go b/cmd/nerdctl/container/run_mount_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_mount_linux_test.go
rename to cmd/nerdctl/container/run_mount_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_mount_windows_test.go b/cmd/nerdctl/container/run_mount_windows_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_mount_windows_test.go
rename to cmd/nerdctl/container/run_mount_windows_test.go
diff --git a/cmd/nerdctl/container/container_run_network.go b/cmd/nerdctl/container/run_network.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_network.go
rename to cmd/nerdctl/container/run_network.go
diff --git a/cmd/nerdctl/container/container_run_network_base_test.go b/cmd/nerdctl/container/run_network_base_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_network_base_test.go
rename to cmd/nerdctl/container/run_network_base_test.go
diff --git a/cmd/nerdctl/container/container_run_network_linux_test.go b/cmd/nerdctl/container/run_network_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_network_linux_test.go
rename to cmd/nerdctl/container/run_network_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_network_windows_test.go b/cmd/nerdctl/container/run_network_windows_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_network_windows_test.go
rename to cmd/nerdctl/container/run_network_windows_test.go
diff --git a/cmd/nerdctl/container/container_run_restart_linux_test.go b/cmd/nerdctl/container/run_restart_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_restart_linux_test.go
rename to cmd/nerdctl/container/run_restart_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_runtime_linux_test.go b/cmd/nerdctl/container/run_runtime_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_runtime_linux_test.go
rename to cmd/nerdctl/container/run_runtime_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_security_linux_test.go b/cmd/nerdctl/container/run_security_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_security_linux_test.go
rename to cmd/nerdctl/container/run_security_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_soci_linux_test.go b/cmd/nerdctl/container/run_soci_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_soci_linux_test.go
rename to cmd/nerdctl/container/run_soci_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_stargz_linux_test.go b/cmd/nerdctl/container/run_stargz_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_stargz_linux_test.go
rename to cmd/nerdctl/container/run_stargz_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_systemd_linux_test.go b/cmd/nerdctl/container/run_systemd_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_systemd_linux_test.go
rename to cmd/nerdctl/container/run_systemd_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_test.go b/cmd/nerdctl/container/run_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_test.go
rename to cmd/nerdctl/container/run_test.go
diff --git a/cmd/nerdctl/container/container_run_user_linux_test.go b/cmd/nerdctl/container/run_user_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_user_linux_test.go
rename to cmd/nerdctl/container/run_user_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_user_windows_test.go b/cmd/nerdctl/container/run_user_windows_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_user_windows_test.go
rename to cmd/nerdctl/container/run_user_windows_test.go
diff --git a/cmd/nerdctl/container/container_run_verify_linux_test.go b/cmd/nerdctl/container/run_verify_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_verify_linux_test.go
rename to cmd/nerdctl/container/run_verify_linux_test.go
diff --git a/cmd/nerdctl/container/container_run_windows.go b/cmd/nerdctl/container/run_windows.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_windows.go
rename to cmd/nerdctl/container/run_windows.go
diff --git a/cmd/nerdctl/container/container_run_windows_test.go b/cmd/nerdctl/container/run_windows_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_run_windows_test.go
rename to cmd/nerdctl/container/run_windows_test.go
diff --git a/cmd/nerdctl/container/container_start.go b/cmd/nerdctl/container/start.go
similarity index 100%
rename from cmd/nerdctl/container/container_start.go
rename to cmd/nerdctl/container/start.go
diff --git a/cmd/nerdctl/container/container_start_linux_test.go b/cmd/nerdctl/container/start_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_start_linux_test.go
rename to cmd/nerdctl/container/start_linux_test.go
diff --git a/cmd/nerdctl/container/container_start_test.go b/cmd/nerdctl/container/start_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_start_test.go
rename to cmd/nerdctl/container/start_test.go
diff --git a/cmd/nerdctl/container/container_stats.go b/cmd/nerdctl/container/stats.go
similarity index 100%
rename from cmd/nerdctl/container/container_stats.go
rename to cmd/nerdctl/container/stats.go
diff --git a/cmd/nerdctl/container/container_stats_test.go b/cmd/nerdctl/container/stats_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_stats_test.go
rename to cmd/nerdctl/container/stats_test.go
diff --git a/cmd/nerdctl/container/container_stop.go b/cmd/nerdctl/container/stop.go
similarity index 100%
rename from cmd/nerdctl/container/container_stop.go
rename to cmd/nerdctl/container/stop.go
diff --git a/cmd/nerdctl/container/container_stop_linux_test.go b/cmd/nerdctl/container/stop_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_stop_linux_test.go
rename to cmd/nerdctl/container/stop_linux_test.go
diff --git a/cmd/nerdctl/container/container_top.go b/cmd/nerdctl/container/top.go
similarity index 100%
rename from cmd/nerdctl/container/container_top.go
rename to cmd/nerdctl/container/top.go
diff --git a/cmd/nerdctl/container/container_top_test.go b/cmd/nerdctl/container/top_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_top_test.go
rename to cmd/nerdctl/container/top_test.go
diff --git a/cmd/nerdctl/container/container_unpause.go b/cmd/nerdctl/container/unpause.go
similarity index 100%
rename from cmd/nerdctl/container/container_unpause.go
rename to cmd/nerdctl/container/unpause.go
diff --git a/cmd/nerdctl/container/container_update.go b/cmd/nerdctl/container/update.go
similarity index 100%
rename from cmd/nerdctl/container/container_update.go
rename to cmd/nerdctl/container/update.go
diff --git a/cmd/nerdctl/container/container_update_linux_test.go b/cmd/nerdctl/container/update_linux_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_update_linux_test.go
rename to cmd/nerdctl/container/update_linux_test.go
diff --git a/cmd/nerdctl/container/container_wait.go b/cmd/nerdctl/container/wait.go
similarity index 100%
rename from cmd/nerdctl/container/container_wait.go
rename to cmd/nerdctl/container/wait.go
diff --git a/cmd/nerdctl/container/container_wait_test.go b/cmd/nerdctl/container/wait_test.go
similarity index 100%
rename from cmd/nerdctl/container/container_wait_test.go
rename to cmd/nerdctl/container/wait_test.go
diff --git a/cmd/nerdctl/image/image.go b/cmd/nerdctl/image/command.go
similarity index 100%
rename from cmd/nerdctl/image/image.go
rename to cmd/nerdctl/image/command.go
diff --git a/cmd/nerdctl/image/image_test.go b/cmd/nerdctl/image/command_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_test.go
rename to cmd/nerdctl/image/command_test.go
diff --git a/cmd/nerdctl/image/image_convert.go b/cmd/nerdctl/image/convert.go
similarity index 100%
rename from cmd/nerdctl/image/image_convert.go
rename to cmd/nerdctl/image/convert.go
diff --git a/cmd/nerdctl/image/image_convert_linux_test.go b/cmd/nerdctl/image/convert_linux_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_convert_linux_test.go
rename to cmd/nerdctl/image/convert_linux_test.go
diff --git a/cmd/nerdctl/image/image_cryptutil.go b/cmd/nerdctl/image/cryptutil.go
similarity index 100%
rename from cmd/nerdctl/image/image_cryptutil.go
rename to cmd/nerdctl/image/cryptutil.go
diff --git a/cmd/nerdctl/image/image_decrypt.go b/cmd/nerdctl/image/decrypt.go
similarity index 100%
rename from cmd/nerdctl/image/image_decrypt.go
rename to cmd/nerdctl/image/decrypt.go
diff --git a/cmd/nerdctl/image/image_encrypt.go b/cmd/nerdctl/image/encrypt.go
similarity index 100%
rename from cmd/nerdctl/image/image_encrypt.go
rename to cmd/nerdctl/image/encrypt.go
diff --git a/cmd/nerdctl/image/image_encrypt_linux_test.go b/cmd/nerdctl/image/encrypt_linux_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_encrypt_linux_test.go
rename to cmd/nerdctl/image/encrypt_linux_test.go
diff --git a/cmd/nerdctl/image/image_history.go b/cmd/nerdctl/image/history.go
similarity index 100%
rename from cmd/nerdctl/image/image_history.go
rename to cmd/nerdctl/image/history.go
diff --git a/cmd/nerdctl/image/image_history_test.go b/cmd/nerdctl/image/history_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_history_test.go
rename to cmd/nerdctl/image/history_test.go
diff --git a/cmd/nerdctl/image/image_inspect.go b/cmd/nerdctl/image/inspect.go
similarity index 100%
rename from cmd/nerdctl/image/image_inspect.go
rename to cmd/nerdctl/image/inspect.go
diff --git a/cmd/nerdctl/image/image_inspect_test.go b/cmd/nerdctl/image/inspect_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_inspect_test.go
rename to cmd/nerdctl/image/inspect_test.go
diff --git a/cmd/nerdctl/image/image_list.go b/cmd/nerdctl/image/list.go
similarity index 100%
rename from cmd/nerdctl/image/image_list.go
rename to cmd/nerdctl/image/list.go
diff --git a/cmd/nerdctl/image/image_list_test.go b/cmd/nerdctl/image/list_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_list_test.go
rename to cmd/nerdctl/image/list_test.go
diff --git a/cmd/nerdctl/image/image_load.go b/cmd/nerdctl/image/load.go
similarity index 100%
rename from cmd/nerdctl/image/image_load.go
rename to cmd/nerdctl/image/load.go
diff --git a/cmd/nerdctl/image/image_load_test.go b/cmd/nerdctl/image/load_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_load_test.go
rename to cmd/nerdctl/image/load_test.go
diff --git a/cmd/nerdctl/image/image_prune.go b/cmd/nerdctl/image/prune.go
similarity index 100%
rename from cmd/nerdctl/image/image_prune.go
rename to cmd/nerdctl/image/prune.go
diff --git a/cmd/nerdctl/image/image_prune_test.go b/cmd/nerdctl/image/prune_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_prune_test.go
rename to cmd/nerdctl/image/prune_test.go
diff --git a/cmd/nerdctl/image/image_pull.go b/cmd/nerdctl/image/pull.go
similarity index 100%
rename from cmd/nerdctl/image/image_pull.go
rename to cmd/nerdctl/image/pull.go
diff --git a/cmd/nerdctl/image/image_pull_linux_test.go b/cmd/nerdctl/image/pull_linux_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_pull_linux_test.go
rename to cmd/nerdctl/image/pull_linux_test.go
diff --git a/cmd/nerdctl/image/image_push.go b/cmd/nerdctl/image/push.go
similarity index 100%
rename from cmd/nerdctl/image/image_push.go
rename to cmd/nerdctl/image/push.go
diff --git a/cmd/nerdctl/image/image_push_linux_test.go b/cmd/nerdctl/image/push_linux_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_push_linux_test.go
rename to cmd/nerdctl/image/push_linux_test.go
diff --git a/cmd/nerdctl/image/image_remove.go b/cmd/nerdctl/image/remove.go
similarity index 100%
rename from cmd/nerdctl/image/image_remove.go
rename to cmd/nerdctl/image/remove.go
diff --git a/cmd/nerdctl/image/image_remove_test.go b/cmd/nerdctl/image/remove_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_remove_test.go
rename to cmd/nerdctl/image/remove_test.go
diff --git a/cmd/nerdctl/image/image_save.go b/cmd/nerdctl/image/save.go
similarity index 100%
rename from cmd/nerdctl/image/image_save.go
rename to cmd/nerdctl/image/save.go
diff --git a/cmd/nerdctl/image/image_save_test.go b/cmd/nerdctl/image/save_test.go
similarity index 100%
rename from cmd/nerdctl/image/image_save_test.go
rename to cmd/nerdctl/image/save_test.go
diff --git a/cmd/nerdctl/image/image_tag.go b/cmd/nerdctl/image/tag.go
similarity index 100%
rename from cmd/nerdctl/image/image_tag.go
rename to cmd/nerdctl/image/tag.go
diff --git a/cmd/nerdctl/inspect/inspect.go b/cmd/nerdctl/inspect/command.go
similarity index 100%
rename from cmd/nerdctl/inspect/inspect.go
rename to cmd/nerdctl/inspect/command.go
diff --git a/cmd/nerdctl/inspect/inspect_test.go b/cmd/nerdctl/inspect/command_test.go
similarity index 100%
rename from cmd/nerdctl/inspect/inspect_test.go
rename to cmd/nerdctl/inspect/command_test.go
diff --git a/cmd/nerdctl/internal/internal.go b/cmd/nerdctl/internal/command.go
similarity index 100%
rename from cmd/nerdctl/internal/internal.go
rename to cmd/nerdctl/internal/command.go
diff --git a/cmd/nerdctl/internal/internal_oci_hook.go b/cmd/nerdctl/internal/oci_hook.go
similarity index 100%
rename from cmd/nerdctl/internal/internal_oci_hook.go
rename to cmd/nerdctl/internal/oci_hook.go
diff --git a/cmd/nerdctl/ipfs/ipfs.go b/cmd/nerdctl/ipfs/command.go
similarity index 100%
rename from cmd/nerdctl/ipfs/ipfs.go
rename to cmd/nerdctl/ipfs/command.go
diff --git a/cmd/nerdctl/ipfs/ipfs_test.go b/cmd/nerdctl/ipfs/command_test.go
similarity index 100%
rename from cmd/nerdctl/ipfs/ipfs_test.go
rename to cmd/nerdctl/ipfs/command_test.go
diff --git a/cmd/nerdctl/ipfs/ipfs_compose_linux_test.go b/cmd/nerdctl/ipfs/compose_linux_test.go
similarity index 100%
rename from cmd/nerdctl/ipfs/ipfs_compose_linux_test.go
rename to cmd/nerdctl/ipfs/compose_linux_test.go
diff --git a/cmd/nerdctl/ipfs/ipfs_kubo_linux_test.go b/cmd/nerdctl/ipfs/kubo_linux_test.go
similarity index 100%
rename from cmd/nerdctl/ipfs/ipfs_kubo_linux_test.go
rename to cmd/nerdctl/ipfs/kubo_linux_test.go
diff --git a/cmd/nerdctl/ipfs/ipfs_registry.go b/cmd/nerdctl/ipfs/registry.go
similarity index 100%
rename from cmd/nerdctl/ipfs/ipfs_registry.go
rename to cmd/nerdctl/ipfs/registry.go
diff --git a/cmd/nerdctl/ipfs/ipfs_registry_linux_test.go b/cmd/nerdctl/ipfs/registry_linux_test.go
similarity index 100%
rename from cmd/nerdctl/ipfs/ipfs_registry_linux_test.go
rename to cmd/nerdctl/ipfs/registry_linux_test.go
diff --git a/cmd/nerdctl/ipfs/ipfs_registry_serve.go b/cmd/nerdctl/ipfs/registry_serve.go
similarity index 100%
rename from cmd/nerdctl/ipfs/ipfs_registry_serve.go
rename to cmd/nerdctl/ipfs/registry_serve.go
diff --git a/cmd/nerdctl/ipfs/ipfs_simple_linux_test.go b/cmd/nerdctl/ipfs/simple_linux_test.go
similarity index 100%
rename from cmd/nerdctl/ipfs/ipfs_simple_linux_test.go
rename to cmd/nerdctl/ipfs/simple_linux_test.go
diff --git a/cmd/nerdctl/issues/issues_linux_test.go b/cmd/nerdctl/issues/linux_test.go
similarity index 100%
rename from cmd/nerdctl/issues/issues_linux_test.go
rename to cmd/nerdctl/issues/linux_test.go
diff --git a/cmd/nerdctl/login/login.go b/cmd/nerdctl/login/command.go
similarity index 100%
rename from cmd/nerdctl/login/login.go
rename to cmd/nerdctl/login/command.go
diff --git a/cmd/nerdctl/login/login_linux_test.go b/cmd/nerdctl/login/command_linux_test.go
similarity index 100%
rename from cmd/nerdctl/login/login_linux_test.go
rename to cmd/nerdctl/login/command_linux_test.go
diff --git a/cmd/nerdctl/login/login_test.go b/cmd/nerdctl/login/command_test.go
similarity index 100%
rename from cmd/nerdctl/login/login_test.go
rename to cmd/nerdctl/login/command_test.go
diff --git a/cmd/nerdctl/namespace/namespace.go b/cmd/nerdctl/namespace/command.go
similarity index 100%
rename from cmd/nerdctl/namespace/namespace.go
rename to cmd/nerdctl/namespace/command.go
diff --git a/cmd/nerdctl/namespace/namespace_test.go b/cmd/nerdctl/namespace/command_test.go
similarity index 100%
rename from cmd/nerdctl/namespace/namespace_test.go
rename to cmd/nerdctl/namespace/command_test.go
diff --git a/cmd/nerdctl/namespace/namespace_create.go b/cmd/nerdctl/namespace/create.go
similarity index 100%
rename from cmd/nerdctl/namespace/namespace_create.go
rename to cmd/nerdctl/namespace/create.go
diff --git a/cmd/nerdctl/namespace/namespace_inspect.go b/cmd/nerdctl/namespace/inspect.go
similarity index 100%
rename from cmd/nerdctl/namespace/namespace_inspect.go
rename to cmd/nerdctl/namespace/inspect.go
diff --git a/cmd/nerdctl/namespace/namespace_remove.go b/cmd/nerdctl/namespace/remove.go
similarity index 100%
rename from cmd/nerdctl/namespace/namespace_remove.go
rename to cmd/nerdctl/namespace/remove.go
diff --git a/cmd/nerdctl/namespace/namespace_update.go b/cmd/nerdctl/namespace/update.go
similarity index 100%
rename from cmd/nerdctl/namespace/namespace_update.go
rename to cmd/nerdctl/namespace/update.go
diff --git a/cmd/nerdctl/network/network.go b/cmd/nerdctl/network/command.go
similarity index 100%
rename from cmd/nerdctl/network/network.go
rename to cmd/nerdctl/network/command.go
diff --git a/cmd/nerdctl/network/network_test.go b/cmd/nerdctl/network/command_test.go
similarity index 100%
rename from cmd/nerdctl/network/network_test.go
rename to cmd/nerdctl/network/command_test.go
diff --git a/cmd/nerdctl/network/network_create.go b/cmd/nerdctl/network/create.go
similarity index 100%
rename from cmd/nerdctl/network/network_create.go
rename to cmd/nerdctl/network/create.go
diff --git a/cmd/nerdctl/network/network_create_linux_test.go b/cmd/nerdctl/network/create_linux_test.go
similarity index 100%
rename from cmd/nerdctl/network/network_create_linux_test.go
rename to cmd/nerdctl/network/create_linux_test.go
diff --git a/cmd/nerdctl/network/network_create_unix.go b/cmd/nerdctl/network/create_unix.go
similarity index 100%
rename from cmd/nerdctl/network/network_create_unix.go
rename to cmd/nerdctl/network/create_unix.go
diff --git a/cmd/nerdctl/network/network_create_windows.go b/cmd/nerdctl/network/create_windows.go
similarity index 100%
rename from cmd/nerdctl/network/network_create_windows.go
rename to cmd/nerdctl/network/create_windows.go
diff --git a/cmd/nerdctl/network/network_inspect.go b/cmd/nerdctl/network/inspect.go
similarity index 100%
rename from cmd/nerdctl/network/network_inspect.go
rename to cmd/nerdctl/network/inspect.go
diff --git a/cmd/nerdctl/network/network_inspect_test.go b/cmd/nerdctl/network/inspect_test.go
similarity index 100%
rename from cmd/nerdctl/network/network_inspect_test.go
rename to cmd/nerdctl/network/inspect_test.go
diff --git a/cmd/nerdctl/network/network_list.go b/cmd/nerdctl/network/list.go
similarity index 100%
rename from cmd/nerdctl/network/network_list.go
rename to cmd/nerdctl/network/list.go
diff --git a/cmd/nerdctl/network/network_list_linux_test.go b/cmd/nerdctl/network/list_linux_test.go
similarity index 100%
rename from cmd/nerdctl/network/network_list_linux_test.go
rename to cmd/nerdctl/network/list_linux_test.go
diff --git a/cmd/nerdctl/network/network_prune.go b/cmd/nerdctl/network/prune.go
similarity index 100%
rename from cmd/nerdctl/network/network_prune.go
rename to cmd/nerdctl/network/prune.go
diff --git a/cmd/nerdctl/network/network_prune_linux_test.go b/cmd/nerdctl/network/prune_linux_test.go
similarity index 100%
rename from cmd/nerdctl/network/network_prune_linux_test.go
rename to cmd/nerdctl/network/prune_linux_test.go
diff --git a/cmd/nerdctl/network/network_remove.go b/cmd/nerdctl/network/remove.go
similarity index 100%
rename from cmd/nerdctl/network/network_remove.go
rename to cmd/nerdctl/network/remove.go
diff --git a/cmd/nerdctl/network/network_remove_linux_test.go b/cmd/nerdctl/network/remove_linux_test.go
similarity index 100%
rename from cmd/nerdctl/network/network_remove_linux_test.go
rename to cmd/nerdctl/network/remove_linux_test.go
diff --git a/cmd/nerdctl/system/system.go b/cmd/nerdctl/system/command.go
similarity index 100%
rename from cmd/nerdctl/system/system.go
rename to cmd/nerdctl/system/command.go
diff --git a/cmd/nerdctl/system/system_test.go b/cmd/nerdctl/system/command_test.go
similarity index 100%
rename from cmd/nerdctl/system/system_test.go
rename to cmd/nerdctl/system/command_test.go
diff --git a/cmd/nerdctl/system/system_events.go b/cmd/nerdctl/system/events.go
similarity index 100%
rename from cmd/nerdctl/system/system_events.go
rename to cmd/nerdctl/system/events.go
diff --git a/cmd/nerdctl/system/system_events_linux_test.go b/cmd/nerdctl/system/events_linux_test.go
similarity index 100%
rename from cmd/nerdctl/system/system_events_linux_test.go
rename to cmd/nerdctl/system/events_linux_test.go
diff --git a/cmd/nerdctl/system/system_info.go b/cmd/nerdctl/system/info.go
similarity index 100%
rename from cmd/nerdctl/system/system_info.go
rename to cmd/nerdctl/system/info.go
diff --git a/cmd/nerdctl/system/system_info_test.go b/cmd/nerdctl/system/info_test.go
similarity index 100%
rename from cmd/nerdctl/system/system_info_test.go
rename to cmd/nerdctl/system/info_test.go
diff --git a/cmd/nerdctl/system/system_prune.go b/cmd/nerdctl/system/prune.go
similarity index 100%
rename from cmd/nerdctl/system/system_prune.go
rename to cmd/nerdctl/system/prune.go
diff --git a/cmd/nerdctl/system/system_prune_linux_test.go b/cmd/nerdctl/system/prune_linux_test.go
similarity index 100%
rename from cmd/nerdctl/system/system_prune_linux_test.go
rename to cmd/nerdctl/system/prune_linux_test.go
diff --git a/cmd/nerdctl/volume/volume.go b/cmd/nerdctl/volume/command.go
similarity index 100%
rename from cmd/nerdctl/volume/volume.go
rename to cmd/nerdctl/volume/command.go
diff --git a/cmd/nerdctl/volume/volume_test.go b/cmd/nerdctl/volume/command_test.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_test.go
rename to cmd/nerdctl/volume/command_test.go
diff --git a/cmd/nerdctl/volume/volume_create.go b/cmd/nerdctl/volume/create.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_create.go
rename to cmd/nerdctl/volume/create.go
diff --git a/cmd/nerdctl/volume/volume_create_test.go b/cmd/nerdctl/volume/create_test.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_create_test.go
rename to cmd/nerdctl/volume/create_test.go
diff --git a/cmd/nerdctl/volume/volume_inspect.go b/cmd/nerdctl/volume/inspect.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_inspect.go
rename to cmd/nerdctl/volume/inspect.go
diff --git a/cmd/nerdctl/volume/volume_inspect_test.go b/cmd/nerdctl/volume/inspect_test.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_inspect_test.go
rename to cmd/nerdctl/volume/inspect_test.go
diff --git a/cmd/nerdctl/volume/volume_list.go b/cmd/nerdctl/volume/list.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_list.go
rename to cmd/nerdctl/volume/list.go
diff --git a/cmd/nerdctl/volume/volume_list_test.go b/cmd/nerdctl/volume/list_test.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_list_test.go
rename to cmd/nerdctl/volume/list_test.go
diff --git a/cmd/nerdctl/volume/volume_namespace_test.go b/cmd/nerdctl/volume/namespace_test.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_namespace_test.go
rename to cmd/nerdctl/volume/namespace_test.go
diff --git a/cmd/nerdctl/volume/volume_prune.go b/cmd/nerdctl/volume/prune.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_prune.go
rename to cmd/nerdctl/volume/prune.go
diff --git a/cmd/nerdctl/volume/volume_prune_linux_test.go b/cmd/nerdctl/volume/prune_linux_test.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_prune_linux_test.go
rename to cmd/nerdctl/volume/prune_linux_test.go
diff --git a/cmd/nerdctl/volume/volume_remove.go b/cmd/nerdctl/volume/remove.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_remove.go
rename to cmd/nerdctl/volume/remove.go
diff --git a/cmd/nerdctl/volume/volume_remove_linux_test.go b/cmd/nerdctl/volume/remove_linux_test.go
similarity index 100%
rename from cmd/nerdctl/volume/volume_remove_linux_test.go
rename to cmd/nerdctl/volume/remove_linux_test.go