diff --git a/src/gerbonara/layers.py b/src/gerbonara/layers.py
index 3491eef..7fc08bd 100644
--- a/src/gerbonara/layers.py
+++ b/src/gerbonara/layers.py
@@ -66,27 +66,27 @@ DEFAULT_COLORS = {
 
 class NamingScheme:
     kicad = {
-    'top copper':           '{board_name}-F.Cu.gbr',
-    'top mask':             '{board_name}-F.Mask.gbr',
-    'top silk':             '{board_name}-F.SilkS.gbr',
-    'top paste':            '{board_name}-F.Paste.gbr',
-    'bottom copper':        '{board_name}-B.Cu.gbr',
-    'bottom mask':          '{board_name}-B.Mask.gbr',
-    'bottom silk':          '{board_name}-B.SilkS.gbr',
-    'bottom paste':         '{board_name}-B.Paste.gbr',
-    'inner copper':         '{board_name}-In{layer_number}.Cu.gbr',
-    'mechanical outline':   '{board_name}-Edge.Cuts.gbr',
+    'top copper':           '{board_name}-F_Cu.gbr',
+    'top mask':             '{board_name}-F_Mask.gbr',
+    'top silk':             '{board_name}-F_SilkS.gbr',
+    'top paste':            '{board_name}-F_Paste.gbr',
+    'bottom copper':        '{board_name}-B_Cu.gbr',
+    'bottom mask':          '{board_name}-B_Mask.gbr',
+    'bottom silk':          '{board_name}-B_SilkS.gbr',
+    'bottom paste':         '{board_name}-B_Paste.gbr',
+    'inner copper':         '{board_name}-In{layer_number}_Cu.gbr',
+    'mechanical outline':   '{board_name}-Edge_Cuts.gbr',
     'drill unknown':        '{board_name}.drl',
     'drill plated':         '{board_name}-PTH.drl',
     'drill nonplated':      '{board_name}-NPTH.drl',
-    'other comments':       '{board_name}-Cmts.User.gbr',
-    'other drawings':       '{board_name}-Dwgs.User.gbr',
-    'top fabrication':      '{board_name}-F.Fab.gbr',
-    'bottom fabrication':   '{board_name}-B.Fab.gbr',
-    'top adhesive':         '{board_name}-F.Adhes.gbr',
-    'bottom adhesive':      '{board_name}-B.Adhes.gbr',
-    'top courtyard':        '{board_name}-F.CrtYd.gbr',
-    'bottom courtyard':     '{board_name}-B.CrtYd.gbr',
+    'other comments':       '{board_name}-Cmts_User.gbr',
+    'other drawings':       '{board_name}-Dwgs_User.gbr',
+    'top fabrication':      '{board_name}-F_Fab.gbr',
+    'bottom fabrication':   '{board_name}-B_Fab.gbr',
+    'top adhesive':         '{board_name}-F_Adhes.gbr',
+    'bottom adhesive':      '{board_name}-B_Adhes.gbr',
+    'top courtyard':        '{board_name}-F_CrtYd.gbr',
+    'bottom courtyard':     '{board_name}-B_CrtYd.gbr',
     'other netlist':        '{board_name}.d356',
     }
 
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 2ce93f0..9529a49 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -184,7 +184,7 @@ class TestMerge:
                         reference_path(file_b), '--offset', '100,100', '--rotation', '0',
                         outdir, '--output-naming-scheme', 'kicad', '--output-board-name', 'foobar',
                         '--warnings', 'ignore')
-            assert (Path(outdir) / 'foobar-F.Cu.gbr').exists()
+            assert (Path(outdir) / 'foobar-F_Cu.gbr').exists()
 
 
 class TestMeta: