Make aliases unique.

Some code sniffering.
Be sure to add source to the unique func.

To prevent of dublicates.
Merge branch 'hotfix-1.0.1'