Changing some aliases, adding ypy