changed some aliases