[Alias, Update] Cleanup and improvements

Merge Alias and Aliases, make Update work more sensibly.