Fixed some aliases