Some aliases added and changed