diff --git a/Gulpfile.js b/Gulpfile.js
index 6870ea9..760f2c4 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -3,18 +3,18 @@ var iconfont = require('gulp-iconfont');
 var iconfontCss = require('gulp-iconfont-css');
 
 gulp.task('default', function(){
-  gulp.src(['./icon_font/svgs/*.svg'])
+  gulp.src(['./icon-font/svgs/*.svg'])
 
   .pipe(iconfontCss({
     fontName: 'cartoIcon',
-    path: './icon_font/template.jst.ejs',
+    path: './icon-font/template.jst.ejs',
     targetPath: '../scss/icon-font.css.scss',
     fontPath: '../../fonts/'
   }))
 
   .pipe(iconfont({
     fontName: 'cartoIcon',
-    appendCodepoints: true 
+    appendCodepoints: true
   }))
 
   .pipe(gulp.dest('src/fonts/'));
diff --git a/README.md b/README.md
index c365c83..a9f40da 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ How to make changes in the CartoDB icon font
 If you want to edit, add or remove any icon in our CartoDB font, you should follow these steps:
 
 - Check you have [Sketch](http://bohemiancoding.com/sketch/) last version.
-- Open [font.sketch](http://github.com/CartoDB/CartoAssets/blob/master/icon_font/font.sketch) file and make your changes.
+- Open [font.sketch](http://github.com/CartoDB/CartoAssets/blob/master/icon-font/font.sketch) file and make your changes.
 
 ### Rules for the icons:
 - Size should have at max 500px of width/height.
@@ -50,13 +50,13 @@ If you want to edit, add or remove any icon in our CartoDB font, you should foll
 
 ### When you're done with changes
 
-- Select all the icons, and export them to `app/assets/fonts/icon_font/svgs` folder (option should be visible in the bottom corner in your Sketch app):
+- Select all the icons, and export them to `app/assets/fonts/icon-font/svgs` folder (option should be visible in the bottom corner in your Sketch app):
   - ![screen shot 2015-01-16 at 11 40 36](https://cloud.githubusercontent.com/assets/978461/5774986/93dc90e8-9d74-11e4-8064-a478e55d392b.png)
   - Take into account that ```svgs``` folder is ignored.
 - Open your terminal app and go to the CartoDB root folder.
 - Install your node dependencies: `npm install`
 - Now we will generate the new icon fonts + stylesheet. Just run: `./node_modules/.bin/gulp`
-- Check that your `icon-font.css.scss` and the `cartoIcon` fonts have been edited: 
+- Check that your `icon-font.css.scss` and the `cartoIcon` fonts have been edited:
   - ![screen shot 2015-01-16 at 11 02 53](https://cloud.githubusercontent.com/assets/978461/5775004/acf10faa-9d74-11e4-893c-790da626d894.png)
 
 All done!
diff --git a/icon_font/README.md b/icon-font/README.md
similarity index 100%
rename from icon_font/README.md
rename to icon-font/README.md
diff --git a/icon_font/font.sketch b/icon-font/font.sketch
similarity index 100%
rename from icon_font/font.sketch
rename to icon-font/font.sketch
diff --git a/icon_font/template.jst.ejs b/icon-font/template.jst.ejs
similarity index 100%
rename from icon_font/template.jst.ejs
rename to icon-font/template.jst.ejs