Updated dependencies
Harmonized module names