diff --git a/project_git_instructions.admin.inc b/project_git_instructions.admin.inc
index ad719a0..5ac7a69 100644
--- a/project_git_instructions.admin.inc
+++ b/project_git_instructions.admin.inc
@@ -17,7 +17,8 @@ function project_git_instructions_settings_form($form, &$form_state) {
     [%title] => Chaos tool suite<br />
     [@project_fullname] => chaos_tool_suite<br />
     [@branch] => 7.x-1.x<br />
-    [@newbranch] => 7.x-2.x<br />
+    [@newbranch] => 8.x-4.x<br />
+    [@newtag] => 8.x-4.0<br />
     [@git_username] => user411<br />
     [@uid] => 300411<br />
     [@fullname] => Susan User<br />
diff --git a/project_git_instructions.module b/project_git_instructions.module
index 23fb04d..bd5f10c 100644
--- a/project_git_instructions.module
+++ b/project_git_instructions.module
@@ -144,7 +144,8 @@ function project_git_instructions_get_defaults($node, $version = NULL) {
   }
 
   $defaults['@newbranch'] = '8.x-4.x';
-  // TODO: Dynamic generation of new branch name.
+  $defaults['@newtag'] = '8.x-4.0';
+  // TODO: Dynamic generation of new branch name and new tag.
   // $defaults['@newbranch'] = preg_replace('/x$/', '2', next($versions));
 
   if (module_exists('profile')) {
@@ -619,14 +620,14 @@ See the <a href="/node/1015226">naming conventions</a> for a complete descriptio
 <h3>Branch for a dev release</h3>
 This creates and checks out a new branch in one command, then pushes it to Drupal.org
 <div class="codeblock">
-<code>git checkout -b 8.x-1.x</code><br />
-<code>git push -u origin 8.x-1.x</code><br />
+<code>git checkout -b @newbranch</code><br />
+<code>git push -u origin @newbranch</code><br />
 </div>
 <h3>Tag for a stable release</h3>
 <div class="codeblock">
-<code>git checkout  8.x-1.x</code><br />
-<code>git tag 8.x-1.0</code><br />
-<code>git push origin tag 8.x-1.0</code><br />
+<code>git checkout @newbranch</code><br />
+<code>git tag @newtag</code><br />
+<code>git push origin tag @newtag</code><br />
 </div>
 <p>Once you've pushed the properly  formed tag or branch, see <a href="/node/1068944">Creating a project release</a> for directions to actually create the release node.</p>
 EOT;
@@ -712,12 +713,12 @@ Drupal.org</a> for details.</p>
 <code>mkdir @uri</code><br /><br />
 <code>cd @uri</code><br /><br />
 <code>git init</code><br /><br />
-<code>git checkout -b 8.x-1.x</code><br /><br />
+<code>git checkout -b @branch</code><br /><br />
 <code>echo "%title" > README.txt</code><br /><br />
 <code>git add README.txt</code><br /><br />
 <code>git commit -m "Initial commit."</code><br /><br />
 <code>git remote add origin @auth_project_url</code><br /><br />
-<code>git push origin 8.x-1.x</code><br />
+<code>git push origin @branch</code><br />
 </div>
 <p>When you’ve completed these steps, <a href="">refresh this page</a> for further direction.</p>
 
@@ -895,12 +896,12 @@ function project_git_instructions_sandbox_new_maintainer() {
 <code>mkdir @project_fullname</code><br /><br />
 <code>cd @project_fullname</code><br /><br />
 <code>git init</code><br /><br />
-<code>git checkout -b 8.x-1.x</code><br /><br />
+<code>git checkout -b @branch</code><br /><br />
 <code>echo "%title" > README.txt</code><br /><br />
 <code>git add README.txt</code><br /><br />
 <code>git commit -m "Initial commit."</code><br /><br />
 <code>git remote add origin @auth_sandbox_url</code><br /><br />
-<code>git push origin 8.x-1.x</code><br />
+<code>git push origin @branch</code><br />
 </div>
 <br />
 <h3>A note about your sandbox and function names:</h3>