diff --git a/app/Bus/Commands/User/AddTeamMemberCommand.php b/app/Bus/Commands/User/AddUserCommand.php
similarity index 91%
rename from app/Bus/Commands/User/AddTeamMemberCommand.php
rename to app/Bus/Commands/User/AddUserCommand.php
index 655b73427c0e..1044f07434bc 100644
--- a/app/Bus/Commands/User/AddTeamMemberCommand.php
+++ b/app/Bus/Commands/User/AddUserCommand.php
@@ -11,7 +11,12 @@
 
 namespace CachetHQ\Cachet\Bus\Commands\User;
 
-final class AddTeamMemberCommand
+/**
+ * This is the add user command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+final class AddUserCommand
 {
     /**
      * The user username.
diff --git a/app/Bus/Commands/User/InviteTeamMemberCommand.php b/app/Bus/Commands/User/InviteUserCommand.php
similarity index 79%
rename from app/Bus/Commands/User/InviteTeamMemberCommand.php
rename to app/Bus/Commands/User/InviteUserCommand.php
index 7fd4b5dfd8a1..2585f09518e5 100644
--- a/app/Bus/Commands/User/InviteTeamMemberCommand.php
+++ b/app/Bus/Commands/User/InviteUserCommand.php
@@ -11,7 +11,12 @@
 
 namespace CachetHQ\Cachet\Bus\Commands\User;
 
-final class InviteTeamMemberCommand
+/**
+ * This is the invite user command.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+final class InviteUserCommand
 {
     /**
      * The invite emails.
@@ -30,7 +35,7 @@ final class InviteTeamMemberCommand
     ];
 
     /**
-     * Create a new invite team member command instance.
+     * Create a new invite user command instance.
      *
      * @param string[] $emails
      *
diff --git a/app/Bus/Handlers/Commands/User/AddTeamMemberCommandHandler.php b/app/Bus/Handlers/Commands/User/AddUserCommandHandler.php
similarity index 68%
rename from app/Bus/Handlers/Commands/User/AddTeamMemberCommandHandler.php
rename to app/Bus/Handlers/Commands/User/AddUserCommandHandler.php
index ff87e2091f32..856e33bbb0d7 100644
--- a/app/Bus/Handlers/Commands/User/AddTeamMemberCommandHandler.php
+++ b/app/Bus/Handlers/Commands/User/AddUserCommandHandler.php
@@ -11,20 +11,25 @@
 
 namespace CachetHQ\Cachet\Bus\Handlers\Commands\User;
 
-use CachetHQ\Cachet\Bus\Commands\User\AddTeamMemberCommand;
+use CachetHQ\Cachet\Bus\Commands\User\AddUserCommand;
 use CachetHQ\Cachet\Bus\Events\User\UserWasAddedEvent;
 use CachetHQ\Cachet\Models\User;
 
-class AddTeamMemberCommandHandler
+/**
+ * This is the add user command handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class AddUserCommandHandler
 {
     /**
-     * Handle the add team member command.
+     * Handle the add user command.
      *
-     * @param \CachetHQ\Cachet\Bus\Commands\User\AddTeamMemberCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\User\AddUserCommand $command
      *
      * @return \CachetHQ\Cachet\Models\User
      */
