diff --git a/src/catkin_pkg/package.py b/src/catkin_pkg/package.py
index 737bbead..b19ced6d 100644
--- a/src/catkin_pkg/package.py
+++ b/src/catkin_pkg/package.py
@@ -287,7 +287,7 @@ def validate_licenses(licenses, warnings):
                 if is_valid_spdx_identifier(lic):
                     continue
 
-                if lic == 'TODO':
+                if lic == 'TODO-CATKIN-PACKAGE-LICENSE':
                     warnings.append('The license value "%s" is only temporary from the template, replace it with correct value' % (lic))
                     continue
 
diff --git a/src/catkin_pkg/package_templates.py b/src/catkin_pkg/package_templates.py
index d539d2f8..db6ccc03 100644
--- a/src/catkin_pkg/package_templates.py
+++ b/src/catkin_pkg/package_templates.py
@@ -71,7 +71,7 @@ def _create_package_template(package_name, description=None, licenses=None,
         :param catkin_deps:
         """
         # Sort so they are alphebetical
-        licenses = list(licenses or ['TODO'])
+        licenses = list(licenses or ['TODO-CATKIN-PACKAGE-LICENSE'])
         licenses.sort()
         if not maintainer_names:
             maintainer_names = [getpass.getuser()]