diff --git a/gitlab-make-semvar.php b/gitlab-make-semver.php
similarity index 74%
rename from gitlab-make-semvar.php
rename to gitlab-make-semver.php
index a803cf4b13b6cb96356a61bbd7646996acb07106..80e0a957209555d26c3f3289c4bd337ce84cd7ee 100755
--- a/gitlab-make-semvar.php
+++ b/gitlab-make-semver.php
@@ -3,14 +3,14 @@
 
 /**
  * @file
- * Create semvar branches for any 8.x branches in GitLab projects.
+ * Create semver branches for any 8.x branches in GitLab projects.
  */
 
 require_once 'devops/uw_devops.inc';
 require_once 'uw_wcms_tools.gitlab.inc';
 
-$_uw_wcms_tools_usage = 'gitlab-make-semvar.php GITLAB-PATH
-Create semvar branches for any 8.x branches. Move the default to semvar. Provide
+$_uw_wcms_tools_usage = 'gitlab-make-semver.php GITLAB-PATH
+Create semver branches for any 8.x branches. Move the default to semver. Provide
 either a GITLAB-PATH, such as "wcms/uw_base_profile" or "wcms" to do all in that
 group.';
 min_args($argv, 1);
@@ -35,5 +35,5 @@ else {
 foreach ($projects as $project) {
   echo "\n";
   echo $project->path_with_namespace . "\n";
-  uw_wcms_tools_create_semvar($project);
+  uw_wcms_tools_create_semver($project);
 }
diff --git a/uw_wcms_tools.gitlab.inc b/uw_wcms_tools.gitlab.inc
index 271f7199405908415274cf6ee3206da203fd1007..c982ca57ddb1533649c3281488e7dd84b3a7bb2f 100644
--- a/uw_wcms_tools.gitlab.inc
+++ b/uw_wcms_tools.gitlab.inc
@@ -254,7 +254,7 @@ function uw_wcms_tools_get_tag_latest($project_id, $branch_filter = NULL, $full_
   elseif (preg_match('/^\d+\.x$/', $branch_filter)) {
     $branch_filter = $branch_filter . '-';
   }
-  // Semvar filter. Whether given as 1.2.3 or 1.2.x, will filter as "1.2.".
+  // Semver filter. Whether given as 1.2.3 or 1.2.x, will filter as "1.2.".
   elseif (preg_match('/^(\d+\.\d+\.)(x|\d+)$/', $branch_filter, $matches)) {
     $branch_filter = $matches[1];
   }
@@ -579,22 +579,22 @@ function uw_wcms_tools_get_branch_names(int $project_id): ?array {
 }
 
 /**
- * Return a valid semvar version of a branch name.
+ * Return a valid semver version of a branch name.
  *
  * @param string $branch
  *   The branch name.
  *
  * @return string|null
- *   If $branch is a valid semvar, return it. If it is an "8.x" branch name,
- *   return the semvar equivalent, for example, 8.x-2.x becomes 2.0.x.
+ *   If $branch is a valid semver, return it. If it is an "8.x" branch name,
+ *   return the semver equivalent, for example, 8.x-2.x becomes 2.0.x.
  *   Otherwise, return NULL.
  */
-function uw_wcms_tools_get_semvar_branch_name(string $branch): ?string {
-  // Already a valid semvar branch.
+function uw_wcms_tools_get_semver_branch_name(string $branch): ?string {
+  // Already a valid semver branch.
   if (preg_match('/^\d+\.\d+\.x$/', $branch)) {
     return $branch;
   }
-  // Convert "8.x" branch name into semvar.
+  // Convert "8.x" branch name into semver.
   elseif (preg_match('/^8.x-(\d+)\.x$/', $branch, $matches)) {
     return $matches[1] . '.0.x';
   }
@@ -603,26 +603,26 @@ function uw_wcms_tools_get_semvar_branch_name(string $branch): ?string {
 }
 
 /**
- * Create semvar branches for each 8.x branch and move default if it is 8.x.
+ * Create semver branches for each 8.x branch and move default if it is 8.x.
  *
  * @param object $project
  *   The project object.
  */
-function uw_wcms_tools_create_semvar(stdClass $project): void {
+function uw_wcms_tools_create_semver(stdClass $project): void {
   $branches = uw_wcms_tools_get_branch_names($project->id);
 
-  // Create semvar for each 8.x, unless it already exists.
+  // Create semver for each 8.x, unless it already exists.
   foreach ($branches as $branch_orig) {
-    $branch_semvar = uw_wcms_tools_get_semvar_branch_name($branch_orig);
-    if ($branch_semvar && $branch_semvar !== $branch_orig) {
-      echo $branch_orig . ' -> ' . $branch_semvar . ': ';
-      if (in_array($branch_semvar, $branches, TRUE)) {
+    $branch_semver = uw_wcms_tools_get_semver_branch_name($branch_orig);
+    if ($branch_semver && $branch_semver !== $branch_orig) {
+      echo $branch_orig . ' -> ' . $branch_semver . ': ';
+      if (in_array($branch_semver, $branches, TRUE)) {
         echo uw_wcms_tools_shell_color("Already exists.\n", 'blue');
       }
       else {
         echo 'Creating... ';
         $params = [
-          'branch' => $branch_semvar,
+          'branch' => $branch_semver,
           'ref' => $branch_orig,
         ];
         $created_branch = uw_wcms_tools_query_gitlab_api('projects/' . $project->id . '/repository/branches', $params, 'POST');
@@ -637,12 +637,12 @@ function uw_wcms_tools_create_semvar(stdClass $project): void {
     }
   }
 
-  // If the default branch is 8.x, set to the corresponding semvar.
-  $branch_semvar = uw_wcms_tools_get_semvar_branch_name($project->default_branch);
-  if ($branch_semvar && $branch_semvar !== $project->default_branch) {
-    echo 'Update default: ' . $project->default_branch . ' -> ' . $branch_semvar . ' ';
+  // If the default branch is 8.x, set to the corresponding semver.
+  $branch_semver = uw_wcms_tools_get_semver_branch_name($project->default_branch);
+  if ($branch_semver && $branch_semver !== $project->default_branch) {
+    echo 'Update default: ' . $project->default_branch . ' -> ' . $branch_semver . ' ';
     $params = [
-      'default_branch' => $branch_semvar,
+      'default_branch' => $branch_semver,
     ];
     $response = uw_wcms_tools_query_gitlab_api('projects/' . $project->id, $params, 'PUT');
     if ($response['http_status'] === 200) {
@@ -656,7 +656,7 @@ function uw_wcms_tools_create_semvar(stdClass $project): void {
 }
 
 /**
- * Return the most recent semvar branch.
+ * Return the most recent semver branch.
  *
  * @param int $project_id
  *   The project ID.
@@ -676,7 +676,7 @@ function uw_wcms_tools_get_branch_latest(int $project_id): ?string {
 }
 
 /**
- * Return the default branch if semvar otherwise the most recent semvar branch.
+ * Return the default branch if semver otherwise the most recent semver branch.
  *
  * @param int $project_id
  *   The project ID of the project to search.
@@ -687,7 +687,7 @@ function uw_wcms_tools_get_branch_latest(int $project_id): ?string {
 function uw_wcms_tools_get_branch_default_or_latest(int $project_id): ?string {
   $project = uw_wcms_tools_get_project($project_id);
 
-  $branch = uw_wcms_tools_get_semvar_branch_name($project->default_branch);
+  $branch = uw_wcms_tools_get_semver_branch_name($project->default_branch);
   if (!$branch) {
     $branch = uw_wcms_tools_get_branch_latest($project->id);
   }
@@ -705,15 +705,15 @@ function uw_wcms_tools_get_branch_default_or_latest(int $project_id): ?string {
  *
  * @return array|null
  *   NULL if no valid branches, otherwise an array with keys:
- *    - dev: The semvar current development branch.
- *    - rel: The semvar current release branch.
+ *    - dev: The semver current development branch.
+ *    - rel: The semver current release branch.
  *    - tag_latest: The latest tag.
  *    - tag_next: The next tag.
  */
 function uw_wcms_tools_get_current_branches(int $project_id): ?array {
   $dev_branch = uw_wcms_tools_get_branch_default_or_latest($project_id);
 
-  // Return early if no semvar branch.
+  // Return early if no semver branch.
   if (!$dev_branch) {
     return NULL;
   }
@@ -723,7 +723,7 @@ function uw_wcms_tools_get_current_branches(int $project_id): ?array {
     'dev' => $dev_branch,
     'rel' => 'prod/' . $dev_branch,
     'tag_latest' => $tag_latest,
-    'tag_next' => uw_wcms_tools_next_semvar($tag_latest->name ?? $dev_branch),
+    'tag_next' => uw_wcms_tools_next_semver($tag_latest->name ?? $dev_branch),
   ];
 }
 
@@ -744,8 +744,8 @@ function uw_wcms_tools_gitlab_tag_release(string $namespace, string $path): void
 
   echo uw_wcms_tools_shell_color('Project: ' . $project->path_with_namespace . "\n", 'blue');
 
-  echo "Ensuring this project has semvar branches...\n";
-  uw_wcms_tools_create_semvar($project);
+  echo "Ensuring this project has semver branches...\n";
+  uw_wcms_tools_create_semver($project);
 
   $current_branches = uw_wcms_tools_get_current_branches($project->id);
 
diff --git a/uw_wcms_tools.lib.inc b/uw_wcms_tools.lib.inc
index e4c283edcb6ba818b42b7b37d7eacd0c8e92593d..dcee523571efd46f55eef4a45706d8200afcbb0b 100644
--- a/uw_wcms_tools.lib.inc
+++ b/uw_wcms_tools.lib.inc
@@ -63,11 +63,11 @@ function uw_wcms_tools_next_version($current = NULL) {
  *   The current version number or branch.
  *
  * @return string|null
- *   If $version is a semvar version, return the next patch leve. If it is a
+ *   If $version is a semver version, return the next patch leve. If it is a
  *   branch, such as 1.2.x return the first version on that branch. Otherwise,
  *   return NULL.
  */
-function uw_wcms_tools_next_semvar(string $version): ?string {
+function uw_wcms_tools_next_semver(string $version): ?string {
   // Version number provided.
   if (preg_match('/^(\d+)\.(\d+)\.(\d+)(-(?:alpha|beta|rc)\d+)?$/', $version, $matches)) {
     $major = (int) $matches[1];