Fix duplicates, a few more aliases addition/remove
Restore 2 aliases