Untighten dependencies and change the name