diff --git a/kibot/__main__.py b/kibot/__main__.py
index 99670239..0eade1fa 100644
--- a/kibot/__main__.py
+++ b/kibot/__main__.py
@@ -191,8 +191,10 @@ def detect_kicad():
     GS.kicad_version_minor = int(m.group(2))
     GS.kicad_version_patch = int(m.group(3))
     GS.kicad_version_n = GS.kicad_version_major*1000000+GS.kicad_version_minor*1000+GS.kicad_version_patch
-    GS.ki6 = GS.kicad_version_major >= 6
     GS.ki5 = GS.kicad_version_major < 6
+    GS.ki6 = GS.kicad_version_major >= 6
+    GS.ki6_only = GS.kicad_version_major == 6
+    GS.ki7 = GS.kicad_version_major >= 7
     logger.debug('Detected KiCad v{}.{}.{} ({} {})'.format(GS.kicad_version_major, GS.kicad_version_minor,
                  GS.kicad_version_patch, GS.kicad_version, GS.kicad_version_n))
     # Used to look for plug-ins.
diff --git a/kibot/kicad/config.py b/kibot/kicad/config.py
index ea755c78..edd88c65 100644
--- a/kibot/kicad/config.py
+++ b/kibot/kicad/config.py
@@ -337,7 +337,7 @@ class KiConf(object):
         names = []
         if GS.ki6 and ki6_diff:
             # KiCad 6 specific name goes first when using KiCad 6
-            names.append('KICAD6_'+base_name)
+            names.append('KICAD{}_{}'.format(GS.kicad_version_major, base_name))
         # KiCad 5 names, allowed even when using KiCad 6
         if not only_old:
             # A KICAD_* is valid
@@ -378,7 +378,7 @@ class KiConf(object):
         if not no_dir:
             base_name += '_DIR'
         if GS.ki6 and ki6_diff:
-            name = 'KICAD6_'+base_name
+            name = 'KICAD{}_{}'.format(GS.kicad_version_major, base_name)
         else:
             name = 'KICAD_'+base_name
         KiConf.kicad_env[name] = val