Features should have unique names

Paired with: Antoine Musso

Change-Id: Ic62b93f35aebd5b420a9e8a7525acb3a49e932a8