changed some alias names