Add identifier aliases; needs tests