diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd170b5d..275ac163 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -254,7 +254,7 @@ All notable changes to this project will be documented in this file.
 - Verify/Build/Upload optimization: run only if changed
 - Show FPGA resources in upload command
 - Improve code/info blocks zoom
-- Update Icestudio logo
+- Update hwstudio logo
 
 
 ## [0.3.0-rc] - 2017-03-30
@@ -304,9 +304,9 @@ All notable changes to this project will be documented in this file.
 #### Create Windows installer
 - Uninstall previous version if required
 - Install Python 2.7 if required
-- Install Icestudio app
-- Install Icestudio shortcut
-- Register .ice files: open in Icestudio with double-click
+- Install hwstudio app
+- Install hwstudio shortcut
+- Register .ice files: open in hwstudio with double-click
 - Uninstaller: remove toolchain, profile or collections
 
 #### Add Board rules
@@ -346,7 +346,7 @@ All notable changes to this project will be documented in this file.
 - Add menu Select > Boards/Collections
 - Bugfix verilog compiler: self-connected wires
 - Apply zoom to Code/Info blocks content
-- Paste on multiple Icestudio windows (copy also wires)
+- Paste on multiple hwstudio windows (copy also wires)
 - Remember old port connections after Code block edition
 - Detect project board on load
 - Save profile when an attribute is set
@@ -376,7 +376,7 @@ Thanks to **Patripi** for the feedback and suggestions!
 - File > New: launch a new window
 - File > Open: launch a new window if required
 - File > Examples: launch a new window if required
-- Add argument to the application: eg: ./icestudio /path/to/project.ice
+- Add argument to the application: eg: ./hwstudio /path/to/project.ice
 - Show project changed state
 
 ### New project format 1.1
