name refactoring
Finally added proper input/ouput mapping on widgets