diff --git a/macro/PackageHeader.py b/macro/PackageHeader.py
index 490b35a..87f014f 100644
--- a/macro/PackageHeader.py
+++ b/macro/PackageHeader.py
@@ -1,20 +1,13 @@
 from MoinMoin.Page import Page
 from MoinMoin.wikiutil import get_unicode
 
-from macroutils import load_package_manifest, distro_names, CONTRIBUTE_TMPL, UtilException
+from macroutils import load_package_manifest, distro_names, distro_names_hidden, CONTRIBUTE_TMPL, UtilException
 from headers import get_nav, get_description, get_package_links, generate_package_header, distro_html, doc_html, get_loaded_distros
 
 generates_headings = True
 dependencies = []
 
-if 'boxturtle' in distro_names:
-    distro_names.remove('boxturtle')
-if 'cturtle' in distro_names:
-    distro_names.remove('cturtle')
-if 'diamondback' in distro_names:
-    distro_names.remove('diamondback')
-if 'unstable' in distro_names:
-    distro_names.remove('unstable')
+distro_names = [d for d in distro_names if d not in distro_names_hidden]
 
 def generate_old_package_header(macro, package_name, opt_distro=None):
     if not package_name:
diff --git a/macro/StackHeader.py b/macro/StackHeader.py
index c3c802b..2939139 100644
--- a/macro/StackHeader.py
+++ b/macro/StackHeader.py
@@ -2,20 +2,13 @@
 from MoinMoin.Page import Page
 from MoinMoin.wikiutil import get_unicode
 
-from macroutils import load_stack_manifest, load_package_manifest, distro_names, CONTRIBUTE_TMPL, UtilException
+from macroutils import load_stack_manifest, load_package_manifest, distro_names, distro_names_hidden, CONTRIBUTE_TMPL, UtilException
 from headers import get_nav, get_description, get_package_links, generate_package_header, distro_html, get_stack_links, doc_html, get_loaded_distros
 
 generates_headings = True
 dependencies = []
 
-if 'boxturtle' in distro_names:
-    distro_names.remove('boxturtle')
-if 'cturtle' in distro_names:
-    distro_names.remove('cturtle')
-if 'diamondback' in distro_names:
-    distro_names.remove('diamondback')
-if 'unstable' in distro_names:
-    distro_names.remove('unstable')
+distro_names = [d for d in distro_names if d not in distro_names_hidden]
 
 def generate_old_stack_header(macro, stack_name, opt_distro=None):
     try:
diff --git a/macro/Version.py b/macro/Version.py
index 514585c..73e6c93 100644
--- a/macro/Version.py
+++ b/macro/Version.py
@@ -47,11 +47,10 @@
 def execute(macro, args):
     if args:
         version = str(args)
-        if version.lower() == 'l-turtle':
-            # TODO Change when l-turtle name is decided
+        if version.lower() == 'lunar':
             return ('<span style="background-color:#FFFF00; '
                     'font-weight:bold; padding: 3px;">'
-                    'Expected in L-Turtle</span>')
+                    'Expected in Lunar</span>')
         else:
             return ('<span style="background-color:#FFFF00; '
                     'font-weight:bold; padding: 3px;">'
diff --git a/macro/macroutils.py b/macro/macroutils.py
index 32caf0f..478a886 100644
--- a/macro/macroutils.py
+++ b/macro/macroutils.py
@@ -14,10 +14,12 @@
 distro_names = ['boxturtle', 'cturtle', 'diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'indigo', 'jade', 'kinetic', 'unstable']
 distro_names_indexed = ['diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'indigo', 'jade', 'kinetic', 'unstable'] #boxturtle and cturtle not indexed
 distro_names_buildfarm = ['indigo', 'jade', 'kinetic']
+distro_names_hidden = ['boxturtle', 'cturtle', 'diamondback', 'electric', 'fuerte', 'groovy', 'hydro', 'unstable']
 
 doc_url = "http://docs.ros.org/"
 
 doc_path = '/home/rosbot/docs/'
+
 metrics_path = '/var/www/www.ros.org/metrics/'
 
 MISSING_DOC_TMPL = 'Cannot load information on <strong>%(name)s</strong>, which means that it is not yet in our index.'