diff --git a/cmd/nerdctl/apparmor_ls_linux.go b/cmd/nerdctl/apparmor_list_linux.go
similarity index 100%
rename from cmd/nerdctl/apparmor_ls_linux.go
rename to cmd/nerdctl/apparmor_list_linux.go
diff --git a/cmd/nerdctl/build.go b/cmd/nerdctl/builder_build.go
similarity index 100%
rename from cmd/nerdctl/build.go
rename to cmd/nerdctl/builder_build.go
diff --git a/cmd/nerdctl/build_test.go b/cmd/nerdctl/builder_build_test.go
similarity index 100%
rename from cmd/nerdctl/build_test.go
rename to cmd/nerdctl/builder_build_test.go
diff --git a/cmd/nerdctl/commit.go b/cmd/nerdctl/container_commit.go
similarity index 100%
rename from cmd/nerdctl/commit.go
rename to cmd/nerdctl/container_commit.go
diff --git a/cmd/nerdctl/commit_test.go b/cmd/nerdctl/container_commit_test.go
similarity index 100%
rename from cmd/nerdctl/commit_test.go
rename to cmd/nerdctl/container_commit_test.go
diff --git a/cmd/nerdctl/cp.go b/cmd/nerdctl/container_cp.go
similarity index 100%
rename from cmd/nerdctl/cp.go
rename to cmd/nerdctl/container_cp.go
diff --git a/cmd/nerdctl/cp_linux.go b/cmd/nerdctl/container_cp_linux.go
similarity index 100%
rename from cmd/nerdctl/cp_linux.go
rename to cmd/nerdctl/container_cp_linux.go
diff --git a/cmd/nerdctl/cp_linux_test.go b/cmd/nerdctl/container_cp_linux_test.go
similarity index 100%
rename from cmd/nerdctl/cp_linux_test.go
rename to cmd/nerdctl/container_cp_linux_test.go
diff --git a/cmd/nerdctl/create.go b/cmd/nerdctl/container_create.go
similarity index 100%
rename from cmd/nerdctl/create.go
rename to cmd/nerdctl/container_create.go
diff --git a/cmd/nerdctl/create_linux_test.go b/cmd/nerdctl/container_create_linux_test.go
similarity index 100%
rename from cmd/nerdctl/create_linux_test.go
rename to cmd/nerdctl/container_create_linux_test.go
diff --git a/cmd/nerdctl/exec.go b/cmd/nerdctl/container_exec.go
similarity index 100%
rename from cmd/nerdctl/exec.go
rename to cmd/nerdctl/container_exec.go
diff --git a/cmd/nerdctl/exec_freebsd.go b/cmd/nerdctl/container_exec_freebsd.go
similarity index 100%
rename from cmd/nerdctl/exec_freebsd.go
rename to cmd/nerdctl/container_exec_freebsd.go
diff --git a/cmd/nerdctl/exec_linux.go b/cmd/nerdctl/container_exec_linux.go
similarity index 100%
rename from cmd/nerdctl/exec_linux.go
rename to cmd/nerdctl/container_exec_linux.go
diff --git a/cmd/nerdctl/exec_linux_test.go b/cmd/nerdctl/container_exec_linux_test.go
similarity index 100%
rename from cmd/nerdctl/exec_linux_test.go
rename to cmd/nerdctl/container_exec_linux_test.go
diff --git a/cmd/nerdctl/exec_test.go b/cmd/nerdctl/container_exec_test.go
similarity index 100%
rename from cmd/nerdctl/exec_test.go
rename to cmd/nerdctl/container_exec_test.go
diff --git a/cmd/nerdctl/exec_windows.go b/cmd/nerdctl/container_exec_windows.go
similarity index 100%
rename from cmd/nerdctl/exec_windows.go
rename to cmd/nerdctl/container_exec_windows.go
diff --git a/cmd/nerdctl/kill.go b/cmd/nerdctl/container_kill.go
similarity index 100%
rename from cmd/nerdctl/kill.go
rename to cmd/nerdctl/container_kill.go
diff --git a/cmd/nerdctl/ps.go b/cmd/nerdctl/container_list.go
similarity index 100%
rename from cmd/nerdctl/ps.go
rename to cmd/nerdctl/container_list.go
diff --git a/cmd/nerdctl/ps_linux_test.go b/cmd/nerdctl/container_list_linux_test.go
similarity index 100%
rename from cmd/nerdctl/ps_linux_test.go
rename to cmd/nerdctl/container_list_linux_test.go
diff --git a/cmd/nerdctl/container_lsutil.go b/cmd/nerdctl/container_list_util.go
similarity index 100%
rename from cmd/nerdctl/container_lsutil.go
rename to cmd/nerdctl/container_list_util.go
diff --git a/cmd/nerdctl/pause.go b/cmd/nerdctl/container_pause.go
similarity index 100%
rename from cmd/nerdctl/pause.go
rename to cmd/nerdctl/container_pause.go
diff --git a/cmd/nerdctl/port.go b/cmd/nerdctl/container_port.go
similarity index 100%
rename from cmd/nerdctl/port.go
rename to cmd/nerdctl/container_port.go
diff --git a/cmd/nerdctl/rm.go b/cmd/nerdctl/container_remove.go
similarity index 100%
rename from cmd/nerdctl/rm.go
rename to cmd/nerdctl/container_remove.go
diff --git a/cmd/nerdctl/rm_linux_test.go b/cmd/nerdctl/container_remove_linux_test.go
similarity index 100%
rename from cmd/nerdctl/rm_linux_test.go
rename to cmd/nerdctl/container_remove_linux_test.go
diff --git a/cmd/nerdctl/rename.go b/cmd/nerdctl/container_rename.go
similarity index 100%
rename from cmd/nerdctl/rename.go
rename to cmd/nerdctl/container_rename.go
diff --git a/cmd/nerdctl/rename_linux_test.go b/cmd/nerdctl/container_rename_linux_test.go
similarity index 100%
rename from cmd/nerdctl/rename_linux_test.go
rename to cmd/nerdctl/container_rename_linux_test.go
diff --git a/cmd/nerdctl/restart.go b/cmd/nerdctl/container_restart.go
similarity index 100%
rename from cmd/nerdctl/restart.go
rename to cmd/nerdctl/container_restart.go
diff --git a/cmd/nerdctl/restart_linux_test.go b/cmd/nerdctl/container_restart_linux_test.go
similarity index 100%
rename from cmd/nerdctl/restart_linux_test.go
rename to cmd/nerdctl/container_restart_linux_test.go
diff --git a/cmd/nerdctl/run.go b/cmd/nerdctl/container_run.go
similarity index 100%
rename from cmd/nerdctl/run.go
rename to cmd/nerdctl/container_run.go
diff --git a/cmd/nerdctl/run_cgroup_freebsd.go b/cmd/nerdctl/container_run_cgroup_freebsd.go
similarity index 100%
rename from cmd/nerdctl/run_cgroup_freebsd.go
rename to cmd/nerdctl/container_run_cgroup_freebsd.go
diff --git a/cmd/nerdctl/run_cgroup_linux.go b/cmd/nerdctl/container_run_cgroup_linux.go
similarity index 100%
rename from cmd/nerdctl/run_cgroup_linux.go
rename to cmd/nerdctl/container_run_cgroup_linux.go
diff --git a/cmd/nerdctl/run_cgroup_linux_test.go b/cmd/nerdctl/container_run_cgroup_linux_test.go
similarity index 100%
rename from cmd/nerdctl/run_cgroup_linux_test.go
rename to cmd/nerdctl/container_run_cgroup_linux_test.go
diff --git a/cmd/nerdctl/run_cgroup_windows.go b/cmd/nerdctl/container_run_cgroup_windows.go
similarity index 100%
rename from cmd/nerdctl/run_cgroup_windows.go
rename to cmd/nerdctl/container_run_cgroup_windows.go
diff --git a/cmd/nerdctl/run_freebsd.go b/cmd/nerdctl/container_run_freebsd.go
similarity index 100%
rename from cmd/nerdctl/run_freebsd.go
rename to cmd/nerdctl/container_run_freebsd.go
diff --git a/cmd/nerdctl/run_gpus.go b/cmd/nerdctl/container_run_gpus.go
similarity index 100%
rename from cmd/nerdctl/run_gpus.go
rename to cmd/nerdctl/container_run_gpus.go
diff --git a/cmd/nerdctl/run_gpus_test.go b/cmd/nerdctl/container_run_gpus_test.go
similarity index 100%
rename from cmd/nerdctl/run_gpus_test.go
rename to cmd/nerdctl/container_run_gpus_test.go
diff --git a/cmd/nerdctl/run_linux.go b/cmd/nerdctl/container_run_linux.go
similarity index 100%
rename from cmd/nerdctl/run_linux.go
rename to cmd/nerdctl/container_run_linux.go
diff --git a/cmd/nerdctl/run_linux_test.go b/cmd/nerdctl/container_run_linux_test.go
similarity index 100%
rename from cmd/nerdctl/run_linux_test.go
rename to cmd/nerdctl/container_run_linux_test.go
diff --git a/cmd/nerdctl/run_log_driver_syslog_test.go b/cmd/nerdctl/container_run_log_driver_syslog_test.go
similarity index 100%
rename from cmd/nerdctl/run_log_driver_syslog_test.go
rename to cmd/nerdctl/container_run_log_driver_syslog_test.go
diff --git a/cmd/nerdctl/run_mount.go b/cmd/nerdctl/container_run_mount.go
similarity index 100%
rename from cmd/nerdctl/run_mount.go
rename to cmd/nerdctl/container_run_mount.go
diff --git a/cmd/nerdctl/run_mount_linux_test.go b/cmd/nerdctl/container_run_mount_linux_test.go
similarity index 100%
rename from cmd/nerdctl/run_mount_linux_test.go
rename to cmd/nerdctl/container_run_mount_linux_test.go
diff --git a/cmd/nerdctl/run_network.go b/cmd/nerdctl/container_run_network.go
similarity index 100%
rename from cmd/nerdctl/run_network.go
rename to cmd/nerdctl/container_run_network.go
diff --git a/cmd/nerdctl/run_network_linux_test.go b/cmd/nerdctl/container_run_network_linux_test.go
similarity index 100%
rename from cmd/nerdctl/run_network_linux_test.go
rename to cmd/nerdctl/container_run_network_linux_test.go
diff --git a/cmd/nerdctl/run_restart.go b/cmd/nerdctl/container_run_restart.go
similarity index 100%
rename from cmd/nerdctl/run_restart.go
rename to cmd/nerdctl/container_run_restart.go
diff --git a/cmd/nerdctl/run_restart_linux_test.go b/cmd/nerdctl/container_run_restart_linux_test.go
similarity index 100%
rename from cmd/nerdctl/run_restart_linux_test.go
rename to cmd/nerdctl/container_run_restart_linux_test.go
diff --git a/cmd/nerdctl/run_runtime.go b/cmd/nerdctl/container_run_runtime.go
similarity index 100%
rename from cmd/nerdctl/run_runtime.go
rename to cmd/nerdctl/container_run_runtime.go
diff --git a/cmd/nerdctl/run_runtime_linux_test.go b/cmd/nerdctl/container_run_runtime_linux_test.go
similarity index 100%
rename from cmd/nerdctl/run_runtime_linux_test.go
rename to cmd/nerdctl/container_run_runtime_linux_test.go
diff --git a/cmd/nerdctl/run_security_linux.go b/cmd/nerdctl/container_run_security_linux.go
similarity index 100%
rename from cmd/nerdctl/run_security_linux.go
rename to cmd/nerdctl/container_run_security_linux.go
diff --git a/cmd/nerdctl/run_security_linux_test.go b/cmd/nerdctl/container_run_security_linux_test.go
similarity index 100%
rename from cmd/nerdctl/run_security_linux_test.go
rename to cmd/nerdctl/container_run_security_linux_test.go
diff --git a/cmd/nerdctl/run_stargz_linux_test.go b/cmd/nerdctl/container_run_stargz_linux_test.go
similarity index 100%
rename from cmd/nerdctl/run_stargz_linux_test.go
rename to cmd/nerdctl/container_run_stargz_linux_test.go
diff --git a/cmd/nerdctl/run_test.go b/cmd/nerdctl/container_run_test.go
similarity index 100%
rename from cmd/nerdctl/run_test.go
rename to cmd/nerdctl/container_run_test.go
diff --git a/cmd/nerdctl/run_ulimit.go b/cmd/nerdctl/container_run_ulimit.go
similarity index 100%
rename from cmd/nerdctl/run_ulimit.go
rename to cmd/nerdctl/container_run_ulimit.go
diff --git a/cmd/nerdctl/run_user.go b/cmd/nerdctl/container_run_user.go
similarity index 100%
rename from cmd/nerdctl/run_user.go
rename to cmd/nerdctl/container_run_user.go
diff --git a/cmd/nerdctl/run_user_linux_test.go b/cmd/nerdctl/container_run_user_linux_test.go
similarity index 100%
rename from cmd/nerdctl/run_user_linux_test.go
rename to cmd/nerdctl/container_run_user_linux_test.go
diff --git a/cmd/nerdctl/run_user_windows_test.go b/cmd/nerdctl/container_run_user_windows_test.go
similarity index 100%
rename from cmd/nerdctl/run_user_windows_test.go
rename to cmd/nerdctl/container_run_user_windows_test.go
diff --git a/cmd/nerdctl/run_verify_linux_test.go b/cmd/nerdctl/container_run_verify_linux_test.go
similarity index 100%
rename from cmd/nerdctl/run_verify_linux_test.go
rename to cmd/nerdctl/container_run_verify_linux_test.go
diff --git a/cmd/nerdctl/run_windows.go b/cmd/nerdctl/container_run_windows.go
similarity index 100%
rename from cmd/nerdctl/run_windows.go
rename to cmd/nerdctl/container_run_windows.go
diff --git a/cmd/nerdctl/run_windows_test.go b/cmd/nerdctl/container_run_windows_test.go
similarity index 100%
rename from cmd/nerdctl/run_windows_test.go
rename to cmd/nerdctl/container_run_windows_test.go
diff --git a/cmd/nerdctl/start.go b/cmd/nerdctl/container_start.go
similarity index 100%
rename from cmd/nerdctl/start.go
rename to cmd/nerdctl/container_start.go
diff --git a/cmd/nerdctl/start_test.go b/cmd/nerdctl/container_start_test.go
similarity index 100%
rename from cmd/nerdctl/start_test.go
rename to cmd/nerdctl/container_start_test.go
diff --git a/cmd/nerdctl/stats.go b/cmd/nerdctl/container_stats.go
similarity index 100%
rename from cmd/nerdctl/stats.go
rename to cmd/nerdctl/container_stats.go
diff --git a/cmd/nerdctl/stats_freebsd.go b/cmd/nerdctl/container_stats_freebsd.go
similarity index 100%
rename from cmd/nerdctl/stats_freebsd.go
rename to cmd/nerdctl/container_stats_freebsd.go
diff --git a/cmd/nerdctl/stats_linux.go b/cmd/nerdctl/container_stats_linux.go
similarity index 100%
rename from cmd/nerdctl/stats_linux.go
rename to cmd/nerdctl/container_stats_linux.go
diff --git a/cmd/nerdctl/stats_linux_test.go b/cmd/nerdctl/container_stats_linux_test.go
similarity index 100%
rename from cmd/nerdctl/stats_linux_test.go
rename to cmd/nerdctl/container_stats_linux_test.go
diff --git a/cmd/nerdctl/stats_windows.go b/cmd/nerdctl/container_stats_windows.go
similarity index 100%
rename from cmd/nerdctl/stats_windows.go
rename to cmd/nerdctl/container_stats_windows.go
diff --git a/cmd/nerdctl/top.go b/cmd/nerdctl/container_top.go
similarity index 100%
rename from cmd/nerdctl/top.go
rename to cmd/nerdctl/container_top.go
diff --git a/cmd/nerdctl/top_linux_test.go b/cmd/nerdctl/container_top_linux_test.go
similarity index 100%
rename from cmd/nerdctl/top_linux_test.go
rename to cmd/nerdctl/container_top_linux_test.go
diff --git a/cmd/nerdctl/unpause.go b/cmd/nerdctl/container_unpause.go
similarity index 100%
rename from cmd/nerdctl/unpause.go
rename to cmd/nerdctl/container_unpause.go
diff --git a/cmd/nerdctl/update.go b/cmd/nerdctl/container_update.go
similarity index 100%
rename from cmd/nerdctl/update.go
rename to cmd/nerdctl/container_update.go
diff --git a/cmd/nerdctl/wait.go b/cmd/nerdctl/container_wait.go
similarity index 100%
rename from cmd/nerdctl/wait.go
rename to cmd/nerdctl/container_wait.go
diff --git a/cmd/nerdctl/wait_test.go b/cmd/nerdctl/container_wait_test.go
similarity index 100%
rename from cmd/nerdctl/wait_test.go
rename to cmd/nerdctl/container_wait_test.go
diff --git a/cmd/nerdctl/history.go b/cmd/nerdctl/image_history.go
similarity index 100%
rename from cmd/nerdctl/history.go
rename to cmd/nerdctl/image_history.go
diff --git a/cmd/nerdctl/images.go b/cmd/nerdctl/image_list.go
similarity index 100%
rename from cmd/nerdctl/images.go
rename to cmd/nerdctl/image_list.go
diff --git a/cmd/nerdctl/images_test.go b/cmd/nerdctl/image_list_test.go
similarity index 100%
rename from cmd/nerdctl/images_test.go
rename to cmd/nerdctl/image_list_test.go
diff --git a/cmd/nerdctl/load.go b/cmd/nerdctl/image_load.go
similarity index 100%
rename from cmd/nerdctl/load.go
rename to cmd/nerdctl/image_load.go
diff --git a/cmd/nerdctl/load_linux_test.go b/cmd/nerdctl/image_load_linux_test.go
similarity index 100%
rename from cmd/nerdctl/load_linux_test.go
rename to cmd/nerdctl/image_load_linux_test.go
diff --git a/cmd/nerdctl/pull.go b/cmd/nerdctl/image_pull.go
similarity index 100%
rename from cmd/nerdctl/pull.go
rename to cmd/nerdctl/image_pull.go
diff --git a/cmd/nerdctl/pull_linux_test.go b/cmd/nerdctl/image_pull_linux_test.go
similarity index 100%
rename from cmd/nerdctl/pull_linux_test.go
rename to cmd/nerdctl/image_pull_linux_test.go
diff --git a/cmd/nerdctl/push.go b/cmd/nerdctl/image_push.go
similarity index 100%
rename from cmd/nerdctl/push.go
rename to cmd/nerdctl/image_push.go
diff --git a/cmd/nerdctl/push_linux_test.go b/cmd/nerdctl/image_push_linux_test.go
similarity index 100%
rename from cmd/nerdctl/push_linux_test.go
rename to cmd/nerdctl/image_push_linux_test.go
diff --git a/cmd/nerdctl/rmi.go b/cmd/nerdctl/image_remove.go
similarity index 100%
rename from cmd/nerdctl/rmi.go
rename to cmd/nerdctl/image_remove.go
diff --git a/cmd/nerdctl/rmi_linux_test.go b/cmd/nerdctl/image_remove_linux_test.go
similarity index 100%
rename from cmd/nerdctl/rmi_linux_test.go
rename to cmd/nerdctl/image_remove_linux_test.go
diff --git a/cmd/nerdctl/save.go b/cmd/nerdctl/image_save.go
similarity index 100%
rename from cmd/nerdctl/save.go
rename to cmd/nerdctl/image_save.go
diff --git a/cmd/nerdctl/save_linux_test.go b/cmd/nerdctl/image_save_linux_test.go
similarity index 100%
rename from cmd/nerdctl/save_linux_test.go
rename to cmd/nerdctl/image_save_linux_test.go
diff --git a/cmd/nerdctl/save_test.go b/cmd/nerdctl/image_save_test.go
similarity index 100%
rename from cmd/nerdctl/save_test.go
rename to cmd/nerdctl/image_save_test.go
diff --git a/cmd/nerdctl/namespace_rm.go b/cmd/nerdctl/namespace_remove.go
similarity index 100%
rename from cmd/nerdctl/namespace_rm.go
rename to cmd/nerdctl/namespace_remove.go
diff --git a/cmd/nerdctl/network_ls.go b/cmd/nerdctl/network_list.go
similarity index 100%
rename from cmd/nerdctl/network_ls.go
rename to cmd/nerdctl/network_list.go
diff --git a/cmd/nerdctl/network_rm.go b/cmd/nerdctl/network_remove.go
similarity index 100%
rename from cmd/nerdctl/network_rm.go
rename to cmd/nerdctl/network_remove.go
diff --git a/cmd/nerdctl/network_rm_linux_test.go b/cmd/nerdctl/network_remove_linux_test.go
similarity index 100%
rename from cmd/nerdctl/network_rm_linux_test.go
rename to cmd/nerdctl/network_remove_linux_test.go
diff --git a/cmd/nerdctl/events.go b/cmd/nerdctl/system_events.go
similarity index 100%
rename from cmd/nerdctl/events.go
rename to cmd/nerdctl/system_events.go
diff --git a/cmd/nerdctl/info.go b/cmd/nerdctl/system_info.go
similarity index 100%
rename from cmd/nerdctl/info.go
rename to cmd/nerdctl/system_info.go
diff --git a/cmd/nerdctl/info_test.go b/cmd/nerdctl/system_info_test.go
similarity index 100%
rename from cmd/nerdctl/info_test.go
rename to cmd/nerdctl/system_info_test.go
diff --git a/cmd/nerdctl/volume_ls.go b/cmd/nerdctl/volume_list.go
similarity index 100%
rename from cmd/nerdctl/volume_ls.go
rename to cmd/nerdctl/volume_list.go
diff --git a/cmd/nerdctl/volume_ls_test.go b/cmd/nerdctl/volume_list_test.go
similarity index 100%
rename from cmd/nerdctl/volume_ls_test.go
rename to cmd/nerdctl/volume_list_test.go
diff --git a/cmd/nerdctl/volume_rm.go b/cmd/nerdctl/volume_remove.go
similarity index 100%
rename from cmd/nerdctl/volume_rm.go
rename to cmd/nerdctl/volume_remove.go
diff --git a/cmd/nerdctl/volume_rm_linux_test.go b/cmd/nerdctl/volume_remove_linux_test.go
similarity index 100%
rename from cmd/nerdctl/volume_rm_linux_test.go
rename to cmd/nerdctl/volume_remove_linux_test.go