diff --git a/.gitignore b/.gitignore
index f696f72..a3c4586 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,10 @@ node_modules
 output
 .DS_Store
 yarn-error.log
+
+.idea/.gitignore
+.idea/kbpcb.iml
+.idea/misc.xml
+.idea/modules.xml
+.idea/vcs.xml
+package-lock.json
diff --git a/src/kicad.js b/src/kicad.js
index 6198ae6..e304b4f 100644
--- a/src/kicad.js
+++ b/src/kicad.js
@@ -33,7 +33,10 @@ class KiCad {
     [...Array(keyboard.cols+1)].forEach((_, i) => NetRepo.add(`/col${i}`));
     [...Array(keyboard.rows+1)].forEach((_, i) => NetRepo.add(`/row${i}`));
 
+    let i = 1
     keyboard.forEach(k => {
+      k.name = `${i++}`;
+
       const theSwitch = new Switch(k, this.leds);
       const diode     = new Diode(k);
       theSwitch.connectPads(2, diode, 2);
diff --git a/src/zip.js b/src/zip.js
index 3fb887f..7452306 100644
--- a/src/zip.js
+++ b/src/zip.js
@@ -4,10 +4,11 @@ const JSZip = require('jszip');
 const addFolder = (files, folder) => {
   fs.readdirSync(`${folder}`).forEach(file => {
     const fileName = `${folder}/${file}`;
+    const fileNameWithoutFootprint = fileName.replace("footprints/", "");
     if (fs.lstatSync(`${fileName}`).isDirectory()) {
       addFolder(files, fileName);
     } else {
-      files.push([fileName, fs.readFileSync(`${fileName}`, 'utf8')]);
+      files.push([fileNameWithoutFootprint, fs.readFileSync(`${fileName}`, 'utf8')]);
     }
   });
 }
diff --git a/templates/fp-lib-table b/templates/fp-lib-table
index d8e5cf5..98c1da3 100644
--- a/templates/fp-lib-table
+++ b/templates/fp-lib-table
@@ -1,4 +1,4 @@
 (fp_lib_table
-  (lib (name MX_ALPS_Hybrid)(type KiCad)(uri ${KIPRJMOD}/MX_ALPS_Hybrid.pretty)(options "")(descr ""))
+  (lib (name MX_Alps_Hybrid)(type KiCad)(uri ${KIPRJMOD}/MX_Alps_Hybrid.pretty)(options "")(descr ""))
   (lib (name keyboard_parts)(type KiCad)(uri ${KIPRJMOD}/keyboard_parts.pretty)(options "")(descr ""))
 )