diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1aa254dce2..19a528a8b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Ansible Changes By Release
 ==========================
 
-## 2.2 TBD - ACTIVE DEVELOPMENT
+## 2.2 "The Battle of Evermore" - ACTIVE DEVELOPMENT
 
 ###Major Changes:
 
diff --git a/packaging/release/vars/versions.yml b/packaging/release/vars/versions.yml
index 379ded2043..d936eee085 100644
--- a/packaging/release/vars/versions.yml
+++ b/packaging/release/vars/versions.yml
@@ -1,11 +1,12 @@
 versions:
 - "2.2":
-    code_name: "TBD"
+    code_name: "The Battle of Evermore"
     releases:
     - "0": "TBD"
 - "2.1":
     code_name: "The Song Remains the Same"
     releases:
+    - "2": "TBD"
     - "1": "07-28-2016"
     - "0": "05-25-2016"
 - "2.0":