diff --git a/packages/cli/src/commands/sign_in.rs b/packages/cli/src/commands/login.rs
similarity index 95%
rename from packages/cli/src/commands/sign_in.rs
rename to packages/cli/src/commands/login.rs
index 860c1806..a94b22eb 100644
--- a/packages/cli/src/commands/sign_in.rs
+++ b/packages/cli/src/commands/login.rs
@@ -22,7 +22,7 @@ impl Opts {
 		{
 			Ok(output) => {
 				if output.signed_in {
-					eprintln!("Already logged in. Sign out with `rivet logout`.");
+					eprintln!("Already logged in. Log out with `rivet logout`.");
 					return ExitCode::SUCCESS;
 				}
 			}
diff --git a/packages/cli/src/commands/sign_out.rs b/packages/cli/src/commands/logout.rs
similarity index 100%
rename from packages/cli/src/commands/sign_out.rs
rename to packages/cli/src/commands/logout.rs
diff --git a/packages/cli/src/commands/mod.rs b/packages/cli/src/commands/mod.rs
index cc2c1912..d9845242 100644
--- a/packages/cli/src/commands/mod.rs
+++ b/packages/cli/src/commands/mod.rs
@@ -3,10 +3,10 @@ pub mod build;
 pub mod deploy;
 pub mod environment;
 pub mod init;
+pub mod login;
+pub mod logout;
 pub mod metadata;
 pub mod region;
-pub mod sign_in;
-pub mod sign_out;
 
 use clap::Parser;
 use std::process::ExitCode;
@@ -14,10 +14,10 @@ use std::process::ExitCode;
 #[derive(Parser)]
 pub enum SubCommand {
 	Init(init::Opts),
-	#[clap(alias = "login")]
-	Signin(sign_in::Opts),
-	#[clap(alias = "logout")]
-	Signout(sign_out::Opts),
+	#[clap(alias = "signin")]
+	Login(login::Opts),
+	#[clap(alias = "signout")]
+	Logout(logout::Opts),
 	#[clap(alias = "d")]
 	Deploy(deploy::Opts),
 	#[clap(alias = "e", alias = "env")]
@@ -50,8 +50,8 @@ impl SubCommand {
 	pub async fn execute(&self) -> ExitCode {
 		match self {
 			SubCommand::Init(opts) => opts.execute().await,
-			SubCommand::Signin(opts) => opts.execute().await,
-			SubCommand::Signout(opts) => opts.execute().await,
+			SubCommand::Login(opts) => opts.execute().await,
+			SubCommand::Logout(opts) => opts.execute().await,
 			SubCommand::Deploy(opts) => opts.execute().await,
 			SubCommand::Environment { subcommand } => subcommand.execute().await,
 			SubCommand::Actor { subcommand } => subcommand.execute().await,