@@ -503,7 +503,7 @@ Thanks to **AlexTC** for the feedback and suggestions!
 - Add Hex 7 Segments CA (#81 by @C47D)
 - Support [Kefir I](http://fpgalibre.sourceforge.net/Kefir/index.html) board (@set-soft)
 - Add `default_nettype none` to generated verilog files
-- Add Icestudio headers to generated files
+- Add hwstudio headers to generated files
 - Add verilog header (.vh) files inclusion
 - Add File > Export testbench
 - Add File > Export GTKWave
@@ -601,7 +601,7 @@ Thanks to **AlexTC** for the feedback and suggestions!
 - Help menu: add documentation
 - Help menu: add source code
 - Help menu: add community forum
-- Help menu: add about Icestudio
+- Help menu: add about hwstudio
 - Basic blocks:
   - code: contains a verilog editor
   - input & output: contains a FPGA I/O pin selector
diff --git a/app/index.html b/app/index.html
index 0d37ea00..a76f91f4 100644
--- a/app/index.html
+++ b/app/index.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>Icestudio</title>
+  <title>Hardware Studio</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
   <link rel="stylesheet" href="node_modules/jointjs/dist/joint.css">
@@ -22,7 +22,7 @@
   <link rel="stylesheet" href="resources/viewers/markdown/css/github-markdown.css">
 </head>
 
-<body ng-app="icestudio">
+<body ng-app="hwstudio">
 
   <div ng-view></div>
   <script>
diff --git a/app/js/app.js b/app/js/app.js
index f9e3872b..8c814836 100644
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -5,7 +5,7 @@ var ICEpm = new IcePlugManager();
 
 
 angular
-  .module('icestudio', [
+  .module('hwstudio', [
     'ui.bootstrap',
     'ngRoute',
     'gettext'
@@ -20,7 +20,7 @@ angular
         .otherwise({
           redirectTo: '/'
         });
-    } 
+    }
   ])
   .run(function(profile,
                 project,
@@ -31,18 +31,18 @@ angular
                 collections,
                 gettextCatalog,
                 $timeout)
-   
+
                 {
- 
+
 
     $timeout(function(){
       $('body').addClass('waiting');
     }, 0);
       // Load boards
     boards.loadBoards();
-    // Load profile 
+    // Load profile
     utils.loadProfile(profile, function() {
-      // Load collections 
+      // Load collections
       collections.loadAllCollections() ;
       // Load language
       utils.loadLanguage(profile, function() {
@@ -55,9 +55,9 @@ angular
             alertify.success(gettextCatalog.getString('Board {{name}} selected',  { name: utils.bold(newBoard.info.label) }));
             // Check if the toolchain is installed
             tools.checkToolchain();
-          }); 
+          });
         }
-        else { 
+        else {
           // Initialize selected board
           profile.set('board', boards.selectBoard(profile.get('board')).name);
           // Check if the toolchain is installed
diff --git a/app/js/controllers/design.js b/app/js/controllers/design.js
index ff92a1aa..ecaf1157 100644
--- a/app/js/controllers/design.js
+++ b/app/js/controllers/design.js
@@ -2,7 +2,7 @@
 
 var subModuleActive = false;
 
-angular.module('icestudio')
+angular.module('hwstudio')
         .controller('DesignCtrl', function ($rootScope,
                 $scope,
                 project,
diff --git a/app/js/controllers/main.js b/app/js/controllers/main.js
index c1d07d32..97779768 100644
--- a/app/js/controllers/main.js
+++ b/app/js/controllers/main.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .controller('MainCtrl', function ($scope,
     gettextCatalog, tools, utils) {
 
diff --git a/app/js/controllers/menu.js b/app/js/controllers/menu.js
index 08e5bf70..b75a7c4e 100644
--- a/app/js/controllers/menu.js
+++ b/app/js/controllers/menu.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .controller('MenuCtrl', function ($rootScope,
     $scope,
     $timeout,
@@ -51,10 +51,8 @@ angular.module('icestudio')
     });
     // Darwin fix for shortcuts
     if (process.platform === 'darwin') {
-      var mb = new gui.Menu({
-        type: 'menubar'
-      });
-      mb.createMacBuiltin('Icestudio');
+      var mb = new gui.Menu({ type: 'menubar' });
+      mb.createMacBuiltin('hwstudio');
       win.menu = mb;
     }
 
@@ -65,7 +63,7 @@ angular.module('icestudio')
     setTimeout(function () {
 
       // Parse GET url parmeters for window instance arguments
-      // all arguments will be embeded in icestudio_argv param
+      // all arguments will be embeded in hwstudio_argv param
       // that is a JSON string url encoded
 
       // https://developer.mozilla.org/es/docs/Web/JavaScript/Referencia/Objetos_globales/unescape
@@ -73,13 +71,13 @@ angular.module('icestudio')
 
 
       var queryStr = '';
-      if (window.location.search.indexOf('?icestudio_argv=') === 0) {
-        queryStr = '?icestudio_argv=' + atob(decodeURI(window.location.search.replace('?icestudio_argv=', ''))) + '&';
+      if (window.location.search.indexOf('?hwstudio_argv=') === 0) {
+        queryStr = '?hwstudio_argv=' + atob(decodeURI(window.location.search.replace('?hwstudio_argv=', ''))) + '&';
       } else {
 
         queryStr = decodeURI(window.location.search) + '&';
       }
-      var regex = new RegExp('.*?[&\\?]icestudio_argv=(.*?)&.*');
+      var regex = new RegExp('.*?[&\\?]hwstudio_argv=(.*?)&.*');
       var val = queryStr.replace(regex, '$1');
 
       var params = (val === queryStr) ? false : val;
@@ -611,7 +609,7 @@ angular.module('icestudio')
         height: 700,
         'min_width': 300,
         'min_height': 300,
-        icon: 'resources/images/icestudio-logo.png'
+        icon: 'resources/images/logo.png'
       });
     };
 
@@ -627,7 +625,7 @@ angular.module('icestudio')
           height: 700,
           'min_width': 300,
           'min_height': 300,
-          icon: 'resources/images/icestudio-logo.png'
+          icon: 'resources/images/logo.png'
         });
       } else {
         alertify.warning(gettextCatalog.getString('{{board}} pinout not defined', {
@@ -661,7 +659,7 @@ angular.module('icestudio')
           height: 500,
           'min_width': 300,
           'min_height': 300,
-          icon: 'resources/images/icestudio-logo.png'
+          icon: 'resources/images/logo.png'
         });
       } else {
         alertify.error(gettextCatalog.getString('{{board}} rules not defined', {
@@ -687,7 +685,7 @@ angular.module('icestudio')
           height: 700,
           'min_width': 300,
           'min_height': 300,
-          icon: 'resources/images/icestudio-logo.png'
+          icon: 'resources/images/logo.png'
         });
       } else {
         alertify.error(gettextCatalog.getString('Collection {{collection}} info not defined', {
@@ -706,7 +704,7 @@ angular.module('icestudio')
         height: 400,
         'min_width': 300,
         'min_height': 300,
-        icon: 'resources/images/icestudio-logo.png'
+        icon: 'resources/images/logo.png'
       });
     };
 
diff --git a/app/js/directives/menuboard.js b/app/js/directives/menuboard.js
index 10fbcbf5..c51ef7fe 100644
--- a/app/js/directives/menuboard.js
+++ b/app/js/directives/menuboard.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .directive('menuboard', function() {
     return {
       restrict: 'E',
diff --git a/app/js/directives/menutree.js b/app/js/directives/menutree.js
index 11b0b91a..a422f883 100644
--- a/app/js/directives/menutree.js
+++ b/app/js/directives/menutree.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .directive('menutree', function() {
     return {
       restrict: 'E',
diff --git a/app/js/factories/joint.js b/app/js/factories/joint.js
index 97262d60..3dfe14d0 100644
--- a/app/js/factories/joint.js
+++ b/app/js/factories/joint.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .factory('joint', function($window) {
     return $window.joint;
   });
diff --git a/app/js/factories/node.js b/app/js/factories/node.js
index 47a11364..0c5d88f1 100644
--- a/app/js/factories/node.js
+++ b/app/js/factories/node.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .factory('fastCopy', function() {
     return require('fast-copy');
   })
diff --git a/app/js/factories/window.js b/app/js/factories/window.js
index fcd4a0dd..7e715849 100644
--- a/app/js/factories/window.js
+++ b/app/js/factories/window.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .factory('gui', function() {
     var gui = require('nw.gui');
     return gui;
diff --git a/app/js/graphics/joint.shapes.js b/app/js/graphics/joint.shapes.js
index d7a76ec1..bd95a45c 100644
--- a/app/js/graphics/joint.shapes.js
+++ b/app/js/graphics/joint.shapes.js
@@ -1144,7 +1144,7 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({
     });
     this.inputSelector.on('paste', function (event) {
       var data = event.originalEvent.clipboardData.getData('text');
-      if (data.startsWith('{"icestudio":')) {
+      if (data.startsWith('{"hwstudio":')) {
         // Prevent paste blocks
         event.preventDefault();
       }
@@ -1356,7 +1356,7 @@ joint.shapes.ice.MemoryView = joint.shapes.ice.ModelView.extend({
       self.editor.renderer.$cursorLayer.element.style.opacity = 0;
     });
     this.editor.on('paste', function (e) {
-      if (e.text.startsWith('{"icestudio":')) {
+      if (e.text.startsWith('{"hwstudio":')) {
         // Prevent paste blocks
         e.text = '';
       }
@@ -1655,7 +1655,7 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({
       self.editor.renderer.$cursorLayer.element.style.opacity = 0;
     });
     this.editor.on('paste', function (e) {
-      if (e.text.startsWith('{"icestudio":')) {
+      if (e.text.startsWith('{"hwstudio":')) {
         // Prevent paste blocks
         e.text = '';
       }
@@ -1809,7 +1809,7 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({
 
       }
       //    this.editor.resize();
-    
+
     }
 
     // Set ports width
@@ -2023,7 +2023,7 @@ joint.shapes.ice.InfoView = joint.shapes.ice.ModelView.extend({
       self.editor.renderer.$cursorLayer.element.style.opacity = 0;
     });
     this.editor.on('paste', function (e) {
-      if (e.text.startsWith('{"icestudio":')) {
+      if (e.text.startsWith('{"hwstudio":')) {
         // Prevent paste blocks
         e.text = '';
       }
@@ -2465,7 +2465,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({
   },
 
   updateConnection: function (opt) {
-    
+
     opt = opt || {};
 
     // Necessary path finding
@@ -2499,7 +2499,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({
       var markerBifurcations=false;
 
       for(var i=0,n=allWires.length;i<n;i++){
-     
+
         wireSource = allWires[i].get('source');
         cwireSource = currentWire.get('source');
         if ((wireSource.id === cwireSource.id) &&
@@ -2514,7 +2514,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({
             markers: markerBifurcations
           });
         }
-     
+
     }
 
       var points = [];
diff --git a/app/js/services/blocks.js b/app/js/services/blocks.js
index 5ab325a5..cf94d6b8 100644
--- a/app/js/services/blocks.js
+++ b/app/js/services/blocks.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('blocks', function (joint,
     utils,
     common,
diff --git a/app/js/services/boards.js b/app/js/services/boards.js
index 8e9d1d3a..6910257b 100644
--- a/app/js/services/boards.js
+++ b/app/js/services/boards.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('boards', function(utils,
                               common,
                               nodeFs,
diff --git a/app/js/services/collections.js b/app/js/services/collections.js
index 1bbff815..dfe2400e 100644
--- a/app/js/services/collections.js
+++ b/app/js/services/collections.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('collections', function (utils,
     common,
     profile,
diff --git a/app/js/services/common.js b/app/js/services/common.js
index 4636e5e7..ab47bb96 100644
--- a/app/js/services/common.js
+++ b/app/js/services/common.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('common', function (nodePath,
     nodeTmp) {
 
@@ -56,8 +56,8 @@ angular.module('icestudio')
 
 
     this.BASE_DIR = process.env.HOME || process.env.USERPROFILE;
-    this.LOGFILE = nodePath.join(this.BASE_DIR, 'icestudio.log');
-    this.ICESTUDIO_DIR = safeDir(nodePath.join(this.BASE_DIR, '.icestudio'), this);
+    this.LOGFILE = nodePath.join(this.BASE_DIR, 'hwstudio.log');
+    this.ICESTUDIO_DIR = safeDir(nodePath.join(this.BASE_DIR, '.hwstudio'), this);
     this.INTERNAL_COLLECTIONS_DIR = nodePath.join(this.ICESTUDIO_DIR, 'collections');
     this.APIO_HOME_DIR = nodePath.join(this.ICESTUDIO_DIR, 'apio');
     this.PROFILE_PATH = nodePath.join(this.ICESTUDIO_DIR, 'profile.json');
@@ -89,7 +89,7 @@ angular.module('icestudio')
     this.APIO_CMD = (this.WIN32 ? 'set' : 'export') + ' APIO_HOME_DIR=' + this.APIO_HOME_DIR + (this.WIN32 ? '& ' : '; ') + '"' + this.ENV_APIO + '"';
 
     this.BUILD_DIR_OBJ = new nodeTmp.dirSync({
-      prefix: 'icestudio-',
+      prefix: 'hwstudio-',
       unsafeCleanup: true
     });
     this.BUILD_DIR = this.BUILD_DIR_OBJ.name;
@@ -110,8 +110,8 @@ angular.module('icestudio')
             return nodePath.format({
               root: _dirFormat.root,
               dir: _dirFormat.root,
-              base: '.icestudio',
-              name: '.icestudio',
+              base: '.hwstudio',
+              name: '.hwstudio',
             });
           }
         }
diff --git a/app/js/services/compiler.js b/app/js/services/compiler.js
index 4e10113e..b99a4a5c 100644
--- a/app/js/services/compiler.js
+++ b/app/js/services/compiler.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('compiler', function (common,
     utils,
     nodeSha1,
@@ -66,7 +66,7 @@ angular.module('icestudio')
       var date = new Date();
       opt = opt || {};
       if (opt.header !== false) {
-        header += comment + ' Code generated by Icestudio ' + _package.version + '\n';
+        header += comment + ' Code generated by hwstudio ' + _package.version + '\n';
         if (opt.datetime !== false) {
           header += comment + ' ' + date.toUTCString() + '\n';
         }
diff --git a/app/js/services/drivers.js b/app/js/services/drivers.js
index 7c7103fb..97ed0253 100644
--- a/app/js/services/drivers.js
+++ b/app/js/services/drivers.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('drivers', function (gettextCatalog,
     profile,
     common,
@@ -162,7 +162,7 @@ angular.module('icestudio')
     function configureLinuxDrivers(commands, callback) {
       var command = 'sh -c "' + commands.join('; ') + '"';
       utils.beginBlockingTask();
-      nodeSudo.exec(command, { name: 'Icestudio' }, function (error/*, stdout, stderr*/) {
+      nodeSudo.exec(command, { name: 'hwstudio' }, function (error/*, stdout, stderr*/) {
         utils.endBlockingTask();
         if (!error) {
           if (callback) {
@@ -307,7 +307,7 @@ angular.module('icestudio')
     function processDriverDarwin(driver, load, callback) {
       if (driver) {
         var command = (load ? 'kextload' : 'kextunload') + ' -b ' + driver;
-        nodeSudo.exec(command, { name: 'Icestudio' }, function (/*error, stdout, stderr*/) {
+        nodeSudo.exec(command, { name: 'hwstudio' }, function (/*error, stdout, stderr*/) {
           if (callback) {
             callback();
           }
@@ -353,7 +353,7 @@ angular.module('icestudio')
     function enableWindowsDrivers(type) {
       var option = '--' + type + '-enable';
       utils.beginBlockingTask();
-      nodeSudo.exec([common.APIO_CMD, 'drivers', option].join(' '), { name: 'Icestudio' }, function (error, stdout, stderr) {
+      nodeSudo.exec([common.APIO_CMD, 'drivers', option].join(' '), { name: 'hwstudio' }, function (error, stdout, stderr) {
         utils.endBlockingTask();
         if (stderr) {
           alertify.error(gettextCatalog.getString('Toolchain not installed') + '.<br>' + gettextCatalog.getString('Click here to install it'), 30)
diff --git a/app/js/services/graph.js b/app/js/services/graph.js
index 8d7f8af3..236580ac 100644
--- a/app/js/services/graph.js
+++ b/app/js/services/graph.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
     .service('graph', function ($rootScope,
         joint,
         boards,
@@ -283,9 +283,9 @@ angular.module('icestudio')
             function updateCellBoxes() {
                 var cells = graph.getCells();
                 selectionView.options.state = state;
-                
+
                 for (var i = 0, len = cells.length; i < len; i++) {
- 
+
                     if (!cells[i].isLink()) {
                         cells[i].attributes.state = state;
                         var elementView = paper.findViewByModel(cells[i]);
@@ -296,7 +296,7 @@ angular.module('icestudio')
 
                     }
                 }
-               
+
             }
             // Events
 
@@ -734,7 +734,7 @@ angular.module('icestudio')
             graph.trigger('state', state);
 
         };
-    
+
         function updateWiresOnObstacles() {
             var cells = graph.getCells();
 
@@ -1432,7 +1432,7 @@ angular.module('icestudio')
                         // - if conversion from one board to other is in progress,
                         //   now is based on pin names, an improvement could be
                         //   through hash tables with assigned pins previously
-                        //   selected by icestudio developers
+                        //   selected by hwstudio developers
                         var replaced = false;
                         for (var i in pins) {
                             replaced = false;
diff --git a/app/js/services/profile.js b/app/js/services/profile.js
index 12ad03ee..a5d06fff 100644
--- a/app/js/services/profile.js
+++ b/app/js/services/profile.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('profile', function (utils,
     common,
     _package,
diff --git a/app/js/services/project.js b/app/js/services/project.js
index 8d3b16f1..6a07bccc 100644
--- a/app/js/services/project.js
+++ b/app/js/services/project.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('project', function ($rootScope,
     graph,
     boards,
@@ -155,11 +155,11 @@ angular.module('icestudio')
     function checkVersion(version) {
       if (version > common.VERSION) {
         var errorAlert = alertify.error(gettextCatalog.getString('Unsupported project format {{version}}', { version: version }), 30);
-        alertify.message(gettextCatalog.getString('Click here to <b>download a newer version</b> of Icestudio'), 30)
+        alertify.message(gettextCatalog.getString('Click here to <b>download a newer version</b> of hwstudio'), 30)
           .callback = function (isClicked) {
             if (isClicked) {
               errorAlert.dismiss(false);
-              gui.Shell.openExternal('https://github.com/FPGAwars/icestudio/releases');
+              gui.Shell.openExternal('https://github.com/umarcor/hwstudio/releases');
             }
           };
         return false;
@@ -608,7 +608,7 @@ angular.module('icestudio')
         this.name = name;
         graph.resetBreadcrumbs(name);
       }
-      var title = (this.changed ? '*' : '') + this.name + ' ─ Icestudio';
+      var title = (this.changed ? '*' : '') + this.name + ' ─ hwstudio';
       utils.updateWindowTitle(title);
     };
 
diff --git a/app/js/services/shortcuts.js b/app/js/services/shortcuts.js
index 866b9561..4da5e1f8 100644
--- a/app/js/services/shortcuts.js
+++ b/app/js/services/shortcuts.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .filter('shortcut', function (shortcuts) {
     return function (action) {
       return shortcuts.label(action);
diff --git a/app/js/services/tools.js b/app/js/services/tools.js
index eed4ad14..d29f989a 100644
--- a/app/js/services/tools.js
+++ b/app/js/services/tools.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('tools', function (project,
     compiler,
     profile,
@@ -1315,11 +1315,11 @@ angular.module('icestudio')
               var msg = '';
               if (hasNewVersion === 'stable') {
                 msg = '<div class="new-version-notifier-box"><div class="new-version-notifier-box--icon"><img src="resources/images/confetti.svg"></div>\
-                                          <div class="new-version-notifier-box--text">' + gettextCatalog.getString('There is a new stable version available') + '<br/><a class="action-open-url-external-browser" href="https://icestudio.io" target="_blank">Click here to download it.</a></div></div>';
+                                          <div class="new-version-notifier-box--text">'+ gettextCatalog.getString('There is a new stable version available') + '</div></div>';
 
               } else {
                 msg = '<div class="new-version-notifier-box"><div class="new-version-notifier-box--icon"><img src="resources/images/confetti.svg"></div>\
-                                          <div class="new-version-notifier-box--text">' + gettextCatalog.getString('There is a new nightly version available') + '<br/><a class="action-open-url-external-browser" href="https://icestudio.io" target="_blank">Click here to download it.</a></div></div>';
+                                          <div class="new-version-notifier-box--text">'+ gettextCatalog.getString('There is a new nightly version available') + '</div></div>';
 
               }
               alertify.notify(msg, 'notify', 30);
diff --git a/app/js/services/utils.js b/app/js/services/utils.js
index d5a9edbb..9c6e35d7 100644
--- a/app/js/services/utils.js
+++ b/app/js/services/utils.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('utils', function ($rootScope,
     gettextCatalog,
     common,
@@ -321,25 +321,16 @@ angular.module('icestudio')
                     } else {
                       reject();
                     }
-
-
-
                   });
-
                 } else {
-
                   data = isJSON(content);
-
                   if (data) {
                     // JSON data
                     resolve(data);
                   } else {
                     reject();
                   }
-
-
                 }
-
               }
             });
         } else {
@@ -944,7 +935,7 @@ angular.module('icestudio')
         }
         params.local = 'local';
       }
-      // To pass parameters to the new project window, we use de GET parameter "icestudio_argv"
+      // To pass parameters to the new project window, we use de GET parameter "hwstudio_argv"
       // that contains the same arguments that shell call, in this way the two calls will be
       // compatible.
       // If in the future you will add more paremeters to the new window , you should review
@@ -955,7 +946,7 @@ angular.module('icestudio')
       // new-instance and new_instance are necesary for OS compatibility
       // to avoid crash on new window project after close parent
       // (little trick for nwjs bug).
-      //url='index.html?icestudio_argv=fsdfsfa';
+      //url='index.html?hwstudio_argv=fsdfsfa';
 
       gui.Window.open(url, {
         // new_instance: true,  //Deprecated for new nwjs versios
@@ -995,7 +986,7 @@ angular.module('icestudio')
 
       var cells = selectionToCells(selection, graph);
       var clipboard = {
-        icestudio: this.cellsToProject(cells, graph)
+        hwstudio: this.cellsToProject(cells, graph)
       };
 
       // Send the clipboard object the global clipboard as a string
@@ -1041,8 +1032,8 @@ angular.module('icestudio')
         } else {
           // Parse the global clipboard
           var clipboard = JSON.parse(text);
-          if (callback && clipboard && clipboard.icestudio) {
-            callback(clipboard.icestudio);
+          if (callback && clipboard && clipboard.hwstudio) {
+            callback(clipboard.hwstudio);
           }
         }
       });
diff --git a/app/package.json b/app/package.json
index 7d6a35a9..c80e938e 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,26 +1,9 @@
 {
-  "name": "icestudio",
-  "version": "0.5.1n200403",
-  "nightly": "0.5.1n200403",
-  "flavour": "develop",
-  "description": "Visual editor for open FPGA boards",
-  "contributors": [
-    {
-      "name": "Jesús Arroyo Torrens",
-      "email": "jesus.arroyo.torrens@gmail.com",
-      "url": "https://github.com/Jesus89"
-    },
-    {
-      "name": "Carlos Venegas Arrabe",
-      "url": "https://github.com/cavearr"
-    },
-    {
-      "name": "Juan González Gómez",
-      "url": "https://github.com/Obijuan"
-    }
-  ],
-  "repository": "https://github.com/FPGAwars/icestudio",
-  "updatecheck": "https://raw.githubusercontent.com/FPGAwars/icestudio/develop/app/package.json",
+  "name": "hwstudio",
+  "version": "0.5.1",
+  "description": "GUI editor for hardware description designs",
+  "repository": "https://github.com/umarcor/hwstudio",
+  "updatecheck": "https://raw.githubusercontent.com/umarcor/hwstudio/develop/app/package.json",
   "license": "GPL-2.0",
   "main": "index.html",
   "chromium-args": "--enable-experimental-web-platform-features",
@@ -34,7 +17,7 @@
     "min_height": 200,
     "resizable": true,
     "position": "center",
-    "icon": "resources/images/icestudio-logo.png"
+    "icon": "resources/images/logo.png"
   },
   "apio": {
     "min": "0.5.0",
@@ -94,9 +77,15 @@
   },
   "readme": "../README.md",
   "keywords": [
-    "FPGA",
-    "open",
     "editor",
-    "hardware"
+    "hardware",
+    "HDL",
+    "VHDL",
+    "GHDL",
+    "VUnit",
+    "GtkWave",
+    "FPGA",
+    "SoC",
+    "simulation"
   ]
 }
diff --git a/app/resources/boards/alhambra-ii/pinout.svg b/app/resources/boards/alhambra-ii/pinout.svg
index 093895d7..ef8a7ad8 100644
--- a/app/resources/boards/alhambra-ii/pinout.svg
+++ b/app/resources/boards/alhambra-ii/pinout.svg
@@ -27216,7 +27216,7 @@
          id="tspan6642-89-5-5-3-6-7"
          x="61.796463"
          y="468.39951"
-         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.25px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000">Icestudio name</tspan></text>
+         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.25px;line-height:1.25;font-family:Lato;-inkscape-font-specification:'Lato, Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000">hwstudio name</tspan></text>
     <path
        style="display:inline;opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:evenodd;stroke:#585958;stroke-width:0.21589077;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 624.35387,316.61039 c -0.49599,5.3e-4 -0.62477,-0.65968 -0.5239,-1.2094 l 3.01732,-9.44978 c 0.2199,-0.71027 0.97368,-1.05099 1.28669,-1.04405 l 21.32887,-0.0579 c 0.39146,-0.0183 1.25373,0.47906 1.05275,1.16421 l -3.06012,9.57235 c -0.18697,0.43552 -0.56251,1.07824 -1.20269,1.09285 z"
diff --git a/app/resources/boards/icezum/pinout.svg b/app/resources/boards/icezum/pinout.svg
index 6924395a..99e72903 100644
--- a/app/resources/boards/icezum/pinout.svg
+++ b/app/resources/boards/icezum/pinout.svg
@@ -33459,7 +33459,7 @@
          id="tspan6642-89-5-5-3-6-7"
          x="56.290329"
          y="307.30679"
-         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.96218967px;line-height:1.25;font-family:Ubuntu;-inkscape-font-specification:'Ubuntu Italic';fill:#000000">Icestudio name</tspan></text>
+         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.96218967px;line-height:1.25;font-family:Ubuntu;-inkscape-font-specification:'Ubuntu Italic';fill:#000000">hwstudio name</tspan></text>
     <path
        style="display:inline;opacity:1;fill:#00ffff;fill-opacity:1;fill-rule:evenodd;stroke:#585958;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 39.135132,411.09636 c -0.4256,5.3e-4 -0.5361,-0.65977 -0.44955,-1.20957 l 2.58912,-9.45111 c 0.18869,-0.71037 0.8355,-1.05114 1.10409,-1.0442 l 13.551986,-0.0579 c 0.33591,-0.0183 1.075813,0.47913 0.903353,1.16438 l -2.625843,9.5737 c -0.16044,0.43558 -0.48268,1.07839 -1.03201,1.093 z"
diff --git a/app/resources/images/icestudio-logo-old.svg b/app/resources/images/logo-old.svg
similarity index 99%
rename from app/resources/images/icestudio-logo-old.svg
rename to app/resources/images/logo-old.svg
index 417d1054..8a7d8177 100644
--- a/app/resources/images/icestudio-logo-old.svg
+++ b/app/resources/images/logo-old.svg
@@ -15,8 +15,8 @@
    id="svg8825"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="icestudio-logo.svg"
-   inkscape:export-filename="/home/jesus/code/icestudio/app/resources/images/icestudio-logo.png"
+   sodipodi:docname="logo.svg"
+   inkscape:export-filename="/home/jesus/code/icestudio/app/resources/images/logo.png"
    inkscape:export-xdpi="26"
    inkscape:export-ydpi="26">
   <defs
diff --git a/app/resources/images/icestudio-logo.ico b/app/resources/images/logo.ico
similarity index 100%
rename from app/resources/images/icestudio-logo.ico
rename to app/resources/images/logo.ico
diff --git a/app/resources/images/icestudio-logo.png b/app/resources/images/logo.png
similarity index 100%
rename from app/resources/images/icestudio-logo.png
rename to app/resources/images/logo.png
diff --git a/app/resources/images/icestudio-logo.svg b/app/resources/images/logo.svg
similarity index 99%
rename from app/resources/images/icestudio-logo.svg
rename to app/resources/images/logo.svg
index 6e54c8e3..2ef698b3 100644
--- a/app/resources/images/icestudio-logo.svg
+++ b/app/resources/images/logo.svg
@@ -15,8 +15,8 @@
    id="svg4694"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="icestudio-logo.svg"
-   inkscape:export-filename="/home/jesus/code/icestudio/app/resources/images/icestudio-logo.png"
+   sodipodi:docname="logo.svg"
+   inkscape:export-filename="/home/jesus/code/icestudio/app/resources/images/logo.png"
    inkscape:export-xdpi="27.892656"
    inkscape:export-ydpi="27.892656">
   <defs
diff --git a/app/views/menu.html b/app/views/menu.html
index d29693f5..07d96d85 100644
--- a/app/views/menu.html
+++ b/app/views/menu.html
@@ -342,18 +342,14 @@
               </li>
               <li class="divider"></li>
               <li>
-                <a href ng-click="openUrl('http://icestudio.readthedocs.io',$event)">{{ 'Documentation' | translate }}</a>
+                <a href ng-click="openUrl('http://umarcor.github.io/hwstudio',$event)">{{ 'Documentation' | translate }}</a>
               </li>
               <li>
-                <a href ng-click="openUrl('https://github.com/FPGAwars/icestudio',$event)">{{ 'Source code' | translate }}</a>
+                <a href ng-click="openUrl('https://github.com/umarcor/hwstudio',$event)">{{ 'Source code' | translate }}</a>
               </li>
               <li class="divider"></li>
               <li>
-                <a href ng-click="openUrl('https://groups.google.com/forum/#!forum/fpga-wars-explorando-el-lado-libre',$event)">{{ 'Community forum' | translate }}</a>
-              </li>
-              <li class="divider"></li>
-              <li>
-                <a href ng-click="about()">{{ 'About Icestudio' | translate }}</a>
+                <a href ng-click="about()">{{ 'About Hardware Studio' | translate }}</a>
               </li>
             </ul>
           </li>
diff --git a/docker.sh b/docker.sh
index a48b0561..a9da6ccc 100755
--- a/docker.sh
+++ b/docker.sh
@@ -70,13 +70,13 @@ case "$1" in
     ;;
   --test|-t)
     cd dist
-    VERSION="`ls icestudio-*-linux64.zip | sed 's#.*-\([0-9\.]*\)-.*#\1#g'`"
+    VERSION="`ls hwstudio-*-linux64.zip | sed 's#.*-\([0-9\.]*\)-.*#\1#g'`"
     echo "VERSION: $VERSION"
-    unzip "icestudio-$VERSION-linux64.zip"
-    chmod +x "icestudio-$VERSION-linux64/icestudio"
+    unzip "hwstudio-$VERSION-linux64.zip"
+    chmod +x "hwstudio-$VERSION-linux64/hwstudio"
 
     shift
-    exec_runx "/$(pwd)/icestudio-$VERSION-linux64" $1
+    exec_runx "/$(pwd)/hwstudio-$VERSION-linux64" $1
     ;;
   --publish|-p)
     echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
diff --git a/docs/Makefile b/docs/Makefile
index 24c006e0..2eca0eea 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -96,9 +96,9 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/icestudio.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/hwstudio.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/icestudio.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/hwstudio.qhc"
 
 .PHONY: applehelp
 applehelp:
@@ -115,8 +115,8 @@ devhelp:
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/icestudio"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/icestudio"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/hwstudio"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/hwstudio"
 	@echo "# devhelp"
 
 .PHONY: epub
diff --git a/docs/conf.py b/docs/conf.py
index 0925d56e..482ab3e4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,17 +1,3 @@
-# -*- coding: utf-8 -*-
-#
-# icestudio documentation build configuration file, created by
-# sphinx-quickstart on Thu May 26 11:44:15 2016.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
 import sys
 import os
 
@@ -45,18 +31,18 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Icestudio'
-copyright = u'2016-2019, Jesús Arroyo Torrens'
-author = u'Jesús Arroyo Torrens'
+project = u'hwstudio'
+copyright = u''
+author = u''
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'0.5.0'
+version = u'0.5.1dev'
 # The full version, including alpha/beta/rc tags.
-release = u'0.5.0'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -130,7 +116,7 @@ def f(self):
 
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
-#html_title = u'icestudio v0.2a1'
+#html_title = u'hwstudio v0.2a1'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None
@@ -212,7 +198,7 @@ def f(self):
 #html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'icestudiodoc'
+htmlhelp_basename = 'hwstudiodoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
@@ -234,7 +220,7 @@ def f(self):
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'icestudio.tex', u'icestudio Documentation',
+    (master_doc, 'hwstudio.tex', u'hwstudio Documentation',
      u'Jesús Arroyo Torrens', 'manual'),
 ]
 
@@ -264,7 +250,7 @@ def f(self):
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'icestudio', u'icestudio Documentation',
+    (master_doc, 'hwstudio', u'hwstudio Documentation',
      [author], 1)
 ]
 
@@ -278,8 +264,8 @@ def f(self):
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'icestudio', u'icestudio Documentation',
-     author, 'icestudio', 'One line description of project.',
+    (master_doc, 'hwstudio', u'hwstudio Documentation',
+     author, 'hwstudio', 'One line description of project.',
      'Miscellaneous'),
 ]
 
diff --git a/docs/index.rst b/docs/index.rst
index ef7a9ade..e947e072 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,44 +1,13 @@
-=====================================
-Welcome to icestudio's documentation!
-=====================================
+===============
+Hardware Studio
+===============
 
-.. image:: resources/images/logo/icestudio-logo-label.png
+.. image:: resources/images/logo/logo-label.png
    :width: 400 px
 
-Icestudio is a visual editor for open FPGA boards. It is built on top of the `Icestorm project <http://www.clifford.at/icestorm/>`_. This IDE is available for GNU/Linux, Windows and Mac OS X.
+Hardware Studio is a visual editor for hardware description designs. This IDE is available for GNU/Linux, Windows and Mac OS X.
 
-Supported boards:
-
-HX1K
-
-* `IceZUM Alhambra <https://github.com/FPGAwars/icezum>`_
-* `Nandland Go board <https://www.nandland.com/goboard/introduction.html>`_
-* `iCEstick Evaluation Kit <http://www.latticesemi.com/icestick>`_
-
-HX8K
-
-* `Alhambra II <https://github.com/FPGAwars/Alhambra-II-FPGA>`_
-* `BlackIce <https://hackaday.io/project/12930-blackice-low-cost-open-hardware-fpga-dev-board>`_
-* `BlackIce II <https://github.com/mystorm-org/BlackIce-II>`_
-* `icoBOARD 1.0 <http://icoboard.org/icoboard-1-0.html>`_
-* `Kéfir I iCE40-HX4K <http://fpgalibre.sourceforge.net/Kefir/>`_
-* `iCE40-HX8K Breakout Board <http://www.latticesemi.com/en/Products/DevelopmentBoardsAndKits/iCE40HX8KBreakoutBoard>`_
-
-LP8K
-
-* `TinyFPGA B2 <https://tinyfpga.com/b-series-guide.html>`_
-* `TinyFPGA BX <https://tinyfpga.com/bx/guide.html>`_
-
-UP5K
-
-* `iCEBreaker <https://github.com/icebreaker-fpga/icebreaker>`_
-* `iCEBreaker bitsy <https://github.com/icebreaker-fpga/icebreaker>`_
-* `UPDuino v1.0 <http://gnarlygrey.atspace.cc/development-platform.html#upduino>`_
-* `UPDuino v2.0 <http://gnarlygrey.atspace.cc/development-platform.html#upduino_v2l>`_
-* `FPGA 101 Workshop Badge Board <https://github.com/mmicko/workshop_badge>`_
-* `iCE40 UltraPlus Breakout Board <http://www.latticesemi.com/en/Products/DevelopmentBoardsAndKits/iCE40UltraPlusBreakoutBoard>`_
-
-**Source code**: https://github.com/FPGAwars/icestudio
+**Source code**: https://github.com/umarcor/hwstudio
 
 .. toctree::
     :caption: Getting Started
diff --git a/docs/resources/icons/icon.svg b/docs/resources/icons/icon.svg
index 23bf0372..7d48106a 100644
--- a/docs/resources/icons/icon.svg
+++ b/docs/resources/icons/icon.svg
@@ -16,7 +16,6 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="/home/jesus/code/icestudio/doc/icons/icon.png"
    inkscape:export-xdpi="62.638184"
    inkscape:export-ydpi="62.638184">
   <defs
diff --git a/docs/resources/images/blocks/definition.svg b/docs/resources/images/blocks/definition.svg
index 931ea575..ffbe90d4 100644
--- a/docs/resources/images/blocks/definition.svg
+++ b/docs/resources/images/blocks/definition.svg
@@ -16,7 +16,6 @@
    version="1.1"
    inkscape:version="0.48.4 r9939"
    sodipodi:docname="definition.svg"
-   inkscape:export-filename="/home/startic/code/icestudio-docs/resources/images/blocks/definition.png"
    inkscape:export-xdpi="96.382202"
    inkscape:export-ydpi="96.382202">
   <defs
diff --git a/docs/resources/images/installation/installer-background.svg b/docs/resources/images/installation/installer-background.svg
index 957fa5b8..733ff74e 100644
--- a/docs/resources/images/installation/installer-background.svg
+++ b/docs/resources/images/installation/installer-background.svg
@@ -17,7 +17,6 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="installer-background.svg"
-   inkscape:export-filename="/Users/bqlabs/code/icestudio/doc/images/installer-background2x.png"
    inkscape:export-xdpi="180"
    inkscape:export-ydpi="180">
   <defs
diff --git a/docs/resources/images/logo/icestudio-logo-label.png b/docs/resources/images/logo/logo-label.png
similarity index 100%
rename from docs/resources/images/logo/icestudio-logo-label.png
rename to docs/resources/images/logo/logo-label.png
diff --git a/docs/resources/images/logo/icestudio-logo-label.svg b/docs/resources/images/logo/logo-label.svg
similarity index 99%
rename from docs/resources/images/logo/icestudio-logo-label.svg
rename to docs/resources/images/logo/logo-label.svg
index 0eecfc16..be29e011 100644
--- a/docs/resources/images/logo/icestudio-logo-label.svg
+++ b/docs/resources/images/logo/logo-label.svg
@@ -15,8 +15,7 @@
    id="svg9427"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="icestudio-logo-label.svg"
-   inkscape:export-filename="/home/jesus/code/icestudio/doc/images/icestudio-logo-label.png"
+   sodipodi:docname="logo-label.svg"
    inkscape:export-xdpi="26"
    inkscape:export-ydpi="26">
   <defs
diff --git a/docs/resources/images/logo/icestudio-logo.icns b/docs/resources/images/logo/logo.icns
similarity index 100%
rename from docs/resources/images/logo/icestudio-logo.icns
rename to docs/resources/images/logo/logo.icns
diff --git a/docs/resources/images/logo/icestudio-logo.ico b/docs/resources/images/logo/logo.ico
similarity index 100%
rename from docs/resources/images/logo/icestudio-logo.ico
rename to docs/resources/images/logo/logo.ico
diff --git a/docs/resources/images/logo/icestudio-logo.png b/docs/resources/images/logo/logo.png
similarity index 100%
rename from docs/resources/images/logo/icestudio-logo.png
rename to docs/resources/images/logo/logo.png
diff --git a/docs/resources/images/logo/icestudio-logo.svg b/docs/resources/images/logo/logo.svg
similarity index 99%
rename from docs/resources/images/logo/icestudio-logo.svg
rename to docs/resources/images/logo/logo.svg
index 23bf0372..7d48106a 100644
--- a/docs/resources/images/logo/icestudio-logo.svg
+++ b/docs/resources/images/logo/logo.svg
@@ -16,7 +16,6 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="/home/jesus/code/icestudio/doc/icons/icon.png"
    inkscape:export-xdpi="62.638184"
    inkscape:export-ydpi="62.638184">
   <defs
diff --git a/docs/resources/images/userguide/main.svg b/docs/resources/images/userguide/main.svg
index bacbaa07..ddfe11bd 100644
--- a/docs/resources/images/userguide/main.svg
+++ b/docs/resources/images/userguide/main.svg
@@ -17,7 +17,6 @@
    version="1.1"
    inkscape:version="0.91 r13725"
    sodipodi:docname="main.svg"
-   inkscape:export-filename="/home/jesus/code/icestudio-docs/resources/images/userguide/main.png"
    inkscape:export-xdpi="86.156113"
    inkscape:export-ydpi="86.156113">
   <defs
diff --git a/docs/resources/samples/compiler/counter.pcf b/docs/resources/samples/compiler/counter.pcf
index 93e58ea4..53a39f3f 100644
--- a/docs/resources/samples/compiler/counter.pcf
+++ b/docs/resources/samples/compiler/counter.pcf
@@ -1,4 +1,4 @@
-# Code generated by Icestudio 0.3.3-rc
+# Code generated by hwstudio 0.3.3-rc
 # Tue, 24 Jul 2018 16:04:52 GMT
 
 set_io v32232e 101
diff --git a/docs/resources/samples/compiler/counter.v b/docs/resources/samples/compiler/counter.v
index ddbc347d..8c3ea6fe 100644
--- a/docs/resources/samples/compiler/counter.v
+++ b/docs/resources/samples/compiler/counter.v
@@ -1,4 +1,4 @@
-// Code generated by Icestudio 0.3.3-rc
+// Code generated by hwstudio 0.3.3-rc
 // Tue, 24 Jul 2018 16:04:48 GMT
 
 `default_nettype none
@@ -56,7 +56,7 @@ module v3e6c24_v68c173 (
  output v
 );
  // Bit 1
- 
+
  assign v = 1'b1;
 endmodule
 
@@ -70,19 +70,19 @@ module main_v4549a6 #(
 );
  // Counter 4 bits
  // @include div.v
- 
+
  wire trig; reg out;
- 
+
  DIV #(N) div (
    .clk(clk),
    .out(trig)
  );
- 
+
  always @(posedge trig) begin
    if (rst == 1)
      out <= 0;
    else if (ena == 1)
      out <= out + 1;
  end
- 
+
 endmodule
diff --git a/docs/resources/samples/compiler/counter_tb.gtkw b/docs/resources/samples/compiler/counter_tb.gtkw
index e734d519..34256848 100644
--- a/docs/resources/samples/compiler/counter_tb.gtkw
+++ b/docs/resources/samples/compiler/counter_tb.gtkw
@@ -1,4 +1,4 @@
-[*] Code generated by Icestudio 0.3.3-rc
+[*] Code generated by hwstudio 0.3.3-rc
 [*] Tue, 24 Jul 2018 16:05:02 GMT
 
 main_tb.Enable
diff --git a/docs/resources/samples/compiler/counter_tb.v b/docs/resources/samples/compiler/counter_tb.v
index d7783abe..f211be71 100644
--- a/docs/resources/samples/compiler/counter_tb.v
+++ b/docs/resources/samples/compiler/counter_tb.v
@@ -1,4 +1,4 @@
-// Code generated by Icestudio 0.3.3-rc
+// Code generated by hwstudio 0.3.3-rc
 // Tue, 24 Jul 2018 16:04:57 GMT
 
 // Testbench template
@@ -10,21 +10,21 @@
 
 module main_tb
 ;
- 
+
  // Simulation time: 100ns (10 * 10ns)
  parameter DURATION = 10;
- 
+
  // TODO: edit the module parameters here
  // e.g. localparam constant_value = 1;
  localparam constant_N = 20;
- 
+
  // Input/Output
  reg Enable;
  reg Reset;
  wire 0;
  wire 1;
  wire [3:0] LEDs;
- 
+
  // Module instance
  main #(
   .v30f40a(constant_N)
@@ -35,20 +35,20 @@ module main_tb
   .v1d1af8(1),
   .v6a65cd(LEDs)
  );
- 
+
  initial begin
   // File were to store the simulation results
   $dumpfile(`DUMPSTR(`VCD_OUTPUT));
   $dumpvars(0, main_tb);
- 
+
   // TODO: initialize the registers here
   // e.g. value = 1;
   // e.g. #2 value = 0;
   Enable = 0;
   Reset = 0;
- 
+
   #(DURATION) $display("End of simulation");
   $finish;
  end
- 
+
 endmodule
diff --git a/docs/source/compiler.rst b/docs/source/compiler.rst
index c61938a9..9827c5ba 100644
--- a/docs/source/compiler.rst
+++ b/docs/source/compiler.rst
@@ -11,7 +11,7 @@ Compilers
 Implementation
 --------------
 
-Compiler `source code <https://github.com/FPGAwars/icestudio/blob/develop/app/scripts/services/compiler.js>`_.
+Compiler `source code <https://github.com/umarcor/hwstudio/blob/develop/app/scripts/services/compiler.js>`_.
 
 Sample
 ------
diff --git a/docs/source/howto.rst b/docs/source/howto.rst
index 7555fc74..d0be5445 100644
--- a/docs/source/howto.rst
+++ b/docs/source/howto.rst
@@ -346,7 +346,7 @@ Go to **View > Collection info**. A new window will appear with the README.md fi
 Load external collections
 -------------------------
 
-Go to **Edit > Preferences > External collection** and insert an absolute path of your system containing Icestudio collections.
+Go to **Edit > Preferences > External collection** and insert an absolute path of your system containing hwstudio collections.
 
 
 Create a collection package
@@ -468,7 +468,7 @@ Go to **Edit > Preferences > Board rules**
 Configure a remote host
 ------------------------
 
-I you want to use a RPi, eg pi@192.168.0.22, or another computer from Icestudio as a client, first configure the host:
+I you want to use a RPi, eg pi@192.168.0.22, or another computer from hwstudio as a client, first configure the host:
 
 1. **Copy your SSH public key into the server**
 
@@ -486,7 +486,7 @@ I you want to use a RPi, eg pi@192.168.0.22, or another computer from Icestudio
     $ apio install --all
     $ apio drivers --enable  # For FTDI devices
 
-3. **Enter the host name in Icestudio, Edit > Remote hostname**
+3. **Enter the host name in hwstudio, Edit > Remote hostname**
 
    .. image:: ../resources/images/howto/remotehost.png
 
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index bfc088aa..7bc0f4f4 100644
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@@ -7,15 +7,15 @@ GNU/Linux
 ---------
 
 1. Install `Python 2.7 <https://www.python.org>`_ and **xclip** (to enable Copy/Paste).
-2. Download the `AppImage <https://github.com/FPGAwars/icestudio/releases>`_ file and make it executable:
+2. Download the `AppImage <https://github.com/umarcor/hwstudio/releases>`_ file and make it executable:
 
 .. code::
 
-  $ chmod a+x icestudio-0.5.0*.AppImage
+  $ chmod a+x hwstudio-0.5.0*.AppImage
 
 .. hint::
 
-  You can download the ZIP release and install it in the system using the script `linux_installer.sh <https://github.com/FPGAwars/icestudio/blob/develop/scripts/linux_installer.sh>`_. This script registers the *.ice* files as *Icestudio project*. There is also a `linux_uninstaller.sh <https://github.com/FPGAwars/icestudio/blob/develop/scripts/linux_uninstaller.sh>`_ to revert the previous configuration.
+  You can download the ZIP release and install it in the system using the script `linux_installer.sh <https://github.com/umarcor/hwstudio/blob/develop/scripts/linux_installer.sh>`_. This script registers the *.ice* files as *hwstudio project*. There is also a `linux_uninstaller.sh <https://github.com/umarcor/hwstudio/blob/develop/scripts/linux_uninstaller.sh>`_ to revert the previous configuration.
 
 .. warning::
 
@@ -34,7 +34,7 @@ Mac OS
 
 1. Install `Python 2.7 <https://www.python.org>`_.
 2. Install `Homebrew <https://brew.sh>`_.
-3. Download and execute the `DMG package <https://github.com/FPGAwars/icestudio/releases>`_.
+3. Download and execute the `DMG package <https://github.com/umarcor/hwstudio/releases>`_.
 
 .. image:: ../resources/images/installation/macos.png
    :align: center
@@ -44,14 +44,14 @@ Mac OS
 Windows
 -------
 
-1. Download and execute the `Windows installer <https://github.com/FPGAwars/icestudio/releases>`_.
+1. Download and execute the `Windows installer <https://github.com/umarcor/hwstudio/releases>`_.
 
 .. image:: ../resources/images/installation/windows.png
    :align: center
 
 .. note::
 
-  Python 2.7 will be installed automatically if it is not installed. This installer registers the *.ice* files as *Icestudio project*.
+  Python 2.7 will be installed automatically if it is not installed. This installer registers the *.ice* files as *hwstudio project*.
 
 .. warning::
 
diff --git a/docs/source/rules.rst b/docs/source/rules.rst
index cc6c6c19..29724474 100644
--- a/docs/source/rules.rst
+++ b/docs/source/rules.rst
@@ -3,7 +3,7 @@
 Board Rules
 ===========
 
-Icestudio *board rules* allow to automate tasks such as connecting all input *CLK* wires in a sequential circuit or initializing certain output ports to 1 or 0. The result is an easier and cleaner design. In Icestudio, rules can be enabled or disabled in "Edit > Preferences > Board rules".
+hwstudio *board rules* allow to automate tasks such as connecting all input *CLK* wires in a sequential circuit or initializing certain output ports to 1 or 0. The result is an easier and cleaner design. In hwstudio, rules can be enabled or disabled in "Edit > Preferences > Board rules".
 
 The board rules are implemented in the *rules.json* file in each board directory. Each rule file is attached to a specific board. For example, this could be a rules file for the *IceZUM Alhambra*:
 
diff --git a/docs/source/setup.rst b/docs/source/setup.rst
index f46eb653..511245a5 100644
--- a/docs/source/setup.rst
+++ b/docs/source/setup.rst
@@ -3,7 +3,7 @@
 Setup
 =====
 
-This is a quick start guide to setup the development environment for Icestudio.
+This is a quick start guide to setup the development environment for hwstudio.
 
 Install `Python 2.7 <https://www.python.org/downloads/>`_ and `Node.js <https://nodejs.org/>`_.
 
@@ -14,8 +14,8 @@ Download
 
 .. code::
 
-  git clone https://github.com/FPGAwars/icestudio.git
-  cd icestudio
+  git clone https://github.com/umarcor/hwstudio.git
+  cd hwstudio
 
 
 Install
@@ -37,7 +37,7 @@ Execute
 Languages
 ---------
 
-Add or update the `app translations <https://github.com/FPGAwars/icestudio/tree/develop/app/resources/locale>`_ using `Poedit <https://poedit.net/>`_.
+Add or update the `app translations <https://github.com/umarcor/hwstudio/tree/develop/app/resources/locale>`_ using `Poedit <https://poedit.net/>`_.
 
 Developer note: use ``npm run gettext`` to extract the labels from the code.
 
diff --git a/docs/source/userguide.rst b/docs/source/userguide.rst
index 62d9abd6..3f7845a1 100644
--- a/docs/source/userguide.rst
+++ b/docs/source/userguide.rst
@@ -84,7 +84,7 @@ More information in the `Board rules section <./rules.html>`_.
 
 **External collections**
 
-Set the external collections path in your system. This absolute route should contain Icestudio collections (directories or symbolic links to directories) that will be loaded as external collections.
+Set the external collections path in your system. This absolute route should contain hwstudio collections (directories or symbolic links to directories) that will be loaded as external collections.
 
 **Remote hostname**
 
@@ -211,7 +211,7 @@ Toolchain
 +----------------+-----------------------------------------------------------------------------------+
 |     Remove     |                         Remove the toolchain directories                          |
 +----------------+-----------------------------------------------------------------------------------+
-| Reset default  |             Restore the default toolchain distributed within Icestudio            |
+| Reset default  |             Restore the default toolchain distributed within hwstudio             |
 +----------------+-----------------------------------------------------------------------------------+
 |  Apio version  |                           Show the current apio version                           |
 +----------------+-----------------------------------------------------------------------------------+
@@ -263,7 +263,7 @@ Collections
 
 .. hint::
 
-    When a ZIP file of collections is added to Icestudio, it is installed in `~/.icestudio/collections`.
+    When a ZIP file of collections is added to hwstudio, it is installed in `~/.hwstudio/collections`.
 
 
 Help
@@ -272,17 +272,17 @@ Help
 +-----------------+---------------------------------------------------+
 |     Action      |                    Description                    |
 +=================+===================================================+
-|  View license   |    Open the Icestudio license in a web browser    |
+|  View license   |    Open the hwstudio license in a web browser    |
 +-----------------+---------------------------------------------------+
-|     Version     |       Show the Icestudio current version          |
+|     Version     |       Show the hwstudio current version          |
 +-----------------+---------------------------------------------------+
-|  Documentation  | Open the Icestudio documentation in a web browser |
+|  Documentation  | Open the hwstudio documentation in a web browser |
 +-----------------+---------------------------------------------------+
-|   Source code   |  Open the Icestudio source code in a web browser  |
+|   Source code   |  Open the hwstudio source code in a web browser  |
 +-----------------+---------------------------------------------------+
 | Community forum |     Open the FPGAwars forum in a web browser      |
 +-----------------+---------------------------------------------------+
-| About Icestudio |         Information about the application         |
+| About hwstudio |         Information about the application         |
 +-----------------+---------------------------------------------------+
 
 
@@ -401,7 +401,7 @@ If the error comes from a Generic block it is marked in red.
 Undo/Redo
 ``````````
 
-Icestudio allows to undo/redo the following actions:
+hwstudio allows to undo/redo the following actions:
 
 * Add or remove a block.
 * Add or remove a wire.
diff --git a/gruntfile.js b/gruntfile.js
index a7a7039b..e94f1c74 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -101,7 +101,7 @@
       flavor: 'normal',
       zip: false,
       buildDir: 'dist/',
-      winIco: 'docs/resources/images/logo/icestudio-logo.ico',
+      winIco: 'docs/resources/images/logo/logo.ico',
       macIcns: 'docs/resources/images/logo/nw.icns',
       macPlist: { 'CFBundleIconFile': 'app' },
       platforms: platforms
@@ -112,8 +112,8 @@
   function appimage(bits) {
     return {
       options: {
-        name: 'Icestudio',
-        exec: 'icestudio',
+        name: 'hwstudio',
+        exec: 'hwstudio',
         arch: bits + 'bit',
         icons: 'docs/resources/icons',
         comment: 'Visual editor for open FPGA boards',
@@ -121,7 +121,7 @@
       },
       files: [{
         expand: true,
-        cwd: 'dist/icestudio/linux' + bits + '/',
+        cwd: 'dist/hwstudio/linux' + bits + '/',
         src: ['**'].concat(appFiles)
       }]
     };
@@ -135,13 +135,13 @@
   gruntCfg.appdmg = {
     options: {
       basepath: '.',
-      title: 'Icestudio Installer',
-      icon: 'docs/resources/images/logo/icestudio-logo.icns',
+      title: 'hwstudio installer',
+      icon: 'docs/resources/images/logo/logo.icns',
       background: 'docs/resources/images/installation/installer-background.png',
       window: { size: { width: 512, height: 385 } },
       contents: [
         { x: 345, y: 250, type: 'link', path: '/Applications' },
-        { x: 170, y: 250, type: 'file', path: 'dist/icestudio/osx64/icestudio.app' }
+        { x: 170, y: 250, type: 'file', path: 'dist/hwstudio/osx64/hwstudio.app' }
       ]
     },
     target: { dest: 'dist/<%=pkg.name%>-<%=pkg.version%>-osx64.dmg' }
@@ -154,7 +154,7 @@
       },
       files: [{
         expand: true,
-        cwd: 'dist/icestudio/linux' + tgt + '/',
+        cwd: 'dist/hwstudio/linux' + tgt + '/',
         src: ['**'].concat(appFiles),
         dest: '<%=pkg.name%>-<%=pkg.version%>-linux' + tgt
       }]
@@ -168,7 +168,7 @@
       },
       files: [{
         expand: true,
-        cwd: 'dist/icestudio/win' + tgt + '/',
+        cwd: 'dist/hwstudio/win' + tgt + '/',
         src: ['**'].concat(appFiles),
         dest: '<%=pkg.name%>-<%=pkg.version%>-win' + tgt
       }]
@@ -182,8 +182,8 @@
       },
       files: [{
         expand: true,
-        cwd: 'dist/icestudio/osx' + tgt + '/',
-        src: ['icestudio.app/**'],
+        cwd: 'dist/hwstudio/osx' + tgt + '/',
+        src: ['hwstudio.app/**'],
         dest: '<%=pkg.name%>-<%=pkg.version%>-osx' + tgt
       }]
     };
diff --git a/package.json b/package.json
index 8cf8f5f8..da57ff37 100644
--- a/package.json
+++ b/package.json
@@ -1,23 +1,8 @@
 {
-  "name": "icestudio",
-  "version": "0.5.1n200403",
-  "description": "Visual editor for open FPGA boards",
-  "contributors": [
-    {
-      "name": "Jesús Arroyo Torrens",
-      "email": "jesus.arroyo.torrens@gmail.com",
-      "url": "https://github.com/Jesus89"
-    },
-    {
-      "name": "Carlos Venegas Arrabe",
-      "url": "https://github.com/cavearr"
-    },
-    {
-      "name": "Juan González Gómez",
-      "url": "https://github.com/Obijuan"
-    }
-  ],
-  "repository": "https://github.com/FPGAwars/icestudio",
+  "name": "hwstudio",
+  "version": "0.5.1",
+  "description": "GUI editor for hardware description designs",
+  "repository": "https://github.com/umarcor/hwstudio",
   "license": "GPL-2.0",
   "scripts": {
     "dist": "grunt dist",
diff --git a/scripts/linux_installer.sh b/scripts/linux_installer.sh
index 69275530..9dfd3429 100755
--- a/scripts/linux_installer.sh
+++ b/scripts/linux_installer.sh
@@ -6,23 +6,23 @@ RED="\033[1;31m"
 GREEN="\033[1;32m"
 
 APP_DIR=~/.local/share/applications
-APP=${APP_DIR}/icestudio.desktop
+APP=${APP_DIR}/hwstudio.desktop
 
 MIME_DIR=~/.local/share/mime
 MIME_PKG=${MIME_DIR}/packages
-MIME=${MIME_PKG}/icestudio.xml
+MIME=${MIME_PKG}/hwstudio.xml
 
 ICON_DIR=~/.local/share/icons
-ICON=${ICON_DIR}/application-x-icestudio-project.png
+ICON=${ICON_DIR}/application-x-hwstudio-project.png
 
-echo "${BLUE}This script installs Icestudio as a user application"
+echo "${BLUE}This script installs hwstudio as a user application"
 echo "----------------------------------------------------"
 
-printf "Enter the Icestudio path:${NC} "
+printf "Enter the hwstudio path:${NC} "
 read SOURCE
 
-if [ ! -f "${SOURCE}/icestudio" ]; then
-    echo "${RED}\nError: invalid Icestudio path${NC}"
+if [ ! -f "${SOURCE}/hwstudio" ]; then
+    echo "${RED}\nError: invalid hwstudio path${NC}"
     exit 1
 fi
 
@@ -35,24 +35,24 @@ PWD=`pwd`
 mkdir -p ${APP_DIR}
 
 echo "[Desktop Entry]
-Name=Icestudio
+Name=hwstudio
 Comment=Visual editor for open FPGA boards
 Comment[es]=Editor visual para placas FPGA libres
 Type=Application
 Categories=Development;Education;Graphics;
 StartupNotify=true
-MimeType=application/x-icestudio-project;
+MimeType=application/x-hwstudio-project;
 " > ${APP}
 
-echo "Exec=${PWD}/icestudio %f" >> ${APP}
+echo "Exec=${PWD}/hwstudio %f" >> ${APP}
 echo "Icon=${ICON}" >> ${APP}
 
 mkdir -p ${ICON_DIR}
-cp "${PWD}/resources/images/icestudio-logo.png" ${ICON}
+cp "${PWD}/resources/images/logo.png" ${ICON}
 
 update-desktop-database ${APP_DIR}
 
-echo "${GREEN}\nIcestudio.desktop installed!${NC}"
+echo "${GREEN}\nhwstudio.desktop installed!${NC}"
 
 
 # Register extension .ice
@@ -61,14 +61,14 @@ mkdir -p ${MIME_PKG}
 
 echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <mime-info xmlns=\"http://www.freedesktop.org/standards/shared-mime-info\">
-  <mime-type type=\"application/x-icestudio-project\">
+  <mime-type type=\"application/x-hwstudio-project\">
     <sub-class-of type=\"application/json\"/>
-    <comment>Icestudio project</comment>
+    <comment>hwstudio project</comment>
     <glob pattern=\"*.ice\"/>
-    <icon name=\"application-x-icestudio-project\"/>
+    <icon name=\"application-x-hwstudio-project\"/>
   </mime-type>
 </mime-info>" > ${MIME}
 
 update-mime-database ${MIME_DIR}
 
-echo "${GREEN}Icestudio project registered!${NC}"
+echo "${GREEN}hwstudio project registered!${NC}"
diff --git a/scripts/linux_uninstaller.sh b/scripts/linux_uninstaller.sh
index 893e1291..0df93585 100755
--- a/scripts/linux_uninstaller.sh
+++ b/scripts/linux_uninstaller.sh
@@ -5,16 +5,16 @@ PURPLE="\033[1;35m"
 GREEN="\033[1;32m"
 
 APP_DIR=~/.local/share/applications
-APP=${APP_DIR}/icestudio.desktop
+APP=${APP_DIR}/hwstudio.desktop
 
 MIME_DIR=~/.local/share/mime
 MIME_PKG=${MIME_DIR}/packages
-MIME=${MIME_PKG}/icestudio.xml
+MIME=${MIME_PKG}/hwstudio.xml
 
 ICON_DIR=~/.local/share/icons
-ICON=${ICON_DIR}/application-x-icestudio-project.png
+ICON=${ICON_DIR}/application-x-hwstudio-project.png
 
-echo "${PURPLE}This script uninstalls Icestudio as a user application"
+echo "${PURPLE}This script uninstalls hwstudio as a user application"
 echo "------------------------------------------------------"
 
 printf "Do you want to continue? [y/N]:${NC} "
@@ -27,7 +27,7 @@ case "$RESP" in
       rm -f ${ICON}
       update-desktop-database ${APP_DIR}
 
-      echo "${GREEN}\nIcestudio.desktop uninstalled!${NC}"
+      echo "${GREEN}\nhwstudio.desktop uninstalled!${NC}"
 
 
       # Register extension .ice
@@ -35,7 +35,7 @@ case "$RESP" in
       rm -f ${MIME}
       update-mime-database ${MIME_DIR}
 
-      echo "${GREEN}Icestudio project unregistered!${NC}"
+      echo "${GREEN}hwstudio project unregistered!${NC}"
       ;;
     *)
       ;;
diff --git a/scripts/travis_trigger.sh b/scripts/travis_trigger.sh
deleted file mode 100755
index f44474a4..00000000
--- a/scripts/travis_trigger.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-echo "> travis login"
-travis login --org
-
-echo "> travis token"
-travis token --org
-
-echo "> Enter the token: "
-read TOKEN
-
-echo "> Enter the tag: "
-read TAG
-
-body="{
-  \"request\": {
-    \"branch\": \"$TAG\"
-  }
-}"
-
-echo "> Trigger travis build: "
-curl -s -X POST \
-  -H "Content-Type: application/json" \
-  -H "Accept: application/json" \
-  -H "Travis-API-Version: 3" \
-  -H "Authorization: token $TOKEN" \
-  -d "$body" \
-  https://api.travis-ci.org/repo/FPGAwars%2Ficestudio/requests
-
-echo "> Done!"
