Small fixes
Uniqueness has been changed from origin to name make the dependency unicity check follow