diff --git a/e2e/e2e.go b/e2e/e2e.go
index eadd88e3e0..d09ecab57b 100644
--- a/e2e/e2e.go
+++ b/e2e/e2e.go
@@ -166,7 +166,7 @@ func getAtlantisStatus(t *E2ETester, branchName string) (string, error) {
 	}
 
 	for _, status := range combinedStatus.Statuses {
-		if status.GetContext() == "plan/atlantis" {
+		if status.GetContext() == "atlantis/plan" {
 			return status.GetState(), nil
 		}
 	}
diff --git a/server/events/commit_status_updater.go b/server/events/commit_status_updater.go
index c142155c7c..ca4547f2b6 100644
--- a/server/events/commit_status_updater.go
+++ b/server/events/commit_status_updater.go
@@ -43,7 +43,7 @@ type DefaultCommitStatusUpdater struct {
 }
 
 func (d *DefaultCommitStatusUpdater) UpdateCombined(repo models.Repo, pull models.PullRequest, status models.CommitStatus, command models.CommandName) error {
-	src := fmt.Sprintf("%s/atlantis", command.String())
+	src := fmt.Sprintf("atlantis/%s", command.String())
 	var descripWords string
 	switch status {
 	case models.PendingCommitStatus:
@@ -58,7 +58,7 @@ func (d *DefaultCommitStatusUpdater) UpdateCombined(repo models.Repo, pull model
 }
 
 func (d *DefaultCommitStatusUpdater) UpdateCombinedCount(repo models.Repo, pull models.PullRequest, status models.CommitStatus, command models.CommandName, numSuccess int, numTotal int) error {
-	src := fmt.Sprintf("%s/atlantis", command.String())
+	src := fmt.Sprintf("atlantis/%s", command.String())
 	cmdVerb := "planned"
 	if command == models.ApplyCommand {
 		cmdVerb = "applied"
@@ -71,7 +71,7 @@ func (d *DefaultCommitStatusUpdater) UpdateProject(ctx models.ProjectCommandCont
 	if projectID == "" {
 		projectID = fmt.Sprintf("%s/%s", ctx.RepoRelDir, ctx.Workspace)
 	}
-	src := fmt.Sprintf("%s/atlantis: %s", cmdName.String(), projectID)
+	src := fmt.Sprintf("atlantis/%s: %s", cmdName.String(), projectID)
 	var descripWords string
 	switch status {
 	case models.PendingCommitStatus:
diff --git a/server/events/commit_status_updater_test.go b/server/events/commit_status_updater_test.go
index 27c78718f8..b99ba991b5 100644
--- a/server/events/commit_status_updater_test.go
+++ b/server/events/commit_status_updater_test.go
@@ -71,7 +71,7 @@ func TestUpdateCombined(t *testing.T) {
 			err := s.UpdateCombined(models.Repo{}, models.PullRequest{}, c.status, c.command)
 			Ok(t, err)
 
-			expSrc := fmt.Sprintf("%s/atlantis", c.command)
+			expSrc := fmt.Sprintf("atlantis/%s", c.command)
 			client.VerifyWasCalledOnce().UpdateStatus(models.Repo{}, models.PullRequest{}, c.status, expSrc, c.expDescrip, "")
 		})
 	}
@@ -137,7 +137,7 @@ func TestUpdateCombinedCount(t *testing.T) {
 			err := s.UpdateCombinedCount(models.Repo{}, models.PullRequest{}, c.status, c.command, c.numSuccess, c.numTotal)
 			Ok(t, err)
 
-			expSrc := fmt.Sprintf("%s/atlantis", c.command)
+			expSrc := fmt.Sprintf("atlantis/%s", c.command)
 			client.VerifyWasCalledOnce().UpdateStatus(models.Repo{}, models.PullRequest{}, c.status, expSrc, c.expDescrip, "")
 		})
 	}
@@ -157,13 +157,13 @@ func TestDefaultCommitStatusUpdater_UpdateProjectSrc(t *testing.T) {
 			projectName: "name",
 			repoRelDir:  ".",
 			workspace:   "default",
-			expSrc:      "plan/atlantis: name",
+			expSrc:      "atlantis/plan: name",
 		},
 		{
 			projectName: "",
 			repoRelDir:  "dir1/dir2",
 			workspace:   "workspace",
-			expSrc:      "plan/atlantis: dir1/dir2/workspace",
+			expSrc:      "atlantis/plan: dir1/dir2/workspace",
 		},
 	}
 
@@ -239,7 +239,7 @@ func TestDefaultCommitStatusUpdater_UpdateProject(t *testing.T) {
 				c.status,
 				"url")
 			Ok(t, err)
-			client.VerifyWasCalledOnce().UpdateStatus(models.Repo{}, models.PullRequest{}, c.status, fmt.Sprintf("%s/atlantis: ./default", c.cmd.String()), c.expDescrip, "url")
+			client.VerifyWasCalledOnce().UpdateStatus(models.Repo{}, models.PullRequest{}, c.status, fmt.Sprintf("atlantis/%s: ./default", c.cmd.String()), c.expDescrip, "url")
 		})
 	}
 }
diff --git a/server/events/vcs/client.go b/server/events/vcs/client.go
index 91ac10d80c..2b72fc2140 100644
--- a/server/events/vcs/client.go
+++ b/server/events/vcs/client.go
@@ -27,7 +27,7 @@ type Client interface {
 	PullIsMergeable(repo models.Repo, pull models.PullRequest) (bool, error)
 	// UpdateStatus updates the commit status to state for pull. src is the
 	// source of this status. This should be relatively static across runs,
-	// ex. plan/atlantis or apply/atlantis.
+	// ex. atlantis/plan or atlantis/apply.
 	// description is a description of this particular status update and can
 	// change across runs.
 	// url is an optional link that users should click on for more information