diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff5d5a790e3fd..7a417486367c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -448,7 +448,7 @@ resources, you will have to adapt your cluster resources allow lists to explicit
 ## v1.8.4 (2021-02-05)
 
 - feat: set X-XSS-Protection while serving static content (#5412)
-- fix: version info should be avaialble if anonymous access is enabled (#5422)
+- fix: version info should be available if anonymous access is enabled (#5422)
 - fix: disable jwt claim audience validation #5381 (#5413)
 - fix: /api/version should not return tools version for unauthenticated requests (#5415)
 - fix: account tokens should be rejected if required capability is disabled (#5414)
diff --git a/applicationset/controllers/applicationset_controller_test.go b/applicationset/controllers/applicationset_controller_test.go
index 1d4f152ae8d5c..bb526e98d6ff6 100644
--- a/applicationset/controllers/applicationset_controller_test.go
+++ b/applicationset/controllers/applicationset_controller_test.go
@@ -603,7 +603,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			},
 		},
 		{
-			name: "Ensure that status and operation fields are not overriden by an update, when removing labels/annotations",
+			name: "Ensure that status and operation fields are not overridden by an update, when removing labels/annotations",
 			appSet: argoprojiov1alpha1.ApplicationSet{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "name",
@@ -675,7 +675,7 @@ func TestCreateOrUpdateInCluster(t *testing.T) {
 			},
 		},
 		{
-			name: "Ensure that status and operation fields are not overriden by an update, when removing labels/annotations and adding other fields",
+			name: "Ensure that status and operation fields are not overridden by an update, when removing labels/annotations and adding other fields",
 			appSet: argoprojiov1alpha1.ApplicationSet{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "name",
diff --git a/cmd/argocd/commands/admin/notifications.go b/cmd/argocd/commands/admin/notifications.go
index 2b9d6aea24aca..6f0a4bbf84570 100644
--- a/cmd/argocd/commands/admin/notifications.go
+++ b/cmd/argocd/commands/admin/notifications.go
@@ -41,7 +41,7 @@ func NewNotificationsCommand() *cobra.Command {
 			}
 			argocdService, err = service.NewArgoCDService(kubernetes.NewForConfigOrDie(k8sCfg), ns, argocdRepoServer, argocdRepoServerPlaintext, argocdRepoServerStrictTLS)
 			if err != nil {
-				log.Fatalf("Failed to initalize Argo CD service: %v", err)
+				log.Fatalf("Failed to initialize Argo CD service: %v", err)
 			}
 		})
 	toolsCommand.PersistentFlags().StringVar(&argocdRepoServer, "argocd-repo-server", "argocd-repo-server:8081", "Argo CD repo server address")
diff --git a/common/common.go b/common/common.go
index f73927b6db932..aea0ea251bf48 100644
--- a/common/common.go
+++ b/common/common.go
@@ -283,7 +283,7 @@ func GetCMPWorkDir() string {
 }
 
 const (
-	// AnnotationApplicationRefresh is an annotation that is added when an ApplicationSet is requested to be refreshed by a webhook. The ApplicationSet controller will remove this annotation at the end of reconcilation.
+	// AnnotationApplicationRefresh is an annotation that is added when an ApplicationSet is requested to be refreshed by a webhook. The ApplicationSet controller will remove this annotation at the end of reconciliation.
 	AnnotationApplicationSetRefresh = "argocd.argoproj.io/application-set-refresh"
 )