Name refactoring
Merge pull request #198 from nicocarraggi/nicodev

Name refactoring