Changes some aliases around