* Updated dependencies;
* Some renamings;