-    public function handle(AddTeamMemberCommand $command)
+    public function handle(AddUserCommand $command)
     {
         $user = User::create([
             'username' => $command->username,
diff --git a/app/Bus/Handlers/Commands/User/InviteTeamMemberCommandHandler.php b/app/Bus/Handlers/Commands/User/InviteUserCommandHandler.php
similarity index 67%
rename from app/Bus/Handlers/Commands/User/InviteTeamMemberCommandHandler.php
rename to app/Bus/Handlers/Commands/User/InviteUserCommandHandler.php
index 77eebe6579e2..fc515d5e6c1c 100644
--- a/app/Bus/Handlers/Commands/User/InviteTeamMemberCommandHandler.php
+++ b/app/Bus/Handlers/Commands/User/InviteUserCommandHandler.php
@@ -11,20 +11,25 @@
 
 namespace CachetHQ\Cachet\Bus\Handlers\Commands\User;
 
-use CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand;
+use CachetHQ\Cachet\Bus\Commands\User\InviteUserCommand;
 use CachetHQ\Cachet\Bus\Events\User\UserWasInvitedEvent;
 use CachetHQ\Cachet\Models\Invite;
 
-class InviteTeamMemberCommandHandler
+/**
+ * This is the invite user command handler.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class InviteUserCommandHandler
 {
     /**
      * Handle the invite team member command.
      *
-     * @param \CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand $command
+     * @param \CachetHQ\Cachet\Bus\Commands\User\InviteUserCommand $command
      *
      * @return void
      */
-    public function handle(InviteTeamMemberCommand $command)
+    public function handle(InviteUserCommand $command)
     {
         foreach ($command->emails as $email) {
             $invite = Invite::create([
diff --git a/app/Http/Controllers/Dashboard/TeamController.php b/app/Http/Controllers/Dashboard/TeamController.php
index 1786adc2de91..86715dd8f59e 100644
--- a/app/Http/Controllers/Dashboard/TeamController.php
+++ b/app/Http/Controllers/Dashboard/TeamController.php
@@ -12,8 +12,8 @@
 namespace CachetHQ\Cachet\Http\Controllers\Dashboard;
 
 use AltThree\Validator\ValidationException;
-use CachetHQ\Cachet\Bus\Commands\User\AddTeamMemberCommand;
-use CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand;
+use CachetHQ\Cachet\Bus\Commands\User\AddUserCommand;
+use CachetHQ\Cachet\Bus\Commands\User\InviteUserCommand;
 use CachetHQ\Cachet\Bus\Commands\User\RemoveUserCommand;
 use CachetHQ\Cachet\Models\User;
 use GrahamCampbell\Binput\Facades\Binput;
@@ -81,7 +81,7 @@ public function showInviteTeamMemberView()
     public function postAddUser()
     {
         try {
-            dispatch(new AddTeamMemberCommand(
+            dispatch(new AddUserCommand(
                 Binput::get('username'),
                 Binput::get('password'),
                 Binput::get('email'),
@@ -130,7 +130,7 @@ public function postUpdateUser(User $user)
     public function postInviteUser()
     {
         try {
-            dispatch(new InviteTeamMemberCommand(
+            dispatch(new InviteUserCommand(
                 array_unique(array_filter((array) Binput::get('emails')))
             ));
         } catch (ValidationException $e) {
diff --git a/tests/Bus/Commands/User/AddTeamMemberCommandTest.php b/tests/Bus/Commands/User/AddUserCommandTest.php
similarity index 75%
rename from tests/Bus/Commands/User/AddTeamMemberCommandTest.php
rename to tests/Bus/Commands/User/AddUserCommandTest.php
index ccc580322e37..83ee9e7eb917 100644
--- a/tests/Bus/Commands/User/AddTeamMemberCommandTest.php
+++ b/tests/Bus/Commands/User/AddUserCommandTest.php
@@ -12,17 +12,17 @@
 namespace CachetHQ\Tests\Cachet\Bus\Commands\User;
 
 use AltThree\TestBench\CommandTrait;
-use CachetHQ\Cachet\Bus\Commands\User\AddTeamMemberCommand;
-use CachetHQ\Cachet\Bus\Handlers\Commands\User\AddTeamMemberCommandHandler;
+use CachetHQ\Cachet\Bus\Commands\User\AddUserCommand;
+use CachetHQ\Cachet\Bus\Handlers\Commands\User\AddUserCommandHandler;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
 
 /**
- * This is the add team member command test class.
+ * This is the add user command test class.
  *
  * @author James Brooks <james@alt-three.com>
  * @author Graham Campbell <graham@alt-three.com>
  */
-class AddTeamMemberCommandTest extends AbstractTestCase
+class AddUserCommandTest extends AbstractTestCase
 {
     use CommandTrait;
 
@@ -35,7 +35,7 @@ protected function getObjectAndParams()
             'level'    => 1,
         ];
 
-        $object = new AddTeamMemberCommand(
+        $object = new AddUserCommand(
             $params['username'],
             $params['password'],
             $params['email'],
@@ -52,6 +52,6 @@ protected function objectHasRules()
 
     protected function getHandlerClass()
     {
-        return AddTeamMemberCommandHandler::class;
+        return AddUserCommandHandler::class;
     }
 }
diff --git a/tests/Bus/Commands/User/InviteTeamMemberCommandTest.php b/tests/Bus/Commands/User/InviteUserCommandTest.php
similarity index 65%
rename from tests/Bus/Commands/User/InviteTeamMemberCommandTest.php
rename to tests/Bus/Commands/User/InviteUserCommandTest.php
index 53c18a495e8a..9d60aa145966 100644
--- a/tests/Bus/Commands/User/InviteTeamMemberCommandTest.php
+++ b/tests/Bus/Commands/User/InviteUserCommandTest.php
@@ -12,23 +12,24 @@
 namespace CachetHQ\Tests\Cachet\Bus\Commands\User;
 
 use AltThree\TestBench\CommandTrait;
-use CachetHQ\Cachet\Bus\Commands\User\InviteTeamMemberCommand;
-use CachetHQ\Cachet\Bus\Handlers\Commands\User\InviteTeamMemberCommandHandler;
+use CachetHQ\Cachet\Bus\Commands\User\InviteUserCommand;
+use CachetHQ\Cachet\Bus\Handlers\Commands\User\InviteUserCommandHandler;
 use CachetHQ\Tests\Cachet\AbstractTestCase;
 
 /**
- * This is the invite team member command test class.
+ * This is the invite user command test class.
  *
  * @author Graham Campbell <graham@alt-three.com>
+ * @author James Brooks <graham@alt-three.com>
  */
-class InviteTeamMemberCommandTest extends AbstractTestCase
+class InviteUserCommandTest extends AbstractTestCase
 {
     use CommandTrait;
 
     protected function getObjectAndParams()
     {
         $params = ['emails' => ['foo@example.com']];
-        $object = new InviteTeamMemberCommand($params['emails']);
+        $object = new InviteUserCommand($params['emails']);
 
         return compact('params', 'object');
     }
@@ -40,6 +41,6 @@ protected function objectHasRules()
 
     protected function getHandlerClass()
     {
-        return InviteTeamMemberCommandHandler::class;
+        return InviteUserCommandHandler::class;
     }
 }