various changes to aliases